From: moodler <moodler>
Date: Wed, 29 Oct 2003 08:21:52 +0000 (+0000)
Subject: More language fixes, mostly using print_string instead of get_string
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=088e092db81b3efcf447e8787c74475bdfb6b202;p=moodle.git

More language fixes, mostly using print_string instead of get_string
---

diff --git a/lang/en/editor.php b/lang/en/editor.php
index 3cfb66a3f1..618f97a8ff 100644
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -65,6 +65,6 @@ $string['chooseicon'] = "Choose an icon to insert";
 $string['choosechar'] = "Choose Character";
 $string['insertsmile'] = "Insert smile";
 $string['insertchar'] = "Insert Special Character";
-$string['Path'] = "Path";
-$string['TEXT_MODE'] = "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWIG."
+$string['path'] = "Path";
+$string['textmode'] = "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWIG."
 ?>
diff --git a/lang/fi/editor.php b/lang/fi/editor.php
index a9cc164070..408afbcf88 100644
--- a/lang/fi/editor.php
+++ b/lang/fi/editor.php
@@ -2,8 +2,8 @@
       // htmlarea.php - created with Moodle 1.2 development (2003100900)
 
 
-$string['Path'] = "Polku";
-$string['TEXT_MODE'] = "Olet tekstitilassa.  Käytä [<>] painiketta palataksesi takaisin WYSIWIG -tilaan.";
+$string['path'] = "Polku";
+$string['textmode'] = "Olet tekstitilassa.  Käytä [<>] painiketta palataksesi takaisin WYSIWIG -tilaan.";
 $string['about'] = "Tietoja editorista";
 $string['absbottom'] = "Absbottom";
 $string['absmiddle'] = "Absmiddle";
diff --git a/lib/editor/lang/en.php b/lib/editor/lang/en.php
index 41f02aec29..9eafa3ad6f 100644
--- a/lib/editor/lang/en.php
+++ b/lib/editor/lang/en.php
@@ -22,48 +22,48 @@ HTMLArea.I18N = {
 	lang: "en",
 
 	tooltips: {
-		bold:           "<?php print(get_string("bold","editor"));?>",
-		italic:         "<?php print(get_string("italic","editor"));?>",
-		underline:      "<?php print(get_string("underline","editor"));?>",
-		strikethrough:  "<?php print(get_string("strikethrough","editor"));?>",
-		subscript:      "<?php print(get_string("subscript","editor"));?>",
-		superscript:    "<?php print(get_string("superscript","editor"));?>",
-		justifyleft:    "<?php print(get_string("justifyleft","editor"));?>",
-		justifycenter:  "<?php print(get_string("justifycenter","editor"));?>",
-		justifyright:   "<?php print(get_string("justifyright","editor"));?>",
-		justifyfull:    "<?php print(get_string("justifyfull","editor"));?>",
-		insertorderedlist:    "<?php print(get_string("orderedlist","editor"));?>",
-		insertunorderedlist:  "<?php print(get_string("unorderedlist","editor"));?>",
-		outdent:        "<?php print(get_string("outdent","editor"));?>",
-		indent:         "<?php print(get_string("indent","editor"));?>",
-		forecolor:      "<?php print(get_string("forecolor","editor"));?>",
-		hilitecolor:    "<?php print(get_string("hilitecolor","editor"));?>",
-		inserthorizontalrule: "<?php print(get_string("horizontalrule","editor"));?>",
-		createlink:     "<?php print(get_string("createlink","editor"));?>",
-		insertimage:    "<?php print(get_string("insertimage","editor"));?>",
-		inserttable:    "<?php print(get_string("inserttable","editor"));?>",
-		htmlmode:       "<?php print(get_string("htmlmode","editor"));?>",
-		popupeditor:    "<?php print(get_string("popupeditor","editor"));?>",
-		about:          "<?php print(get_string("about","editor"));?>",
-		showhelp:       "<?php print(get_string("showhelp","editor"));?>",
-		textindicator:  "<?php print(get_string("textindicator","editor"));?>",
-		undo:           "<?php print(get_string("undo","editor"));?>",
-		redo:           "<?php print(get_string("redo","editor"));?>",
-		cut:            "<?php print(get_string("cut","editor"));?>",
-		copy:           "<?php print(get_string("copy","editor"));?>",
-		paste:          "<?php print(get_string("paste","editor"));?>",
-		insertsmile:	"<?php print(get_string("insertsmile","editor"));?>",
-		insertchar:		"<?php print(get_string("insertchar","editor"));?>"
+		bold:           "<?php print_string("bold","editor") ?>",
+		italic:         "<?php print_string("italic","editor") ?>",
+		underline:      "<?php print_string("underline","editor") ?>",
+		strikethrough:  "<?php print_string("strikethrough","editor") ?>",
+		subscript:      "<?php print_string("subscript","editor") ?>",
+		superscript:    "<?php print_string("superscript","editor") ?>",
+		justifyleft:    "<?php print_string("justifyleft","editor") ?>",
+		justifycenter:  "<?php print_string("justifycenter","editor") ?>",
+		justifyright:   "<?php print_string("justifyright","editor") ?>",
+		justifyfull:    "<?php print_string("justifyfull","editor") ?>",
+		insertorderedlist:    "<?php print_string("orderedlist","editor") ?>",
+		insertunorderedlist:  "<?php print_string("unorderedlist","editor") ?>",
+		outdent:        "<?php print_string("outdent","editor") ?>",
+		indent:         "<?php print_string("indent","editor") ?>",
+		forecolor:      "<?php print_string("forecolor","editor") ?>",
+		hilitecolor:    "<?php print_string("hilitecolor","editor") ?>",
+		inserthorizontalrule: "<?php print_string("horizontalrule","editor") ?>",
+		createlink:     "<?php print_string("createlink","editor") ?>",
+		insertimage:    "<?php print_string("insertimage","editor") ?>",
+		inserttable:    "<?php print_string("inserttable","editor") ?>",
+		htmlmode:       "<?php print_string("htmlmode","editor") ?>",
+		popupeditor:    "<?php print_string("popupeditor","editor") ?>",
+		about:          "<?php print_string("about","editor") ?>",
+		showhelp:       "<?php print_string("showhelp","editor") ?>",
+		textindicator:  "<?php print_string("textindicator","editor") ?>",
+		undo:           "<?php print_string("undo","editor") ?>",
+		redo:           "<?php print_string("redo","editor") ?>",
+		cut:            "<?php print_string("cut","editor") ?>",
+		copy:           "<?php print_string("copy","editor") ?>",
+		paste:          "<?php print_string("paste","editor") ?>",
+		insertsmile:	"<?php print_string("insertsmile","editor") ?>",
+		insertchar:		"<?php print_string("insertchar","editor") ?>"
 	},
 
 	buttons: {
-		"ok":           "<?php print(get_string("ok","editor"));?>",
-		"cancel":       "<?php print(get_string("cancel","editor"));?>",
-		"browse":		"<?php print(get_string("browse","editor"));?>"
+		"ok":           "<?php print_string("ok","editor") ?>",
+		"cancel":       "<?php print_string("cancel","editor") ?>",
+		"browse":		"<?php print_string("browse","editor") ?>"
 	},
 
 	msg: {
-		"Path":         "<?php print(get_string("Path","editor"));?>",
-		"TEXT_MODE":    "<?php print(get_string("TEXT_MODE","editor"));?>"
+		"Path":         "<?php print_string("path","editor") ?>",
+		"TEXT_MODE":    "<?php print_string("textmode","editor") ?>"
 	}
 };
diff --git a/lib/editor/popups/dlg_ins_char.php b/lib/editor/popups/dlg_ins_char.php
index 7116688973..607f4b0bf5 100644
--- a/lib/editor/popups/dlg_ins_char.php
+++ b/lib/editor/popups/dlg_ins_char.php
@@ -123,7 +123,7 @@ function cancel() {
 </head>
 <body onload="Init()">
 <table class="dlg" cellpadding="0" cellspacing="2">
-<tr><td><table width="100%"><tr><td class="description" nowrap><?php print(get_string("choosechar","editor"));?></td><td valign="middle" width="100%"><hr width="100%"></td></tr></table></td></tr>
+<tr><td><table width="100%"><tr><td class="description" nowrap><?php print_string("choosechar","editor") ?></td><td valign="middle" width="100%"><hr width="100%"></td></tr></table></td></tr>
 <tr>
 <td>
     <table border="0" align="center" cellpadding="5">
@@ -143,7 +143,7 @@ function cancel() {
   </tr>
 <tr><td><table width="100%"><tr><td valign="middle" width="90%"><hr width="100%"></td></tr></table></td></tr>
 <tr><td align="right">
-	<input type="button" value="<?php print(get_string("close","editor"));?>" onclick="cancel()"></td></tr>
+	<input type="button" value="<?php print_string("close","editor") ?>" onclick="cancel()"></td></tr>
 </table>
 </body>
 </body>
diff --git a/lib/editor/popups/dlg_ins_smile.php b/lib/editor/popups/dlg_ins_smile.php
index ecad8c876a..5b8bd52569 100644
--- a/lib/editor/popups/dlg_ins_smile.php
+++ b/lib/editor/popups/dlg_ins_smile.php
@@ -88,7 +88,7 @@ function cancel() {
 </head>
 <body onload="Init()">
 <table class="dlg" cellpadding="0" cellspacing="2" width="100%" height="100%">
-<tr><td><table width="100%"><tr><td nowrap><?php print(get_string("chooseicon","editor"));?></td><td valign="middle" width="100%"><hr width="100%"></td></tr></table></td></tr>
+<tr><td><table width="100%"><tr><td nowrap><?php print_string("chooseicon","editor") ?></td><td valign="middle" width="100%"><hr width="100%"></td></tr></table></td></tr>
 <tr>
 <td>
     <table border="0" align="center" cellpadding="5">
@@ -208,7 +208,7 @@ function cancel() {
   </tr>
 <tr><td><table width="100%"><tr><td valign="middle" width="90%"><hr width="100%"></td></tr></table></td></tr>
 <tr><td align="right">
-	<input type="button" value="<?php print(get_string("close","editor"));?>" onclick="cancel()"></td></tr>
+	<input type="button" value="<?php print_string("close","editor") ?>" onclick="cancel()"></td></tr>
 </table>
 </body>
 </html>
diff --git a/lib/editor/popups/insert_image.php b/lib/editor/popups/insert_image.php
index 6c5ce1cbe9..dcaedd8975 100644
--- a/lib/editor/popups/insert_image.php
+++ b/lib/editor/popups/insert_image.php
@@ -142,22 +142,22 @@ form { padding: 0px; margin: 0px; }
 
 <body onload="Init()">
 
-<div class="title"><?php print(get_string("insertimage","editor"));?></div>
+<div class="title"><?php print_string("insertimage","editor") ?></div>
 
 <form action="" method="get">
 <table border="0" width="100%" style="padding: 0px; margin: 0px">
   <tbody>
 
   <tr>
-    <td style="width: 7em; text-align: right"><?php print(get_string("imageurl","editor"));?>:</td>
+    <td style="width: 7em; text-align: right"><?php print_string("imageurl","editor") ?>:</td>
     <td><input type="text" name="url" id="f_url" style="width:75%"
       title="Enter the image URL here" />
       <button name="preview" onclick="return onPreview();"
-      title="Preview the image in a new window"><?php print(get_string("preview","editor"));?></button>
+      title="Preview the image in a new window"><?php print_string("preview","editor") ?></button>
     </td>
   </tr>
   <tr>
-    <td style="width: 7em; text-align: right"><?php print(get_string("alternatetext","editor"));?>:</td>
+    <td style="width: 7em; text-align: right"><?php print_string("alternatetext","editor") ?>:</td>
     <td><input type="text" name="alt" id="f_alt" style="width:100%"
       title="For browsers that don't support images" /></td>
   </tr>
@@ -168,28 +168,28 @@ form { padding: 0px; margin: 0px; }
 <p />
 
 <fieldset style="float: left; margin-left: 5px;">
-<legend><?php print(get_string("layout","editor"));?></legend>
+<legend><?php print_string("layout","editor") ?></legend>
 
 <div class="space"></div>
 
-<div class="fl"><?php print(get_string("alignment","editor"));?>:</div>
+<div class="fl"><?php print_string("alignment","editor") ?>:</div>
 <select size="1" name="align" id="f_align"
   title="Positioning of this image">
-  <option value=""                             ><?php print(get_string("notset","editor"));?></option>
-  <option value="left"                         ><?php print(get_string("left","editor"));?></option>
-  <option value="right"                        ><?php print(get_string("right","editor"));?></option>
-  <option value="texttop"                      ><?php print(get_string("texttop","editor"));?></option>
-  <option value="absmiddle"                    ><?php print(get_string("absmiddle","editor"));?></option>
-  <option value="baseline" selected="1"        ><?php print(get_string("baseline","editor"));?></option>
-  <option value="absbottom"                    ><?php print(get_string("absbottom","editor"));?></option>
-  <option value="bottom"                       ><?php print(get_string("bottom","editor"));?></option>
-  <option value="middle"                       ><?php print(get_string("middle","editor"));?></option>
-  <option value="top"                          ><?php print(get_string("top","editor"));?></option>
+  <option value=""                             ><?php print_string("notset","editor") ?></option>
+  <option value="left"                         ><?php print_string("left","editor") ?></option>
+  <option value="right"                        ><?php print_string("right","editor") ?></option>
+  <option value="texttop"                      ><?php print_string("texttop","editor") ?></option>
+  <option value="absmiddle"                    ><?php print_string("absmiddle","editor") ?></option>
+  <option value="baseline" selected="1"        ><?php print_string("baseline","editor") ?></option>
+  <option value="absbottom"                    ><?php print_string("absbottom","editor") ?></option>
+  <option value="bottom"                       ><?php print_string("bottom","editor") ?></option>
+  <option value="middle"                       ><?php print_string("middle","editor") ?></option>
+  <option value="top"                          ><?php print_string("top","editor") ?></option>
 </select>
 
 <p />
 
-<div class="fl"><?php print(get_string("borderthickness","editor"));?>:</div>
+<div class="fl"><?php print_string("borderthickness","editor") ?>:</div>
 <input type="text" name="border" id="f_border" size="5"
 title="Leave empty for no border" />
 
@@ -198,17 +198,17 @@ title="Leave empty for no border" />
 </fieldset>
 
 <fieldset style="float:right; margin-right: 5px;">
-<legend><?php print(get_string("spacing","editor"));?></legend>
+<legend><?php print_string("spacing","editor") ?></legend>
 
 <div class="space"></div>
 
-<div class="fr"><?php print(get_string("horizontal","editor"));?>:</div>
+<div class="fr"><?php print_string("horizontal","editor") ?>:</div>
 <input type="text" name="horiz" id="f_horiz" size="5"
 title="Horizontal padding" />
 
 <p />
 
-<div class="fr"><?php print(get_string("vertical","editor"));?>:</div>
+<div class="fr"><?php print_string("vertical","editor") ?>:</div>
 <input type="text" name="vert" id="f_vert" size="5"
 title="Vertical padding" />
 
@@ -221,8 +221,8 @@ title="Vertical padding" />
 <?php 
 print(isteacher($id))?"<button title=\"$course->fullname\" type=\"button\" name=\"browse\" onclick=\"set_url_value()\">".get_string("browse","editor")."</button>&nbsp;\n":"";
 ?>
-<button type="button" name="ok" onclick="return onOK();"><?php print(get_string("ok","editor"));?></button>
-<button type="button" name="cancel" onclick="return onCancel();"><?php print(get_string("cancel","editor"));?></button>
+<button type="button" name="ok" onclick="return onOK();"><?php print_string("ok","editor") ?></button>
+<button type="button" name="cancel" onclick="return onCancel();"><?php print_string("cancel","editor") ?></button>
 </div>
 
 </form>
diff --git a/lib/editor/popups/insert_table.php b/lib/editor/popups/insert_table.php
index a4284be7e6..fdfa48ab66 100644
--- a/lib/editor/popups/insert_table.php
+++ b/lib/editor/popups/insert_table.php
@@ -78,27 +78,27 @@ form { padding: 0px; margin: 0px; }
 
 <body onload="Init()">
 
-<div class="title"><?php print(get_string("inserttable","editor"));?></div>
+<div class="title"><?php print_string("inserttable","editor") ?></div>
 
 <form action="" method="get">
 <table border="0" style="padding: 0px; margin: 0px">
   <tbody>
 
   <tr>
-    <td style="width: 4em; text-align: right"><?php print(get_string("rows","editor"));?>:</td>
+    <td style="width: 4em; text-align: right"><?php print_string("rows","editor") ?>:</td>
     <td><input type="text" name="f_rows" id="f_rows" size="5" title="Number of rows" value="2" /></td>
     <td></td>
     <td></td>
     <td></td>
   </tr>
   <tr>
-    <td style="width: 4em; text-align: right"><?php print(get_string("cols","editor"));?>:</td>
+    <td style="width: 4em; text-align: right"><?php print_string("cols","editor") ?>:</td>
     <td><input type="text" name="f_cols" id="f_cols" size="5" title="Number of columns" value="4" /></td>
-    <td style="width: 4em; text-align: right"><?php print(get_string("width","editor"));?>:</td>
+    <td style="width: 4em; text-align: right"><?php print_string("width","editor") ?>:</td>
     <td><input type="text" name="f_width" id="f_width" size="5" title="Width of the table" value="100" /></td>
     <td><select size="1" name="f_unit" id="f_unit" title="Width unit">
-      <option value="%" selected="1"  ><?php print(get_string("percent","editor"));?></option>
-      <option value="px"              ><?php print(get_string("pixels","editor"));?></option>
+      <option value="%" selected="1"  ><?php print_string("percent","editor") ?></option>
+      <option value="px"              ><?php print_string("pixels","editor") ?></option>
       <option value="em"              >Em</option>
     </select></td>
   </tr>
@@ -109,28 +109,28 @@ form { padding: 0px; margin: 0px; }
 <p />
 
 <fieldset style="float: left; margin-left: 5px;">
-<legend><?php print(get_string("layout","editor"));?></legend>
+<legend><?php print_string("layout","editor") ?></legend>
 
 <div class="space"></div>
 
-<div class="fl"><?php print(get_string("alignment","editor"));?>:</div>
+<div class="fl"><?php print_string("alignment","editor") ?>:</div>
 <select size="1" name="f_align" id="f_align"
   title="Positioning of this image">
-  <option value="" selected="1"                ><?php print(get_string("notset","editor"));?></option>
-  <option value="left"                         ><?php print(get_string("left","editor"));?></option>
-  <option value="right"                        ><?php print(get_string("right","editor"));?></option>
-  <option value="texttop"                      ><?php print(get_string("texttop","editor"));?></option>
-  <option value="absmiddle"                    ><?php print(get_string("absmiddle","editor"));?></option>
-  <option value="baseline"                     ><?php print(get_string("baseline","editor"));?></option>
-  <option value="absbottom"                    ><?php print(get_string("absbottom","editor"));?></option>
-  <option value="bottom"                       ><?php print(get_string("bottom","editor"));?></option>
-  <option value="middle"                       ><?php print(get_string("middle","editor"));?></option>
-  <option value="top"                          ><?php print(get_string("top","editor"));?></option>
+  <option value="" selected="1"                ><?php print_string("notset","editor") ?></option>
+  <option value="left"                         ><?php print_string("left","editor") ?></option>
+  <option value="right"                        ><?php print_string("right","editor") ?></option>
+  <option value="texttop"                      ><?php print_string("texttop","editor") ?></option>
+  <option value="absmiddle"                    ><?php print_string("absmiddle","editor") ?></option>
+  <option value="baseline"                     ><?php print_string("baseline","editor") ?></option>
+  <option value="absbottom"                    ><?php print_string("absbottom","editor") ?></option>
+  <option value="bottom"                       ><?php print_string("bottom","editor") ?></option>
+  <option value="middle"                       ><?php print_string("middle","editor") ?></option>
+  <option value="top"                          ><?php print_string("top","editor") ?></option>
 </select>
 
 <p />
 
-<div class="fl"><?php print(get_string("borderthickness","editor"));?>:</div>
+<div class="fl"><?php print_string("borderthickness","editor") ?>:</div>
 <input type="text" name="f_border" id="f_border" size="5" value="1"
 title="Leave empty for no border" />
 <!--
@@ -144,17 +144,17 @@ title="Leave empty for no border" />
 </fieldset>
 
 <fieldset style="float:right; margin-right: 5px;">
-<legend><?php print(get_string("spacing","editor"));?></legend>
+<legend><?php print_string("spacing","editor") ?></legend>
 
 <div class="space"></div>
 
-<div class="fr"><?php print(get_string("cellspacing","editor"));?>:</div>
+<div class="fr"><?php print_string("cellspacing","editor") ?>:</div>
 <input type="text" name="f_spacing" id="f_spacing" size="5" value="1"
 title="Space between adjacent cells" />
 
 <p />
 
-<div class="fr"><?php print(get_string("cellpadding","editor"));?>:</div>
+<div class="fr"><?php print_string("cellpadding","editor") ?>:</div>
 <input type="text" name="f_padding" id="f_padding" size="5" value="1"
 title="Space between content and border in cell" />
 
@@ -164,8 +164,8 @@ title="Space between content and border in cell" />
 
 <div style="margin-top: 85px; text-align: right;">
 <hr />
-<button type="button" name="ok" onclick="return onOK();"><?php print(get_string("ok","editor"));?></button>
-<button type="button" name="cancel" onclick="return onCancel();"><?php print(get_string("cancel","editor"));?></button>
+<button type="button" name="ok" onclick="return onOK();"><?php print_string("ok","editor") ?></button>
+<button type="button" name="cancel" onclick="return onCancel();"><?php print_string("cancel","editor") ?></button>
 </div>
 
 </form>