Merged changes for lang string fixes MDL-7263

diff --git a/lang/en_utf8/editor.php b/lang/en_utf8/editor.php
index 86e49a7af5d73282a95d2185b7850b47c1a73618..e89da38b75340033e8f0d459b135e2200ffa69e1 100644 (file)
--- a/lang/en_utf8/editor.php
+++ b/lang/en_utf8/editor.php
@@ -31,6 +31,7 @@ $string['createlink'] = 'Insert Web Link';
 $string['cut'] = 'Cut selection';
 $string['cutpastemozilla'] = 'Unfortunately, you cannot currently use normal keyboard shortcuts (or even the Paste button) for pasting text into this online editor.  This is because of a security feature that is built into some versions of Mozilla and Firefox browsers.<br /><br />There are three known workarounds you can try: <br /> (1) Instead of CTRL-v, use SHIFT-Insert <br /> (2) Use the Edit->Paste menu in your browser <br /> (3) Change the preferences in your browser by editing the user.js file. <br /><br />Click the OK button below for more help, or Cancel to return to the editor';
 $string['delete'] = 'Delete';
+$string['enterurlfirst'] = 'You have to enter an URL first';
 $string['filebrowser'] = 'File Browser';
 $string['findwhat'] = 'Find';
 $string['fontname'] = 'Fontname';
@@ -73,6 +74,7 @@ $string['matchcase'] = 'Match case';
 $string['middle'] = 'Middle';
 $string['minimize'] = 'Minimize editor';
 $string['move'] = 'Move';
+$string['mustenterurl'] = 'You must enter the URL';
 $string['nolink'] = 'Prevent automatic linking';
 $string['normal'] = 'Normal';
 $string['notimage'] = 'Selected file is not an image. Please select an image!';
@@ -85,6 +87,7 @@ $string['paste'] = 'Paste from clipboard';
 $string['path'] = 'Path';
 $string['percent'] = 'Percent';
 $string['pixels'] = 'Pixels';
+$string['pleaseenteralt'] = 'Please enter the alternate text';
 $string['popupeditor'] = 'Enlarge Editor';
 $string['preformatted'] = 'Preformatted';
 $string['preview'] = 'Preview';

diff --git a/lib/editor/htmlarea/popups/insert_image.php b/lib/editor/htmlarea/popups/insert_image.php
index b2c947499142bfcdf2f589fe27fc724c3f55632b..5f8044c59fcc6c27e3c3e51132e62f3efcc47b61 100644 (file)
--- a/lib/editor/htmlarea/popups/insert_image.php
+++ b/lib/editor/htmlarea/popups/insert_image.php
@@ -42,8 +42,8 @@ function Init() {
 
 function onOK() {
   var required = {
-    "f_url": "You must enter the URL",
-    "f_alt": "Please enter the alternate text"
+    "f_url": "<?php print_string("mustenterurl", "editor");?>",
+    "f_alt": "<?php print_string("pleaseenteralt", "editor");?>"
   };
   for (var i in required) {
     var el = document.getElementById(i);
@@ -81,7 +81,7 @@ function onPreview() {
   var f_url = document.getElementById("f_url");
   var url = f_url.value;
   if (!url) {
-    alert("You have to enter an URL first");
+    alert("<?php print_string("enterurlfirst","editor");?>");
     f_url.focus();
     return false;
   }

diff --git a/lib/editor/htmlarea/popups/insert_image_std.php b/lib/editor/htmlarea/popups/insert_image_std.php
index 50f29e82301af20a82ed33456f370e6e8360c3f8..83ac45f7e493ca645ee02dd20cdae68b8ba34583 100644 (file)
--- a/lib/editor/htmlarea/popups/insert_image_std.php
+++ b/lib/editor/htmlarea/popups/insert_image_std.php
@@ -37,8 +37,8 @@ function Init() {
 
 function onOK() {
   var required = {
-    "f_url": "You must enter the URL",
-    "f_alt": "Please enter the alternate text"
+    "f_url": "<?php print_string("mustenterurl", "editor");?>",
+    "f_url": "<?php print_string("pleaseenteralt", "editor");?>"
   };
   for (var i in required) {
     var el = document.getElementById(i);
@@ -76,7 +76,7 @@ function onPreview() {
   var f_url = document.getElementById("f_url");
   var url = f_url.value;
   if (!url) {
-    alert("You have to enter an URL first");
+    alert("<?php print_string("enterurlfirst","editor");?>");
     f_url.focus();
     return false;
   }