Unify language item naming
authorMatthias Schmidt <gravatronics@live.com>
Tue, 20 Sep 2016 17:48:44 +0000 (19:48 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 20 Sep 2016 18:11:04 +0000 (20:11 +0200)
wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js
wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index f0b9060bfb4f7dfaa0f25e1aefde7609875bc650..4e63a92ba787118e9bef521464abdcde6ce5477f 100644 (file)
@@ -14,9 +14,9 @@
                        Language.addObject({
                                'wcf.acp.page.objectID': '{lang}wcf.acp.page.objectID{/lang}',
                                {foreach from=$pageNodeList item=pageNode}
-                                       {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.objectID.{@$pageNode->identifier}{/lang}{/capture}
+                                       {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
                                        {if $pageObjectIDLanguageItem}
-                                               'wcf.page.objectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
+                                               'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
                                        {/if}
                                        {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.search.{@$pageNode->identifier}{/lang}{/capture}
                                        {if $pageObjectIDLanguageItem}
index 080371af760a6dd420a9fb81478a231c2d43c0c1..b996952f9d74f84f6e165679d0cf1b202582d3bc 100644 (file)
@@ -5,9 +5,9 @@
                Language.addObject({
                        'wcf.acp.page.objectID': '{lang}wcf.acp.page.objectID{/lang}',
                        {foreach from=$pageNodeList item=pageNode}
-                               {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.objectID.{@$pageNode->identifier}{/lang}{/capture}
+                               {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
                                {if $pageObjectIDLanguageItem}
-                                       'wcf.page.objectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
+                                       'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
                                {/if}
                                {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.search.{@$pageNode->identifier}{/lang}{/capture}
                                {if $pageObjectIDLanguageItem}
index 95f1f70b8931386fdd98305c4d60f9bad20fa2ba..710f3cc56dae24f4034361c16111e82c2d0eeb4c 100644 (file)
@@ -124,7 +124,7 @@ define(['Dictionary', 'Language', 'WoltLabSuite/Core/Ui/Page/Search/Handler'], f
                        _pageObjectId.value = (newValue) ? newValue : '';
                        
                        var pageIdentifier = elData(_pageId.options[_pageId.selectedIndex], 'identifier');
-                       var languageItem = 'wcf.page.objectID.' + pageIdentifier;
+                       var languageItem = 'wcf.page.pageObjectID.' + pageIdentifier;
                        if (Language.get(languageItem) === languageItem) {
                                languageItem = 'wcf.acp.page.objectID';
                        }
index b3cf779d6e8d249664e16fa17db4593e98a2f6aa..c314dcde18faa7a6fc6e0fec1b7db6fea6e88c7a 100644 (file)
@@ -107,7 +107,7 @@ define(['Dictionary', 'Language', 'WoltLabSuite/Core/Ui/Page/Search/Handler'], f
                        _pageObjectId.value = (newValue) ? newValue : '';
                        
                        var pageIdentifier = elData(_pageId.options[_pageId.selectedIndex], 'identifier');
-                       var languageItem = 'wcf.page.objectID.' + pageIdentifier;
+                       var languageItem = 'wcf.page.pageObjectID.' + pageIdentifier;
                        if (Language.get(languageItem) === languageItem) {
                                languageItem = 'wcf.acp.page.objectID';
                        }
index 6867b4774bab229697b8f211b896b7947b183471..e8f691ee2390f17a33656aab924a3698765ecd3a 100644 (file)
@@ -2834,9 +2834,9 @@ Fehler sind beispielsweise:
                <item name="wcf.page.jumpTo.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Gib{else}Geben Sie{/if} einen Wert zwischen „1“ und „#pages#“ ein.]]></item>
                <item name="wcf.page.redirect.title"><![CDATA[Weiterleitung]]></item>
                <item name="wcf.page.redirect.url"><![CDATA[Falls die automatische Weiterleitung nicht funktioniert, {if LANGUAGE_USE_INFORMAL_VARIANT}klicke{else}klicken Sie{/if} bitte hier!]]></item>
-               <item name="wcf.page.objectID.com.woltlab.wcf.Article"><![CDATA[ID des Artikels]]></item>
-               <item name="wcf.page.objectID.com.woltlab.wcf.CategoryArticleList"><![CDATA[ID der Kategorie]]></item>
-               <item name="wcf.page.objectID.com.woltlab.wcf.User"><![CDATA[ID des Benutzers]]></item>
+               <item name="wcf.page.pageObjectID.com.woltlab.wcf.Article"><![CDATA[ID des Artikels]]></item>
+               <item name="wcf.page.pageObjectID.com.woltlab.wcf.CategoryArticleList"><![CDATA[ID der Kategorie]]></item>
+               <item name="wcf.page.pageObjectID.com.woltlab.wcf.User"><![CDATA[ID des Benutzers]]></item>
                <item name="wcf.page.pageObjectID.search.com.woltlab.wcf.Article"><![CDATA[Artikeltitel durchsuchen]]></item>
                <item name="wcf.page.pageObjectID.search.com.woltlab.wcf.CategoryArticleList"><![CDATA[Kategorietitel durchsuchen]]></item>
                <item name="wcf.page.pageObjectID.search.com.woltlab.wcf.User"><![CDATA[Benutzernamen durchsuchen]]></item>
index 5d563de049ecd2c8beebadda6341b1b7455188fb..0f07ff6d5d10ababf5f02f45945f74bd4a5bb5b3 100644 (file)
@@ -2793,9 +2793,9 @@ Errors are:
                <item name="wcf.page.jumpTo.description"><![CDATA[Enter a value between “1” and “#pages#”.]]></item>
                <item name="wcf.page.redirect.title"><![CDATA[Redirection]]></item>
                <item name="wcf.page.redirect.url"><![CDATA[Please click here if the automatic redirection does not work!]]></item>
-               <item name="wcf.page.objectID.com.woltlab.wcf.Article"><![CDATA[ID of the Article]]></item>
-               <item name="wcf.page.objectID.com.woltlab.wcf.CategoryArticleList"><![CDATA[ID of the Category]]></item>
-               <item name="wcf.page.objectID.com.woltlab.wcf.User"><![CDATA[ID of the User]]></item>
+               <item name="wcf.page.pageObjectID.com.woltlab.wcf.Article"><![CDATA[ID of the Article]]></item>
+               <item name="wcf.page.pageObjectID.com.woltlab.wcf.CategoryArticleList"><![CDATA[ID of the Category]]></item>
+               <item name="wcf.page.pageObjectID.com.woltlab.wcf.User"><![CDATA[ID of the User]]></item>
                <item name="wcf.page.pageObjectID.search.com.woltlab.wcf.Article"><![CDATA[Search Article Titles]]></item>
                <item name="wcf.page.pageObjectID.search.com.woltlab.wcf.CategoryArticleList"><![CDATA[Search Category Titles]]></item>
                <item name="wcf.page.pageObjectID.search.com.woltlab.wcf.User"><![CDATA[Search Usernames]]></item>