[LON-CAPA-cvs] cvs: loncom /homework edit.pm hint.pm matchresponse.pm optionresponse.pm radiobuttonresponse.pm rankresponse.pm response.pm structuretags.pm /interface loncommon.pm /localize/localize de.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Fri, 24 Oct 2008 16:23:09 -0000
This is a MIME encoded message
--bisitz1224865389
Content-Type: text/plain
bisitz Fri Oct 24 16:23:09 2008 EDT
Modified files:
/loncom/homework edit.pm hint.pm matchresponse.pm optionresponse.pm
radiobuttonresponse.pm rankresponse.pm response.pm
structuretags.pm
/loncom/interface loncommon.pm
/loncom/localize/localize de.pm
Log:
Localization, wording, nobreaks for Colorful Editor
- Added missing &mt() calls at several places (more to be done)
- Same wording "Delete?" for all Delete options
- Same wording style, e.g. added ":" after text and before optionlist
- Added nobreak style for some elements which need to stay together, e.g. help_open_topic in loncommon.pm
- Added/updated some related German translations
--bisitz1224865389
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20081024162309.txt"
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.115 loncom/homework/edit.pm:1.116
--- loncom/homework/edit.pm:1.115 Tue Aug 26 03:18:29 2008
+++ loncom/homework/edit.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.115 2008/08/26 03:18:29 raeburn Exp $
+# $Id: edit.pm,v 1.116 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,7 @@
if (!$description) { $description="<$tag>"; }
}
$result.= &start_table($token)."<tr><td>$description</td>
- <td>Delete".
+ <td>".&mt('Delete?').' '.
&deletelist($target,$token)
."</td>
<td>".
@@ -145,7 +145,7 @@
my ($target,$token) = @_;
my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
<option></option>
-<option>Yes</option>
+<option>".&mt('yes')."</option>
</select>";
return $result;
}
@@ -215,7 +215,7 @@
if ($target eq 'edit') {
my $optionlist= &get_insert_list($tagname);
if ($optionlist) {
- $result = "Insert:
+ $result = &mt('Insert:')."
<select name=\"insert$after\_$Apache::lonxml::curdepth\">
$optionlist
</select>"
@@ -740,11 +740,11 @@
$text=$option;
$value='value="'.$option.'"';
}
- $result.="<nobr><label><input type='checkbox' $value name='".
- &html_element_name($name)."'";
+ $result.="<nobr><label><input type=\"checkbox\" $value name=\"".
+ &html_element_name($name)."\"";
foreach my $selected (split(/,/,$allselected)) {
if ( $selected eq $option ) {
- $result.=" checked='checked' ";
+ $result.=" checked=\"checked\" ";
last;
}
}
@@ -780,12 +780,12 @@
$value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
}
if ( $selected eq $option ) {
- $optionlist.="<option $value selected=\"selected\">$text</option>\n";
+ $optionlist.="<option $value selected=\"selected\">".&mt($text)."</option>\n";
} else {
- $optionlist.="<option $value >$text</option>\n";
+ $optionlist.="<option $value >".&mt($text)."</option>\n";
}
}
- $result.='<nobr>'.$description.' <select name="'.
+ $result.='<nobr>'.&mt($description).' <select name="'.
&html_element_name($name).'" '.&element_change_detection().' >
'.$optionlist.'
</select></nobr>';
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.71 loncom/homework/hint.pm:1.72
--- loncom/homework/hint.pm:1.71 Sat Sep 13 02:08:32 2008
+++ loncom/homework/hint.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.71 2008/09/13 02:08:32 raeburn Exp $
+# $Id: hint.pm,v 1.72 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,7 +68,7 @@
$result .= '\keephidden{';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
- $result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]],$token);
+ $result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',['no','yes'],$token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.71 loncom/homework/matchresponse.pm:1.72
--- loncom/homework/matchresponse.pm:1.71 Wed Sep 10 10:11:14 2008
+++ loncom/homework/matchresponse.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.71 2008/09/10 10:11:14 onken Exp $
+# $Id: matchresponse.pm,v 1.72 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,14 +54,16 @@
$result=&Apache::response::meta_package_write('matchresponse');
} elsif ($target eq 'edit' ) {
$result.=&Apache::edit::start_table($token).
- '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> ".&Apache::edit::end_row()
- .&Apache::edit::start_spanning_row();
+ '<tr><td>'.&Apache::lonxml::description($token)."</td>"
+ .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ ."<td> ".&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
$result.=
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
- &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ &Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
} elsif ($target eq 'modified') {
@@ -252,9 +254,11 @@
&Apache::response::pushrandomnumber();
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token)
- ."<tr><td>Collection Of Foils</td><td>Delete:"
+ ."<tr><td>".&mt('Collection Of Foils')."</td>"
+ .'<td><span class="LC_nobreak">'.&mt('Delete?')
.&Apache::edit::deletelist($target,$token)
- ."</td><td> ".&Apache::edit::end_row()
+ .'</span></td>'
+ ."<td> ".&Apache::edit::end_row()
.&Apache::edit::start_spanning_row()."\n";
}
return $result;
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.152 loncom/homework/optionresponse.pm:1.153
--- loncom/homework/optionresponse.pm:1.152 Thu Sep 11 17:38:14 2008
+++ loncom/homework/optionresponse.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.152 2008/09/11 17:38:14 onken Exp $
+# $Id: optionresponse.pm,v 1.153 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,17 +45,19 @@
%Apache::hint::option=();
undef(%Apache::response::foilnames);
if ($target eq 'edit') {
- $result.=&Apache::edit::start_table($token).
- "<tr><td>Multiple Option Response Question ".
- &Apache::loncommon::help_open_topic('Option_Response_Problems')."</td><td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> ".
- &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- "\n";
+ $result.=&Apache::edit::start_table($token)
+ .'<tr><td><span class="LC_nobreak">'.&mt('Multiple Option Response Question').'</span> '
+ .&Apache::loncommon::help_open_topic('Option_Response_Problems')."</td>"
+ .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ ."<td> "
+ .&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row()
+ ."\n";
$result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
$token,'4').
- &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ &Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).
&Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
[['horizontal',&mt('Normal list')],
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.135 loncom/homework/radiobuttonresponse.pm:1.136
--- loncom/homework/radiobuttonresponse.pm:1.135 Fri Sep 5 12:50:45 2008
+++ loncom/homework/radiobuttonresponse.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.135 2008/09/05 12:50:45 onken Exp $
+# $Id: radiobuttonresponse.pm,v 1.136 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,17 +65,19 @@
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('radiobuttonresponse');
} elsif ($target eq 'edit' ) {
- $result.=&Apache::edit::start_table($token).
- '<tr><td>'.&Apache::lonxml::description($token).
- &Apache::loncommon::help_open_topic('Radio_Response_Problems').
- "</td><td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> ".&Apache::edit::end_row()
- .&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::start_table($token)
+ .'<tr><td>'.&Apache::lonxml::description($token)
+ .&Apache::loncommon::help_open_topic('Radio_Response_Problems')
+ .'</td>'
+ .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ .'<td> '.&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
$result.=
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
$token,'4').
- &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ &Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).
&Apache::edit::select_arg('Display Direction','direction',
['vertical','horizontal'],$token).
Index: loncom/homework/rankresponse.pm
diff -u loncom/homework/rankresponse.pm:1.58 loncom/homework/rankresponse.pm:1.59
--- loncom/homework/rankresponse.pm:1.58 Wed Oct 8 13:58:50 2008
+++ loncom/homework/rankresponse.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# rank style response
#
-# $Id: rankresponse.pm,v 1.58 2008/10/08 13:58:50 onken Exp $
+# $Id: rankresponse.pm,v 1.59 2008/10/24 16:22:54 bisitz Exp $
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -50,15 +50,17 @@
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('rankresponse');
} elsif ($target eq 'edit' ) {
- $result.=&Apache::edit::start_table($token).
- '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> ".&Apache::edit::end_row()
- .&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::start_table($token)
+ .'<tr><td>'.&Apache::lonxml::description($token).'</td>'
+ .'<td>span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ .'<td> '.&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
$result.=
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
- &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ &Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
} elsif ($target eq 'modified') {
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.205 loncom/homework/response.pm:1.206
--- loncom/homework/response.pm:1.205 Tue Sep 23 19:15:57 2008
+++ loncom/homework/response.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.205 2008/09/23 19:15:57 raeburn Exp $
+# $Id: response.pm,v 1.206 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -680,7 +680,7 @@
}
}
if (defined($optionlist)) {
- $result.='Use template: <select name="'.
+ $result.=&mt('Use template:').' <select name="'.
&Apache::edit::html_element_name('parameter_package').'">'.
'<option value=""></option>'.$optionlist.'</select><br />';
}
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.432 loncom/homework/structuretags.pm:1.433
--- loncom/homework/structuretags.pm:1.432 Sun Oct 12 13:35:34 2008
+++ loncom/homework/structuretags.pm Fri Oct 24 16:22:54 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.432 2008/10/12 13:35:34 foxr Exp $
+# $Id: structuretags.pm,v 1.433 2008/10/24 16:22:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1896,10 +1896,10 @@
if ($target eq 'edit') {
my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
- $result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
-<td>".&mt('Delete:').
- &Apache::edit::deletelist($target,$token)
- ."</td>";
+ $result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
+ .'<td><span clas="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>';
unless ($env{'environment.wysiwygeditor'} eq 'on') {
$result.='<td align="left">'
.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.690 loncom/interface/loncommon.pm:1.691
--- loncom/interface/loncommon.pm:1.690 Thu Oct 2 15:38:56 2008
+++ loncom/interface/loncommon.pm Fri Oct 24 16:23:00 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.690 2008/10/02 15:38:56 bisitz Exp $
+# $Id: loncommon.pm,v 1.691 2008/10/24 16:23:00 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -926,7 +926,7 @@
if ($text ne "") {
$template .=
"<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
- "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+ "<td bgcolor='#5555FF'><span class=\"LC_nobreak\"><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
}
# Add the graphic
@@ -935,7 +935,7 @@
$template .= <<"ENDTEMPLATE";
<a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
ENDTEMPLATE
- if ($text ne '') { $template.='</td></tr></table>' };
+ if ($text ne '') { $template.='</span></td></tr></table>' };
return $template;
}
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.153 loncom/localize/localize/de.pm:1.154
--- loncom/localize/localize/de.pm:1.153 Thu Oct 23 14:26:23 2008
+++ loncom/localize/localize/de.pm Fri Oct 24 16:23:08 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.153 2008/10/23 14:26:23 bisitz Exp $
+# $Id: de.pm,v 1.154 2008/10/24 16:23:08 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2747,7 +2747,7 @@
=> 'E-Mail-Adresse',
'Enroll a single student'
-=> 'Einen einzelnen Studenten eintragen',
+=> 'Einzelnen Studenten Kurs belegen lassen',
'Enrolling Students'
=> 'Studenten werden in den Kurs aufgenommen',
@@ -3212,6 +3212,9 @@
'True'
=> 'Wahr',
+ 'unused'
+=> 'nicht verwendet',
+
'Type-in value'
=> 'eingebbarer Wert',
@@ -4813,7 +4816,7 @@
=> 'ja',
'Swedish Chef'
-=> 'Schwedischer Koch',
+=> 'Dänischer Koch',
#SYNC Tue Aug 15 14:23:05 2006
@@ -7753,7 +7756,7 @@
=> 'Alle Farben auf Voreinstellung zurücksetzen',
'Directory Contents:'
-=> 'Inhaltsverzeichnis:', # n.t.
+=> 'Verzeichnis-Inhalt:',
'Save and Edit'
=> 'Speichern und weiterbearbeiten',
@@ -8214,10 +8217,16 @@
=> 'Benutzerrechte anpassen',
'Insert:'
-=> 'Einfügen:', # n.t.
+=> 'Einfügen:',
+
+ 'Delete?'
+=> 'Löschen?',
- 'Randomize Foil Order'
-=> 'Reihenfolge der Auswahlmöglichkeiten randomisieren', # n.t.
+ 'Randomize Foil Order:'
+=> 'Reihenfolge der Auswahlmöglichkeiten randomisieren:',
+
+ 'Use template:'
+=> 'Vorlage verwenden:',
'Display Direction'
=> 'Anzeige-Richtung:',
@@ -8241,7 +8250,7 @@
=> 'Hinweis', # n.t.
'Show hint even if problem Correct:'
-=> 'Hinweis auch zeigen, wenn Aufgabe richtig beantwortet wurde:', # n.t.
+=> 'Hinweis auch zeigen, wenn Aufgabe richtig beantwortet wurde:',
'Single Line Text Entry Area'
=> 'Zeile mit Texteingabefeld', # n.t.
@@ -8295,7 +8304,7 @@
=> 'In senkrechter Spalte aufgelistet',
'Multiple Option Response Question'
-=> 'Antworttyp: Optionsauswahl', # n.t.
+=> 'Antwortblock: Optionsauswahl',
'Select Options'
=> 'Wählbare Optionen', # n.t.
@@ -8328,7 +8337,7 @@
=> 'Dynamisch beschriftetes Bild', # n.t.
'Response: Click on Image'
-=> 'Antworttyp: Klick-ins-Bild', # n.t.
+=> 'Antwortblock: Klick-ins-Bild', # n.t.
'Collection of Imageresponse foils'
=> 'Sammlung von Bildantwort-Auswahlmöglichkeiten', # n.t.
@@ -11978,6 +11987,9 @@
'Enroll a Single Student'
=> 'Einzelnen Studenten Kurs belegen lassen',
+ 'Enroll a student'
+=> 'Student Kurs belegen lassen',
+
'Automated Enrollment Manager'
=> 'Verwaltung der automatischen Kursbelegung',
@@ -13430,8 +13442,11 @@
'Modify existing user: '
=> 'Existierenden Benutzer ändern: ',
+ 'Enroll one student'
+=> 'Einzelnen Studenten Kurs belegen lassen',
+
'Enroll one student: '
-=> 'Einzelnen Studenten eintragen: ',
+=> 'Einzelnen Studenten Kurs belegen lassen: ',
'Existing Roles'
=> 'Bestehende Rollen',
@@ -16112,21 +16127,6 @@
''
=> '',
- ''
-=> '',
-
- ''
-=> '',
-
- ''
-=> '',
-
- ''
-=> '',
-
- ''
-=> '',
-
#SYNCMARKER
);
1;
--bisitz1224865389--