From 4ff95223ad0c020a2798af16092e0a6796512bf1 Mon Sep 17 00:00:00 2001 From: moodler Date: Sun, 5 Nov 2006 12:59:09 +0000 Subject: [PATCH] Merged changes for lang string fixes MDL-7263 --- lang/en_utf8/editor.php | 3 +++ lib/editor/htmlarea/popups/insert_image.php | 6 +++--- lib/editor/htmlarea/popups/insert_image_std.php | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lang/en_utf8/editor.php b/lang/en_utf8/editor.php index 86e49a7af5..e89da38b75 100644 --- 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.

There are three known workarounds you can try:
(1) Instead of CTRL-v, use SHIFT-Insert
(2) Use the Edit->Paste menu in your browser
(3) Change the preferences in your browser by editing the user.js file.

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 b2c9474991..5f8044c59f 100644 --- 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": "", + "f_alt": "" }; 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(""); 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 50f29e8230..83ac45f7e4 100644 --- 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": "", + "f_url": "" }; 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(""); f_url.focus(); return false; } -- 2.39.5