[LON-CAPA-cvs] cvs: loncom /interface londocs.pm /localize/localize de.pm zh.pm
bisitz
bisitz@source.lon-capa.org
Fri, 10 Jul 2009 17:05:10 -0000
This is a MIME encoded message
--bisitz1247245510
Content-Type: text/plain
bisitz Fri Jul 10 17:05:10 2009 EDT
Modified files:
/loncom/interface londocs.pm
/loncom/localize/localize de.pm zh.pm
Log:
DOCS - Consistent and optimized wording and screen layout:
- Wording: "Published Documents" -> "Published Resources"
- Don't display "Published Resources" twice. Headline should be enough.
- Wording: "Hide all Options" -> "Hide"
- Wording: "Export Course to IMS", "Export course to IMS content package"
-> "IMS Export" (button text, breadcrumbs)
-> "Export Course to IMS Package" (button title, headline)
- Corresponding changes for "IMS Import"
- IMS Export page:
- Wording: "Export Course DOCS" button -> just "Export"
- Added missing &mt calls
- Added warning style to warning and error style to error message
- Optimized layout for warning message
- Consistent wording: Download link
- First show error messages (if any), then download link
- Added link to go back in case of error
- Removed unused texthash entries
- Added/updated translation phrases in de.pm and zh.pm
--bisitz1247245510
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090710170510.txt"
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.376 loncom/interface/londocs.pm:1.377
--- loncom/interface/londocs.pm:1.376 Fri Jul 10 15:05:28 2009
+++ loncom/interface/londocs.pm Fri Jul 10 17:05:05 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.376 2009/07/10 15:05:28 bisitz Exp $
+# $Id: londocs.pm,v 1.377 2009/07/10 17:05:05 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -262,8 +262,9 @@
sub exportbutton {
my $type = &Apache::loncommon::course_type();
- return '<input type="submit" name="exportcourse" value="'.
- &mt('Export '.$type.' to IMS').'" />'.
+ return '<input type="submit" name="exportcourse"'
+ .' value="'.&mt('IMS Export').'"'
+ .' title="'.&mt('Export '.$type.' to IMS Package').'" />'.
&Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
}
@@ -277,7 +278,7 @@
my $numdisc = keys(%discussiontime);
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
- $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
+ $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package').
'<h2>'.&mt('IMS Export Failed').'</h2>'.
'<div class="LC_error">'.
&mt('Unable to retrieve information about course contents').
@@ -298,7 +299,17 @@
my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
if (@exportitems == 0 && @discussions == 0) {
- $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created. Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
+ $outcome =
+ '<p class="LC_warning">'
+ .&mt('As you did not select any content items or discussions'
+ .' for export, an IMS package has not been created.')
+ .'</p>'
+ .'<p>'
+ .&mt('Please [_1]go back[_2] to select either content items'
+ .' or discussions for export.'
+ ,'<a href="javascript:history.go(-1)">'
+ ,'</a>')
+ .'</p>';
} else {
my $now = time;
my %symbs;
@@ -321,22 +332,30 @@
open(OUTPUT, "zip -r $imszip * 2> /dev/null |");
close(OUTPUT);
chdir $cwd;
- $outcome .= '<p>'
- .&mt('Download the zip file from [_1]IMS '.lc($type).' archive[_2]'
- ,'<a href="'.$imszipfile.'">','</a>')
- .'</p>';
if ($copyresult) {
$outcome .= '<p class="LC_error">'
.&mt('The following errors occurred during export - [_1]'
,$copyresult)
.'</p>';
}
+ $outcome .= '<p>'
+ .&mt('[_1]Your IMS package[_2] is ready for download.'
+ ,'<a href="'.$imszipfile.'">','</a>')
+ .'</p>';
} else {
- $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
+ $outcome = '<p class="LC_error">'
+ .&mt('Unfortunately you will not be able to retrieve'
+ .' an IMS archive of this posts at this time,'
+ .' because there was a problem creating a'
+ .' manifest file.')
+ .'</p>'
+ .'<p><a href="javascript:history.go(-1)">'
+ .&mt('Go Back')
+ .'</a></p>';
}
}
- $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
+ $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
$r->print($outcome);
$r->print(&Apache::loncommon::end_page());
} else {
@@ -489,13 +508,13 @@
// ]]>
</script>
|;
- $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
+ $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package',
$scripttag));
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
$r->print($display.
'<p><input type="hidden" name="finishexport" value="1" />'.
'<input type="submit" name="exportcourse" value="'.
- &mt('Export '.$type.' DOCS').'" /></p></form>');
+ &mt('Export').'" /></p></form>');
}
}
@@ -2583,7 +2602,7 @@
&init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
&dumpcourse($r);
} elsif ($allowed && $env{'form.exportcourse'}) {
- &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
+ &init_breadcrumbs('exportcourse','IMS Export');
&exportcourse($r);
} else {
# is this a standard course?
@@ -2773,7 +2792,6 @@
'uplm' => 'Upload a new main '.lc($type).' document',
'upls' => 'Upload a new supplemental '.lc($type).' document',
'impp' => 'Import a document',
- 'pubd' => 'Published Documents',
'copm' => 'All documents out of a published map into this folder',
'upld' => 'Upload Document',
'srch' => 'Search',
@@ -2796,7 +2814,8 @@
'grpo' => 'Group Portfolio',
'rost' => 'Course Roster',
'abou' => 'Personal Information Page for a User',
- 'imsf' => 'Import IMS package',
+ 'imsf' => 'IMS Import',
+ 'imsl' => 'Import IMS package',
'file' => 'File',
'title' => 'Title',
'comment' => 'Comment',
@@ -2805,7 +2824,6 @@
'pm' => 'Published Map',
'sd' => 'Special Document',
'mo' => 'More Options',
- 'hao' => 'Hide all Options'
);
# -----------------------------------------------------------------------------
my $fileupload=(<<FIUP);
@@ -2847,7 +2865,6 @@
my $simpleeditdefaultform=(<<SEDFFORM);
<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
<input type="hidden" name="active" value="bb" />
- $lt{'pubd'}<br />
$uploadtag
<input type="button" onclick="javascript:groupsearch()" value="$lt{'srch'}" />
<br />
@@ -2983,7 +3000,7 @@
my $imspform=(<<IMSPFORM);
<form action="/adm/imsimportdocs" method="post" name="ims">
<input type="hidden" name="folder" value="$folder" />
- <input name="imsimport" type="button" value="$lt{'imsf'}" onclick="javascript:makeims();" />
+ <input name="imsimport" type="button" value="$lt{'imsf'}" title="$lt{imsl}" onclick="javascript:makeims();" />
</form>
IMSPFORM
@@ -3172,10 +3189,10 @@
my %orderhash = (
'aa' => ['Upload Document',$fileuploadform.'<br />'.$newfolderform],
- 'bb' => ['Published Documents',$simpleeditdefaultform],
+ 'bb' => ['Published Resources',$simpleeditdefaultform],
'cc' => ['Special Documents',$specialdocumentsform],
'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
- 'zz' => ['Hide all Options'],
+ 'zz' => ['Hide'],
);
my $tid='1';
my $varcd = 'Main Course Documents';
@@ -3301,7 +3318,7 @@
my %suporderhash = (
'ee' => ['Upload Document',$supupdocform.'<br />'.$supnewfolderform],
'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
- 'zz' => ['Hide all Options'],
+ 'zz' => ['Hide'],
);
my $tid='2';
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.313 loncom/localize/localize/de.pm:1.314
--- loncom/localize/localize/de.pm:1.313 Wed Jul 8 17:55:13 2009
+++ loncom/localize/localize/de.pm Fri Jul 10 17:05:09 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.313 2009/07/08 17:55:13 bisitz Exp $
+# $Id: de.pm,v 1.314 2009/07/10 17:05:09 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -237,6 +237,9 @@
'Discussion Board'
=> 'Diskussionsforum',
+ 'Published Resources'
+=> 'Veröffentlichte Ressourcen',
+
'Special Documents'
=> 'Spezielle Dokumente',
@@ -5600,9 +5603,33 @@
'If HTML file, upload embedded images/multimedia files'
=> 'Bei HTML-Dateien:<br />Eingebettete Bilder und Multimedia-Dateien mit hochladen', # 'Wenn HTML-Datei, eingebettete Bilder-/Multimedia-Dateien hochladen',
+ 'IMS Import'
+=> 'IMS-Import',
+
'Import IMS package'
=> 'IMS-Paket importieren',
+ 'IMS Export'
+=> 'IMS-Export',
+
+ 'Export Course to IMS Package'
+=> 'Kurs als IMS-Paket exportieren',
+
+ 'Export content item?'
+=> 'Inhaltselement exportieren?',
+
+ 'Export discussion posts?'
+=> 'Diskussionsbeitrag exportieren?',
+
+ 'As you did not select any content items or discussions for export, an IMS package has not been created.'
+=> 'Da Sie weder Inhaltselemente noch Diskussionsbeiträge zum Exportieren ausgewählt haben, wurde kein IMS-Paket erstellt.',
+
+ 'Please [_1]go back[_2] to select either content items or discussions for export.'
+=> 'Bitte gehen Sie [_1]zurück[_2], um Inhaltselemente und Diskussionsbeiträge zum Exportieren auszuwählen.',
+
+ '[_1]Your IMS package[_2] is ready for download.'
+=> '[_1]Ihr IMS-Paket[_2] steht zum Download bereit.',
+
'Import a document'
=> 'LON-CAPA-interne Dokumente',
@@ -6610,9 +6637,6 @@
'Existing Parameter Settings for Your Resources'
=> 'Bestehende Parameter-Einstellungen für Ihre Ressourcen',
- 'Export Course to IMS'
-=> 'IMS-Export',
-
'Group'
=> 'Gruppe',
@@ -8798,18 +8822,12 @@
'Discussion posts'
=> 'Diskussionsbeiträge',
- 'Export Course DOCS'
-=> 'Exportieren',
-
'Download the zip file from'
=> 'Download ZIP-Datei:',
'IMS course archive'
=> 'IMS-Kursarchiv',
- 'Export course to IMS content package'
-=> 'Kurselemente nach IMS-Inhaltspaket exportieren',
-
'last name, first name'
=> 'Nachname, Vorname',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.66 loncom/localize/localize/zh.pm:1.67
--- loncom/localize/localize/zh.pm:1.66 Wed Jul 8 17:55:13 2009
+++ loncom/localize/localize/zh.pm Fri Jul 10 17:05:09 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.66 2009/07/08 17:55:13 bisitz Exp $
+# $Id: zh.pm,v 1.67 2009/07/10 17:05:09 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -213,6 +213,9 @@
'Bulletin Board'
=> '公告板',
+ 'Published Resources'
+=> 'Veröffentlichte Ressourcen',
+
'Special Documents'
=> '特别文件',
@@ -5642,9 +5645,33 @@
'If HTML file, upload embedded images/multimedia files'
=> '对于HTML文件:<br />上传嵌入式图像/多媒体文件',
+ 'IMS Import'
+=> 'IMS-Import',
+
'Import IMS package'
=> '导入 IMS-包',
+ 'IMS Export'
+=> 'IMS-Export',
+
+ 'Export Course to IMS Package'
+=> '导出-IMS-包',
+
+ 'Export content item?'
+=> 'Inhaltselement exportieren?',
+
+ 'Export discussion posts?'
+=> 'Diskussionsbeitrag exportieren?',
+
+ 'As you did not select any content items or discussions for export, an IMS package has not been created.'
+=> 'Da Sie weder Inhaltselemente noch Diskussionsbeiträge zum Exportieren ausgewählt haben, wurde kein IMS-Paket erstellt.',
+
+ 'Please [_1]go back[_2] to select either content items or discussions for export.'
+=> 'Bitte gehen Sie [_1]zurück[_2], um Inhaltselemente und Diskussionsbeiträge zum Exportieren auszuwählen.',
+
+ '[_1]Your IMS package[_2] is ready for download.'
+=> '[_1]Ihr IMS-Paket[_2] steht zum Download bereit.',
+
'Import a document'
=> 'LON-CAPA-内部文件',
@@ -6672,9 +6699,6 @@
'Existing Parameter Settings for Your Resources'
=> 'Bestehende Parameter-Einstellungen für Ihre Ressourcen',
- 'Export Course to IMS'
-=> '导出-IMS',
-
'Group'
=> '组',
@@ -8854,18 +8878,12 @@
'Discussion posts'
=> 'Diskussionsbeiträge',
- 'Export Course DOCS'
-=> 'Exportieren',
-
'Download the zip file from'
=> 'Download ZIP-Datei:',
'IMS course archive'
=> 'IMS-Kursarchiv',
- 'Export course to IMS content package'
-=> 'Kurselemente nach IMS-Inhaltspaket exportieren',
-
'last name, first name'
=> 'Nachname, Vorname',
--bisitz1247245510--