From 8dab71faac7d58297b6f63b0c0c4f1703d7ff493 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 3 Mar 2015 13:23:33 +0100 Subject: [PATCH] Use own phrases for undo/redo because Redactor's lang is unreliable --- com.woltlab.wcf/templates/wysiwyg.tpl | 2 ++ .../install/files/js/3rdParty/redactor/plugins/wbutton.js | 4 ++-- wcfsetup/install/lang/de.xml | 2 ++ wcfsetup/install/lang/en.xml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl index f1d7d224ce..444205df99 100644 --- a/com.woltlab.wcf/templates/wysiwyg.tpl +++ b/com.woltlab.wcf/templates/wysiwyg.tpl @@ -14,10 +14,12 @@ $(function() { 'wcf.bbcode.button.fontFamily': '{lang}wcf.bbcode.button.fontFamily{/lang}', 'wcf.bbcode.button.fontSize': '{lang}wcf.bbcode.button.fontSize{/lang}', 'wcf.bbcode.button.image': '{lang}wcf.bbcode.button.image{/lang}', + 'wcf.bbcode.button.redo': '{lang}wcf.bbcode.button.redo{/lang}', 'wcf.bbcode.button.subscript': '{lang}wcf.bbcode.button.subscript{/lang}', 'wcf.bbcode.button.superscript': '{lang}wcf.bbcode.button.superscript{/lang}', 'wcf.bbcode.button.toggleBBCode': '{lang}wcf.bbcode.button.toggleBBCode{/lang}', 'wcf.bbcode.button.toggleHTML': '{lang}wcf.bbcode.button.toggleHTML{/lang}', + 'wcf.bbcode.button.undo': '{lang}wcf.bbcode.button.undo{/lang}', 'wcf.bbcode.code': '{lang}wcf.bbcode.code{/lang}', 'wcf.bbcode.code.edit': '{lang}wcf.bbcode.code.edit{/lang}', 'wcf.bbcode.code.filename': '{lang}wcf.bbcode.code.filename{/lang}', diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbutton.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbutton.js index a598ef99c1..2485356f5e 100644 --- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbutton.js +++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbutton.js @@ -89,8 +89,8 @@ RedactorPlugins.wbutton = function() { this.button.addCallback(this.button.get('image'), $.proxy(this.wbutton.insertImage, this)); // handle redo/undo buttons - var $undoButton = this.button.addAfter('html', 'undo', this.lang.get('undo')); - var $redoButton = this.button.addAfter('undo', 'redo', this.lang.get('redo')); + var $undoButton = this.button.addAfter('html', 'undo', WCF.Language.get('wcf.bbcode.button.undo')); + var $redoButton = this.button.addAfter('undo', 'redo', WCF.Language.get('wcf.bbcode.button.redo')); this.button.addCallback($undoButton, this.buffer.undo); this.button.addCallback($redoButton, this.buffer.redo); diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 73afc5fbe9..6912aee814 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1769,12 +1769,14 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index bbf4de5330..d86a2e48b4 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1768,12 +1768,14 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi + + -- 2.20.1