Merged new string from stable

diff --git a/lang/en/resource.php b/lang/en/resource.php
index c5ff8f501c63cdb0272c2a55fc2c86da50a9526c..3a823d37ba372921468f529a18a09b15b96c40b3 100644 (file)
--- a/lang/en/resource.php
+++ b/lang/en/resource.php
@@ -4,6 +4,7 @@
 
 $string['addresource'] = 'Add a resource';
 $string['chooseafile'] = 'Choose or upload a file';
+$string['chooseparameter'] = 'Choose parameter';
 $string['configdefaulturl'] = 'This value is used to prefill the URL form when creating a new URL-based resource.';
 $string['configfilterexternalpages'] = 'Enabling this setting will cause all external resources (web pages, uploaded HTML files) to be processed by the currently defined site filters (such as glossary autolinks, for example).  Turning this option on may cause your course pages to slow down significantly - use with caution and only if you really need it.';
 $string['configframesize'] = 'When a web page or an uploaded file is displayed within a frame, this value is the size (in pixels) of the top frame (which contains the navigation).';

diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html
index 2c0ac837e5dc0f49ec842e081789439e4cb5b3c5..b3cfb30ba02113e067d0834b130c9ff72cada15e 100644 (file)
--- a/mod/resource/type/file/file.html
+++ b/mod/resource/type/file/file.html
@@ -153,7 +153,7 @@ for ($i=0; $i < $this->maxparameters; $i++) {
     echo "<tr>\n";
     echo "<td valign=\"top\">\n";
     echo "<select name=\"parameter$i\">\n";
-    echo "<option value=\"-\">-- Choose Parameter --</option>\n";
+    echo "<option value=\"-\">-- ".get_string('chooseparameter', 'resource')." --</option>\n";
     foreach ($this->parameters as $field=>$fieldarr) {
         if ($fieldarr['value'] === "optgroup") {
             echo "<optgroup label=\"{$fieldarr['langstr']}\">\n";