From 2b6545d57617f059cd68438d10ff6c5a7ffb5bbe Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Tue, 20 Sep 2016 19:48:44 +0200 Subject: [PATCH] Unify language item naming --- wcfsetup/install/files/acp/templates/boxAdd.tpl | 4 ++-- wcfsetup/install/files/acp/templates/menuItemAdd.tpl | 4 ++-- .../files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js | 2 +- .../files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js | 2 +- wcfsetup/install/lang/de.xml | 6 +++--- wcfsetup/install/lang/en.xml | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl index f0b9060bfb..4e63a92ba7 100644 --- a/wcfsetup/install/files/acp/templates/boxAdd.tpl +++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl @@ -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} diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl index 080371af76..b996952f9d 100644 --- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl +++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl @@ -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} diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js index 95f1f70b89..710f3cc56d 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js @@ -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'; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js index b3cf779d6e..c314dcde18 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js @@ -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'; } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 6867b4774b..e8f691ee23 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2834,9 +2834,9 @@ Fehler sind beispielsweise: - - - + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 5d563de049..0f07ff6d5d 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2793,9 +2793,9 @@ Errors are: - - - + + + -- 2.20.1