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

[bisitz]

bisitz		Mon Mar 25 16:33:15 2013 EDT

  Modified files:              
    /loncom/interface	resetpw.pm 
    /loncom/localize/localize	de.pm 
  Log:
  Internationalization: Allow proper translation - don't concatenate phrase fragments
  
  
Index: loncom/interface/resetpw.pm
diff -u loncom/interface/resetpw.pm:1.31 loncom/interface/resetpw.pm:1.32
--- loncom/interface/resetpw.pm:1.31	Tue Feb  5 15:45:18 2013
+++ loncom/interface/resetpw.pm	Mon Mar 25 16:33:08 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.31 2013/02/05 15:45:18 raeburn Exp $
+# $Id: resetpw.pm,v 1.32 2013/03/25 16:33:08 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,8 +177,8 @@
 sub get_uname {
     my ($defdom) = @_;
     my %lt = &Apache::lonlocal::texthash(
-                                         unam => 'username',
-                                         udom => 'domain',
+                                         unam => 'LON-CAPA username',
+                                         udom => 'LON-CAPA domain',
                                          uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');
 
@@ -190,10 +190,10 @@
            .'</ul>';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box(). 
-            &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}).
+            &Apache::lonhtmlcommon::row_title($lt{'unam'}).
             '<input type="text" name="uname" size="20" />'.
             &Apache::lonhtmlcommon::row_closure(1).
-            &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'udom'}).
+            &Apache::lonhtmlcommon::row_title($lt{'udom'}).
             &Apache::loncommon::select_dom_form($defdom,'udom').
             &Apache::lonhtmlcommon::row_closure(1).
             &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.498 loncom/localize/localize/de.pm:1.499
--- loncom/localize/localize/de.pm:1.498	Mon Mar  4 18:09:44 2013
+++ loncom/localize/localize/de.pm	Mon Mar 25 16:33:15 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.498 2013/03/04 18:09:44 bisitz Exp $
+# $Id: de.pm,v 1.499 2013/03/25 16:33:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3278,6 +3278,9 @@
    'LON-CAPA domain: [_1]'
 => 'LON-CAPA-Domäne: [_1]',
 
+   'LON-CAPA domain'
+=> 'LON-CAPA-Domäne',
+
    'First Name'
 => 'Vorname',
 
@@ -5102,6 +5105,9 @@
    'username'
 => 'Benutzerkennung',
 
+   'LON-CAPA username'
+=> 'LON-CAPA-Benutzerkennung',
+
    'username: '
 => 'Benutzerkennung: ',