Change category of page object id-related language items

diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index 4e63a92ba787118e9bef521464abdcde6ce5477f..96dea920323790c9e7b77390e9143db7daaece56 100644 (file)
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -12,7 +12,7 @@
                
                require(['Dictionary', 'Language', 'WoltLabSuite/Core/Acp/Ui/Box/Handler', 'WoltLabSuite/Core/Media/Manager/Select'], function(Dictionary, Language, AcpUiBoxHandler, MediaManagerSelect) {
                        Language.addObject({
-                               'wcf.acp.page.objectID': '{lang}wcf.acp.page.objectID{/lang}',
+                               'wcf.page.pageObjectID': '{lang}wcf.page.pageObjectID{/lang}',
                                {foreach from=$pageNodeList item=pageNode}
                                        {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
                                        {if $pageObjectIDLanguageItem}
@@ -205,11 +205,11 @@
                                </dl>
                                
                                <dl id="linkPageObjectIDContainer"{if $errorField == 'linkPageObjectID'} class="formError"{/if}{if !$linkPageID || !$pageHandler[$linkPageID]|isset} style="display: none;"{/if}>
-                                       <dt><label for="linkPageObjectID">{lang}wcf.acp.page.objectID{/lang}</label></dt>
+                                       <dt><label for="linkPageObjectID">{lang}wcf.page.pageObjectID{/lang}</label></dt>
                                        <dd>
                                                <div class="inputAddon">
                                                        <input type="text" id="linkPageObjectID" name="linkPageObjectID" value="{$linkPageObjectID}" class="short">
-                                                       <a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.acp.page.objectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
+                                                       <a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
                                                </div>
                                                {if $errorField == 'linkPageObjectID'}
                                                        <small class="innerError">

diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index b996952f9d74f84f6e165679d0cf1b202582d3bc..5df4ab22def2af29b71e318b8ce5e1defd45bb4c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -3,7 +3,7 @@
 <script data-relocate="true">
        require(['Dictionary', 'Language', 'WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler'], function(Dictionary, Language, AcpUiMenuItemHandler) {
                Language.addObject({
-                       'wcf.acp.page.objectID': '{lang}wcf.acp.page.objectID{/lang}',
+                       'wcf.page.pageObjectID': '{lang}wcf.page.pageObjectID{/lang}',
                        {foreach from=$pageNodeList item=pageNode}
                                {capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
                                {if $pageObjectIDLanguageItem}
@@ -144,11 +144,11 @@
                </dl>
                
                <dl id="pageObjectIDContainer"{if $errorField == 'pageObjectID'} class="formError"{/if}{if !$pageID || !$pageHandler[$pageID]|isset} style="display: none;"{/if}>
-                       <dt><label for="pageObjectID">{lang}wcf.acp.page.objectID{/lang}</label></dt>
+                       <dt><label for="pageObjectID">{lang}wcf.page.pageObjectID{/lang}</label></dt>
                        <dd>
                                <div class="inputAddon">
                                        <input type="text" id="pageObjectID" name="pageObjectID" value="{$pageObjectID}" class="short">
-                                       <a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.acp.page.objectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
+                                       <a href="#" id="searchPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
                                </div>
                                {if $errorField == 'pageObjectID'}
                                        <small class="innerError">

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 710f3cc56dae24f4034361c16111e82c2d0eeb4c..242aca41fc212b8e13bf08a44922f4c5725c560d 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Box/Handler.js
@@ -126,7 +126,7 @@ define(['Dictionary', 'Language', 'WoltLabSuite/Core/Ui/Page/Search/Handler'], f
                        var pageIdentifier = elData(_pageId.options[_pageId.selectedIndex], 'identifier');
                        var languageItem = 'wcf.page.pageObjectID.' + pageIdentifier;
                        if (Language.get(languageItem) === languageItem) {
-                               languageItem = 'wcf.acp.page.objectID';
+                               languageItem = 'wcf.page.pageObjectID';
                        }
                        
                        elByTag('label', _containerPageObjectId)[0].textContent = Language.get(languageItem);

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 c314dcde18faa7a6fc6e0fec1b7db6fea6e88c7a..f073698102e368edfa4d000827a21c12600e9522 100644 (file)
--- 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
@@ -109,7 +109,7 @@ define(['Dictionary', 'Language', 'WoltLabSuite/Core/Ui/Page/Search/Handler'], f
                        var pageIdentifier = elData(_pageId.options[_pageId.selectedIndex], 'identifier');
                        var languageItem = 'wcf.page.pageObjectID.' + pageIdentifier;
                        if (Language.get(languageItem) === languageItem) {
-                               languageItem = 'wcf.acp.page.objectID';
+                               languageItem = 'wcf.page.pageObjectID';
                        }
                        
                        elByTag('label', _containerPageObjectId)[0].textContent = Language.get(languageItem);

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e8f691ee2390f17a33656aab924a3698765ecd3a..6af3b9b2d68801991e891e435e5b30b5e95e7914 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1379,8 +1379,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.page.metaDescription"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.page.metaKeywords"><![CDATA[Meta Keywords]]></item>
                <item name="wcf.acp.page.name.error.notUnique"><![CDATA[Dieser Name wird bereits von einer anderen Seite verwendet.]]></item>
-               <item name="wcf.acp.page.objectID"><![CDATA[Objekt-ID]]></item>
-               <item name="wcf.acp.page.objectID.search"><![CDATA[ID suchen]]></item>
                <item name="wcf.acp.page.page"><![CDATA[Seite]]></item>
                <item name="wcf.acp.page.parentPage"><![CDATA[Übergeordnete Seite]]></item>
                <item name="wcf.acp.page.parentPage.none"><![CDATA[Keine]]></item>
@@ -2834,9 +2832,11 @@ 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.pageObjectID"><![CDATA[Objekt-ID]]></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"><![CDATA[ID suchen]]></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>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0f07ff6d5d10ababf5f02f45945f74bd4a5bb5b3..031bbe5bb12b122ef39dca8ae1f91fa9b3f319ba 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2793,9 +2793,11 @@ 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.pageObjectID"><![CDATA[Object ID]]></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"><![CDATA[Search ID]]></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>
@@ -2825,8 +2827,6 @@ Errors are:
                <item name="wcf.acp.page.metaDescription"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.page.metaKeywords"><![CDATA[Meta Keywords]]></item>
                <item name="wcf.acp.page.name.error.notUnique"><![CDATA[Name is already in use.]]></item>
-               <item name="wcf.acp.page.objectID"><![CDATA[Object ID]]></item>
-               <item name="wcf.acp.page.objectID.search"><![CDATA[Search ID]]></item>
                <item name="wcf.acp.page.page"><![CDATA[Page]]></item>
                <item name="wcf.acp.page.parentPage"><![CDATA[Parent Page]]></item>
                <item name="wcf.acp.page.parentPage.none"><![CDATA[None]]></item>