[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm /localize/localize de.pm

christianto christianto at source.lon-capa.org
Mon Jul 18 07:56:28 EDT 2011


christianto		Mon Jul 18 11:56:28 2011 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
    /loncom/localize/localize	de.pm 
  Log:
  localization improvement for content overview of date status and icon text
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.461 loncom/interface/lonnavmaps.pm:1.462
--- loncom/interface/lonnavmaps.pm:1.461	Wed May 25 09:03:07 2011
+++ loncom/interface/lonnavmaps.pm	Mon Jul 18 11:56:23 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.461 2011/05/25 09:03:07 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.462 2011/07/18 11:56:23 christianto Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -509,7 +509,7 @@
 my %iconAltTags =   #texthash does not work here
     ( 'navmap.correct.gif'  => 'Correct',
       'navmap.wrong.gif'    => 'Incorrect',
-      'navmap.open.gif'     => 'Open',
+      'navmap.open.gif'     => 'Is Open',
       'navmap.partial.gif'  => 'Partially Correct',
       'navmap.ellipsis.gif' => 'Attempted',
      );
@@ -612,7 +612,7 @@
         return &Apache::lonhtmlcommon::direct_parm_link(&mt("Not currently assigned.",$res->symb(),'opendate'),$part);
     }
     if ($status == $res->OPEN_LATER) {
-        return &mt("Open ") .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part);
+        return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start')),$res->symb(),'opendate',$part);
     }
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -646,22 +646,22 @@
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes ")."  " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part);
+		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start')),$res->symb(),'duedate',$part);
 	    } else {
-		return &mt("Due")."  " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part);
+		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'duedate',$part);
 	    }
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part);
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
-        return &mt("Answer open")." " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part);
+        return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start')),$res->symb(),'answerdate',$part);
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
 	if ($res->is_practice()) {
-	    return &mt("Closed")." " . &Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part);
+	    return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start')),$res->symb(),'answerdate,duedate',$part);
 	} else {
-	    return &mt("Was due")." " .&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'answerdate,duedate',$part);
+	    return &mt("Was due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'answerdate,duedate',$part);
 	}
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
@@ -694,7 +694,7 @@
             }
         }
         if ($due) {
-            return &mt("Due")." " . &Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part) .
+            return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end')),$res->symb(),'duedate',$part) .
                 " $triesString";
         } else {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("No due date"),$res->symb(),'duedate',$part)." $triesString";
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.421 loncom/localize/localize/de.pm:1.422
--- loncom/localize/localize/de.pm:1.421	Tue Jul 12 12:55:55 2011
+++ loncom/localize/localize/de.pm	Mon Jul 18 11:56:28 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.421 2011/07/12 12:55:55 christianto Exp $
+# $Id: de.pm,v 1.422 2011/07/18 11:56:28 christianto Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -582,8 +582,8 @@
    'Some parts were not submitted.'
 => 'Einige Aufgabenteile sind nicht bearbeitet worden.',
 
-   'Due'
-=> 'Fällig',
+   'Due [_1]'
+=> 'Fällig am [_1]',
 
    'The filetype extension of the file you uploaded is not allowed.'
 => 'Die Endung der von Ihnen eingereichten Datei ist nicht zulässig.',
@@ -957,8 +957,8 @@
    'Coursemap undefined.'
 => 'Inhaltszusammenstellung des Kurses ist nicht definiert.',
 
-   "Was due"
-=> "War fällig am",
+   "Was due [_1]"
+=> "War fällig am [_1]",
 
    "Answer available"
 => "Antwort verfügbar",
@@ -1611,6 +1611,12 @@
    'Open'
 => 'Öffnen',
 
+   'Is Open'
+=> 'Ist geöffnet', 
+
+   'Open [_1]'
+=> 'Öffnet am [_1]', 
+
    'Per Page'
 => 'Pro Seite',
 
@@ -3595,8 +3601,8 @@
    'Close This Window'
 => 'Dieses Fenster schließen',
 
-   'Closed'
-=> 'Geschlossen',
+   'Closed [_1]'
+=> 'Geschlossen seit [_1]',
 
    'Communication'
 => 'Kommunikation',
@@ -14124,8 +14130,8 @@
    'E-mail Address'
 => 'E-Mail-Adresse',
 
-   'Closes '
-=> 'Schließt am ',
+   'Closes [_1]'
+=> 'Schließt am [_1]',
 
    'The resources in "[_1]" are open for a limited time. Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
 => 'Die Ressourcen in "[_1]" sind nur für eine begrenzte Zeit verfügbar. Sobald Sie auf "Ressource zeigen" klicken, haben Sie [_2] Zeit, um alle Ressourcen in "[_1]" zu bearbeiten.',
@@ -14199,6 +14205,9 @@
    'Answer open'
 => 'Antwort verfügbar am',
 
+   'Answer open [_1]'
+=> 'Antwort verfügbar am [_1]',
+
    'Yes, and show correct answer if they exceed the maximum number of tries.'
 => 'Ja, und korrekte Antwort anzeigen, nachdem alle Versuche aufgebraucht sind.',
 




More information about the LON-CAPA-cvs mailing list