Language changes to weblib

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index fed8ed69f54f85d50a6da96837a8612c2e30f817..9929c43ef82a87b95ee95526007bca80971b0146 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -25,6 +25,7 @@ $string[category] = "Category";
 $string[changepassword] = "Change password";
 $string[changedpassword] = "Changed password";
 $string[changessaved] = "Changes saved";
+$string[choose] = "Choose";
 $string[choosecourse] = "Choose a course";
 $string[chooselivelogs] = "Or watch current activity";
 $string[chooselogs] = "Choose which logs you want to see";

diff --git a/lib/weblib.php b/lib/weblib.php
index 7052741908278e9afa459d57b0d3083a702bbbf9..b8674f7a1b824300f04a4c9a663480a6a40f1be1 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -145,9 +145,13 @@ function close_window_button() {
 }
 
 
-function choose_from_menu ($options, $name, $selected="", $nothing="Choose...", $script="", $nothingvalue="0") {
+function choose_from_menu ($options, $name, $selected="", $nothing="choose", $script="", $nothingvalue="0") {
 // $options["value"]["label"]
     
+    if ($nothing == "choose") {
+        $nothing = get_string("choose")."...";
+    }
+
     if ($script) {
         $javascript = "onChange=\"$script\"";
     }
@@ -173,7 +177,7 @@ function choose_from_menu ($options, $name, $selected="", $nothing="Choose...",
     echo "</SELECT>\n";
 }   
 
-function popup_form ($common, $options, $formname, $selected="", $nothing="Choose...") {
+function popup_form ($common, $options, $formname, $selected="", $nothing="choose") {
 //  Implements a complete little popup form
 //  $common   = the URL up to the point of the variable that changes
 //  $options  = A list of value-label pairs for the popup list
@@ -181,6 +185,10 @@ function popup_form ($common, $options, $formname, $selected="", $nothing="Choos
 //  $selected = the option that is already selected
 //  $nothing  = The label for the "no choice" option
 
+    if ($nothing == "choose") {
+        $nothing = get_string("choose")."...";
+    }
+
     echo "<FORM NAME=$formname>";
     echo "<SELECT NAME=popup onChange=\"window.location=document.$formname.popup.options[document.$formname.popup.selectedIndex].value\">\n";