Added button language variables

Additionally unified available button language variables for JavaScript (some where missing)

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index d70926807882b19f688e367659b9e1a10e553e14..edd944ff89ca9f9c4d780f4565256c755df91fbd 100644 (file)
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -43,8 +43,13 @@
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({
-                       'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
+                       'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
+                       'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
+                       'wcf.global.button.disable': '{lang}wcf.global.button.disable{/lang}',
                        'wcf.global.button.edit': '{lang}wcf.global.button.edit{/lang}',
+                       'wcf.global.button.enable': '{lang}wcf.global.button.enable{/lang}',
+                       'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
+                       'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
                        'wcf.global.error.title': '{lang}wcf.global.error.title{/lang}',
                        'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
                        'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
@@ -56,9 +61,6 @@
                        'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
                        'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
                        'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
-                       'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
-                       'wcf.global.button.disable': '{lang}wcf.global.button.disable{/lang}',
-                       'wcf.global.button.enable': '{lang}wcf.global.button.enable{/lang}',
                        'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
                        'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
                        'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}'

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 7f83b9e95f5d82f36606f30726988c4d504b2b60..8b648854d55cea2f03b764ae4cf71510068124f0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -54,7 +54,14 @@
                        {/if}
                        
                        WCF.Language.addObject({
+                               'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
+                               'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
+                               'wcf.global.button.disable': '{lang}wcf.global.button.disable{/lang}',
+                               'wcf.global.button.disabledI18n': '{lang}wcf.global.button.disabledI18n{/lang}',
+                               'wcf.global.button.edit': '{lang}wcf.global.button.edit{/lang}',
+                               'wcf.global.button.enable': '{lang}wcf.global.button.enable{/lang}',
                                'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
+                               'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
                                'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
                                'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
                                'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
@@ -65,10 +72,6 @@
                                'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
                                'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
                                'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
-                               'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
-                               'wcf.global.button.disable': '{lang}wcf.global.button.disable{/lang}',
-                               'wcf.global.button.disabledI18n': '{lang}wcf.global.button.disabledI18n{/lang}',
-                               'wcf.global.button.enable': '{lang}wcf.global.button.enable{/lang}',
                                'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
                                'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
                                'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 4983dec64876857cc8904a033897708790e3cab7..3e1f354b15866fabb0df6f9f4562312779fa8b14 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -568,6 +568,7 @@
        <category name="wcf.global">
                <item name="wcf.global.button.add"><![CDATA[Hinzufügen]]></item>
                <item name="wcf.global.button.back"><![CDATA[&laquo; Zurück]]></item>
+               <item name="wcf.global.button.cancel"><![CDATA[Abbrechen]]></item>
                <item name="wcf.global.button.collapsible"><![CDATA[Auf- und Zuklappen]]></item>
                <item name="wcf.global.button.delete"><![CDATA[Löschen]]></item>
                <item name="wcf.global.button.disable"><![CDATA[Deaktivieren]]></item>
@@ -576,6 +577,7 @@
                <item name="wcf.global.button.enable"><![CDATA[Aktivieren]]></item>
                <item name="wcf.global.button.next"><![CDATA[Weiter &raquo;]]></item>
                <item name="wcf.global.button.reset"><![CDATA[Zurücksetzen]]></item>
+               <item name="wcf.global.button.save"><![CDATA[Speichern]]></item>
                <item name="wcf.global.button.search"><![CDATA[Suche]]></item>
                <item name="wcf.global.button.submit"><![CDATA[Absenden]]></item>
                <item name="wcf.global.confirmation.cancel"><![CDATA[Abbrechen]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 09b452d1fbf1a6b6566b27837d92c233555c46a8..f4dd29f403b74a1ff66d6869a86d58dc745af123 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -535,6 +535,7 @@
        <category name="wcf.global">
                <item name="wcf.global.button.add"><![CDATA[Add]]></item>
                <item name="wcf.global.button.back"><![CDATA[&laquo; Back]]></item>
+               <item name="wcf.global.button.cancel"><![CDATA[Cancel]]></item>
                <item name="wcf.global.button.collapsible"><![CDATA[Expand and collapse]]></item>
                <item name="wcf.global.button.delete"><![CDATA[Delete]]></item>
                <item name="wcf.global.button.disable"><![CDATA[Disable]]></item>
@@ -543,6 +544,7 @@
                <item name="wcf.global.button.enable"><![CDATA[Enable]]></item>
                <item name="wcf.global.button.next"><![CDATA[Next &raquo;]]></item>
                <item name="wcf.global.button.reset"><![CDATA[Reset]]></item>
+               <item name="wcf.global.button.save"><![CDATA[Save]]></item>
                <item name="wcf.global.button.search"><![CDATA[Search]]></item>
                <item name="wcf.global.button.submit"><![CDATA[Submit]]></item>
                <item name="wcf.global.confirmation.cancel"><![CDATA[Cancel]]></item>