[LON-CAPA-cvs] cvs: loncom /localize/localize de.pm /publisher lonretrieve.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Thu, 20 Nov 2008 18:04:01 -0000
bisitz Thu Nov 20 18:04:01 2008 EDT
Modified files:
/loncom/publisher lonretrieve.pm
/loncom/localize/localize de.pm
Log:
Localization and Styles:
- Added missing &mt() calls
- Optimized &mt() usages
- Corrected <p> tag closures
- Replaced hardcoded styles by LON-CAPA standard styles
- Optimized some phrases
Index: loncom/publisher/lonretrieve.pm
diff -u loncom/publisher/lonretrieve.pm:1.35 loncom/publisher/lonretrieve.pm:1.36
--- loncom/publisher/lonretrieve.pm:1.35 Mon Nov 10 14:11:08 2008
+++ loncom/publisher/lonretrieve.pm Thu Nov 20 18:03:55 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to retrieve an old version of a file
#
-# $Id: lonretrieve.pm,v 1.35 2008/11/10 14:11:08 jms Exp $
+# $Id: lonretrieve.pm,v 1.36 2008/11/20 18:03:55 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -192,18 +192,19 @@
$r->print(&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
'<p>'.'<span class="LC_warning">'.
- &mt('Retrieval of an old version will overwrite the file currently in construction space').'</span></p>');
+ &mt('Retrieval of an old version will overwrite the file currently in construction space.').'</span></p>');
if (!$is_meta) {
$r->print('<p>'.'<span class="LC_warning">'.
- &mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.').
+ &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.').
'</span></p>');
}
$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
} else {
- $r->print('<h3>'.&mt('No previous versions published.').'</h3>');
+ $r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>');
}
- $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.
- '</a></p>');
+ $r->print('<p><a href="/priv/'.$uname.$fn.'">'
+ .&mt('Back to [_1]','<span class="LC_filename">'.$fn.'</span>')
+ .'</a></p>');
}
# ---------------------------------- Interface for presenting specified version
@@ -231,25 +232,32 @@
if ($is_meta) { $logname =~ s/\.meta$//; }
$logname = $ctarget.'.log';
unless ($logfile=Apache::File->new('>>'.$logname)) {
- $r->print(
- '<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>');
+ $r->print('<span class="LC_error">'
+ .&mt('No write permission to user directory, FAIL')
+ .'</span>');
}
print $logfile
"\n\n================= Retrieve ".localtime()." ================\n".
"Version: $version\nSource: $csource\nTarget: $ctarget\n";
$r->print('<p>'.&mt('Copying file').': ');
if (copy($csource,$ctarget)) {
- $r->print('ok<p>');
+ $r->print('<span class="LC_success">'
+ .&mt('ok')
+ .'</span>');
print $logfile "Copied sucessfully.\n\n";
} else {
my $error=$!;
- $r->print('fail, '.$error.'<p>');
+ $r->print('<span class="LC_error">'
+ .&mt('Copy failed: [_1]',$error)
+ .'</span>');
print $logfile "Copy failed: $error\n\n";
}
- $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
- '">'.&mt('Back to').' '.$fn.'</a></font>');
+ $r->print('</p>'
+ .'<p><a href="/priv/'.$uname.$fn.'">'
+ .&mt('Back to [_1]',$fn)
+ .'</a></p>');
} else {
- $r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>');
+ $r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>');
&phaseone($r,$fn,$uname,$udom);
}
}
@@ -316,7 +324,10 @@
$r->print(&Apache::loncommon::start_page('Retrieve Published Resources'));
- $r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>');
+ $r->print('<h1>'
+ .&mt('Retrieve previous versions of [_1]'
+ ,'<span class="LC_filename">'.$fn.'</span>')
+ .'</h1>');
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
$r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname.
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.157 loncom/localize/localize/de.pm:1.158
--- loncom/localize/localize/de.pm:1.157 Thu Nov 20 16:32:39 2008
+++ loncom/localize/localize/de.pm Thu Nov 20 18:04:01 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.157 2008/11/20 16:32:39 bisitz Exp $
+# $Id: de.pm,v 1.158 2008/11/20 18:04:01 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -893,8 +893,8 @@
'FAIL'
=> 'Abbruch',
- 'Back to'
-=> 'Zurück zu',
+ 'Back to [_1]'
+=> 'Zurück zur Ressource [_1]',
'untitled'
=> 'kein Titel',
@@ -974,13 +974,13 @@
=> 'Vergebe/entziehe Rolle des Superusers',
'No previous versions published.'
-=> 'Keine vorhergehenden Versionen veröffentlicht.',
+=> 'Es wurden keine vorhergehenden Versionen veröffentlicht.',
'No write permission to'
=> 'Keine Schreibberechtigung für',
- 'Please pick a version to retrieve'
-=> 'Bitte wählen Sie eine Version aus, die Sie wiederherstellen möchten.',
+ 'Please pick a version to retrieve:'
+=> 'Bitte wählen Sie eine Version aus, die Sie wiederherstellen möchten:',
'Private - visible to author only for testing purposes'
=> 'Privat - für den Autor nur zu Testzwecken sichtbar',
@@ -991,11 +991,11 @@
'Public - no authentication or authorization required for use'
=> 'Öffentlich - keine LON-CAPA-Anmeldung zur Nutzung notwendig',
- 'Retrieval of an old version will overwrite the file currently in construction space'
-=> 'Der Abruf einer alten Version überschreibt die derzeit im Konstruktionsbereich vorhandene Datei!',
+ 'Retrieval of an old version will overwrite the file currently in construction space.'
+=> 'Das Wiederherstellen einer alten Version überschreibt die derzeit im Konstruktionsbereich vorhandene Datei.',
- 'Retrieve previous versions of'
-=> 'Wiederherstellen vorheriger Versionen von',
+ 'Retrieve previous versions of [_1]'
+=> 'Wiederherstellen vorheriger Versionen von [_1]',
'Retrieve version'
=> 'Ausgewählte Version wiederherstellen',
@@ -4303,7 +4303,10 @@
=> 'Alte Version wiederherstellen',
'Retrieving current (most recent) version'
-=> 'Rufe aktuelleste Version ab',
+=> 'Aktuelleste Version wiederherstellen',
+
+ 'Retrieving old version'
+=> 'Alte Version wiederherstellen',
'Return to DOCS'
=> 'Zurück zum Kursinhalt',
@@ -8197,7 +8200,7 @@
'Material appears to be correct'
=> 'Das Material scheint korrekt zu sein',
- 'This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.'
+ 'This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.'
=> 'Die Aktion wird lediglich die Ressource selbst wiederherstellen. Möchten Sie auch eine alte Version der Metadaten zu dieser Ressource wiederherstellen, müssen Sie dies extra tun.',
'is in this state due to author settings.'
@@ -14629,7 +14632,7 @@
=> 'Metadaten-Unterschiede',
'Retrieve Metadata'
-=> 'Alte Metadaten abrufen',
+=> 'Alte Metadaten wiederherstellen',
'Enter course'
=> 'Kurs betreten',
@@ -15969,7 +15972,7 @@
=> 'Warnungen und Fehler',
'[quant,_1,error]'
-=> '[quant,_1,Fehler]',
+=> '[quant,_1,Fehler,Fehler]',
'[quant,_1,warning]'
=> '[quant,_1,Warnung,Warnungen]',