From 379fbe96b28ec1afe447143cf562c6a9363a8017 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joshua=20R=C3=BCsweg?= Date: Sun, 21 Aug 2016 20:41:00 +0200 Subject: [PATCH] Add translations for the wysiwyg editor --- com.woltlab.wcf/templates/wysiwyg.tpl | 8 +++++++- .../files/js/3rdParty/redactor2/plugins/WoltLabColor.js | 2 +- .../files/js/3rdParty/redactor2/plugins/WoltLabSize.js | 2 +- wcfsetup/install/lang/de.xml | 2 ++ wcfsetup/install/lang/en.xml | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl index 42db80b1c8..581427c790 100644 --- a/com.woltlab.wcf/templates/wysiwyg.tpl +++ b/com.woltlab.wcf/templates/wysiwyg.tpl @@ -133,7 +133,13 @@ 'insert-column-left': '{lang}wcf.editor.table.insertColumnLeft{/lang}', 'insert-column-right': '{lang}wcf.editor.table.insertColumnRight{/lang}', 'insert-row-above': '{lang}wcf.editor.table.insertRowAbove{/lang}', - 'insert-row-below': '{lang}wcf.editor.table.insertRowBelow{/lang}' + 'insert-row-below': '{lang}wcf.editor.table.insertRowBelow{/lang}', + + // size + 'remove-size': '{lang}wcf.editor.button.size.removeSize{/lang}', + + // color + 'remove-color': '{lang}wcf.editor.button.color.removeColor{/lang}', } }, linkify: false, diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabColor.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabColor.js index d86c334c9f..6e93007fec 100644 --- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabColor.js +++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabColor.js @@ -15,7 +15,7 @@ $.Redactor.prototype.WoltLabColor = function() { var callback = this.WoltLabColor.setColor.bind(this), color; var dropdown = { 'removeColor': { - title: 'remove color', + title: this.lang.get('remove-color'), func: this.WoltLabColor.removeColor.bind(this) } }; diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSize.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSize.js index 8a0cdd6837..fd42c5c19e 100644 --- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSize.js +++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabSize.js @@ -17,7 +17,7 @@ $.Redactor.prototype.WoltLabSize = function() { } dropdown['removeSize'] = { - title: 'remove size', + title: this.lang.get('remove-size'), func: this.WoltLabSize.removeSize.bind(this) }; diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 731bb2d986..cac810db13 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2266,6 +2266,7 @@ Fehler sind beispielsweise: + @@ -2276,6 +2277,7 @@ Fehler sind beispielsweise: + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index eeccc7d101..b4f0640cd2 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2233,6 +2233,7 @@ Errors are: + @@ -2243,6 +2244,7 @@ Errors are: + -- 2.20.1