From 16a5efca6eddf94e90fdf4c5c9352a88faf8509f Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 20 Sep 2016 20:11:00 +0200
Subject: [PATCH] Change category of page object id-related language items

---
 wcfsetup/install/files/acp/templates/boxAdd.tpl             | 6 +++---
 wcfsetup/install/files/acp/templates/menuItemAdd.tpl        | 6 +++---
 .../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                                | 4 ++--
 wcfsetup/install/lang/en.xml                                | 4 ++--
 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 4e63a92ba7..96dea92032 100644
--- 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 b996952f9d..5df4ab22de 100644
--- 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 710f3cc56d..242aca41fc 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
@@ -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 c314dcde18..f073698102 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
@@ -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 e8f691ee23..6af3b9b2d6 100644
--- 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 0f07ff6d5d..031bbe5bb1 100644
--- 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>
-- 
2.20.1