Fixed error message for invalid links

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index fa3332ba7f9c688f3de0cd52e60f58a131364a68..54b28feb45922f62d810ca284de123a11402d477 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -72,6 +72,7 @@
                                
                                'wcf.editor.link.add': '{lang}wcf.editor.link.add{/lang}',
                                'wcf.editor.link.edit': '{lang}wcf.editor.link.edit{/lang}',
+                               'wcf.editor.link.error.invalid': '{lang}wcf.editor.link.error.invalid{/lang}',
                                'wcf.editor.link.url': '{lang}wcf.editor.link.url{/lang}',
                                'wcf.editor.link.text': '{lang}wcf.editor.link.text{/lang}',
                                

diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index fa3332ba7f9c688f3de0cd52e60f58a131364a68..54b28feb45922f62d810ca284de123a11402d477 100644 (file)
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -72,6 +72,7 @@
                                
                                'wcf.editor.link.add': '{lang}wcf.editor.link.add{/lang}',
                                'wcf.editor.link.edit': '{lang}wcf.editor.link.edit{/lang}',
+                               'wcf.editor.link.error.invalid': '{lang}wcf.editor.link.error.invalid{/lang}',
                                'wcf.editor.link.url': '{lang}wcf.editor.link.url{/lang}',
                                'wcf.editor.link.text': '{lang}wcf.editor.link.text{/lang}',
                                

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
index f278af6594c4c83196e28edb678cd2c5280b9ecd..ca5693775afa3f34fbc04c160efe501e833e4bda 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
@@ -33,9 +33,10 @@ define(['Language', 'Ui/Dialog'], function(Language, UiDialog) {
                                if (small === null) {
                                        small = elCreate('small');
                                        small.className = 'innerError';
-                                       small.textContent = Language.get('wcf.global.form.error.empty');
                                        url.parentNode.appendChild(small);
                                }
+                               
+                               small.textContent = Language.get((url.value.trim() === '' ? 'wcf.global.form.error.empty' : 'wcf.editor.link.error.invalid'));
                        }
                },
                

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c158fec65160f2b7d2c6471f369f7a9a1e3f0e8f..25a6cb1072461d14288e88bdf83bc392c6b9a02e 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2364,6 +2364,7 @@ Fehler sind beispielsweise:
                
                <item name="wcf.editor.link.add"><![CDATA[Link einfügen]]></item>
                <item name="wcf.editor.link.edit"><![CDATA[Link bearbeiten]]></item>
+               <item name="wcf.editor.link.error.invalid"><![CDATA[Der eingegebene Link ist ungültig.]]></item>
                <item name="wcf.editor.link.unlink"><![CDATA[Link entfernen]]></item>
                <item name="wcf.editor.link.url"><![CDATA[Link]]></item>
                <item name="wcf.editor.link.text"><![CDATA[Text]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6e937727c5a439c636198847a96194ef2665a8c2..19c497cad893e424ac0ba5ed4d972ebb0b86d6e3 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2330,6 +2330,7 @@ Errors are:
                
                <item name="wcf.editor.link.add"><![CDATA[Insert Link]]></item>
                <item name="wcf.editor.link.edit"><![CDATA[Edit Link]]></item>
+               <item name="wcf.editor.link.error.invalid"><![CDATA[You have entered an invalid link.]]></item>
                <item name="wcf.editor.link.unlink"><![CDATA[Unlink]]></item>
                <item name="wcf.editor.link.url"><![CDATA[Link]]></item>
                <item name="wcf.editor.link.text"><![CDATA[Text]]></item>