From f6fac8c41681d3a5f550c50a3a4da39724deff58 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 1 Sep 2016 20:24:20 +0200
Subject: [PATCH] Added missing language variables

---
 com.woltlab.wcf/userGroupOption.xml           | 41 +++++++++++--------
 .../PageCommentListBoxController.class.php    |  4 +-
 .../manager/PageCommentManager.class.php      | 12 +++---
 wcfsetup/install/lang/de.xml                  | 25 +++++++++++
 wcfsetup/install/lang/en.xml                  | 25 +++++++++++
 5 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index d45deb9f76..f17999967f 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -29,11 +29,14 @@
 				<parent>user.message</parent>
 			</category>
 			
-			<category name="user.pageComment">
+			<category name="user.cms">
 				<parent>user</parent>
 			</category>
 			<category name="user.article">
-				<parent>user</parent>
+				<parent>user.cms</parent>
+			</category>
+			<category name="user.page">
+				<parent>user.cms</parent>
 			</category>
 			
 			<category name="mod" />
@@ -43,11 +46,15 @@
 			<category name="mod.profileComment">
 				<parent>mod.general</parent>
 			</category>
-			<category name="mod.pageComment">
-				<parent>mod.general</parent>
+			
+			<category name="mod.cms">
+				<parent>mod</parent>
+			</category>
+			<category name="mod.page">
+				<parent>mod.cms</parent>
 			</category>
 			<category name="mod.article">
-				<parent>mod.general</parent>
+				<parent>mod.cms</parent>
 			</category>
 			
 			<category name="admin" />
@@ -681,19 +688,19 @@ png</defaultvalue>
 			</option>
 			<!-- /user.profile -->
 			
-			<option name="user.pageComment.canAddComment">
-				<categoryname>user.pageComment</categoryname>
+			<option name="user.page.canAddComment">
+				<categoryname>user.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			<option name="user.pageComment.canEditComment">
-				<categoryname>user.pageComment</categoryname>
+			<option name="user.page.canEditComment">
+				<categoryname>user.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="user.pageComment.canDeleteComment">
-				<categoryname>user.pageComment</categoryname>
+			<option name="user.page.canDeleteComment">
+				<categoryname>user.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -770,22 +777,22 @@ png</defaultvalue>
 			</option>
 			<!-- /mod.general -->
 			
-			<option name="mod.pageComment.canEditComment">
-				<categoryname>mod.pageComment</categoryname>
+			<option name="mod.page.canEditComment">
+				<categoryname>mod.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<moddefaultvalue>1</moddefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="mod.pageComment.canDeleteComment">
-				<categoryname>mod.pageComment</categoryname>
+			<option name="mod.page.canDeleteComment">
+				<categoryname>mod.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<moddefaultvalue>1</moddefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="mod.pageComment.canModerateComment">
-				<categoryname>mod.pageComment</categoryname>
+			<option name="mod.page.canModerateComment">
+				<categoryname>mod.page</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<moddefaultvalue>1</moddefaultvalue>
diff --git a/wcfsetup/install/files/lib/system/box/PageCommentListBoxController.class.php b/wcfsetup/install/files/lib/system/box/PageCommentListBoxController.class.php
index 68d180a723..25dc055faa 100644
--- a/wcfsetup/install/files/lib/system/box/PageCommentListBoxController.class.php
+++ b/wcfsetup/install/files/lib/system/box/PageCommentListBoxController.class.php
@@ -34,7 +34,7 @@ class PageCommentListBoxController extends AbstractDatabaseObjectListBoxControll
 	protected function getTemplate() {
 		/** @noinspection PhpUndefinedMethodInspection */
 		return WCF::getTPL()->fetch('boxPageComments', 'wcf', [
-			'commentCanAdd' => WCF::getSession()->getPermission('user.pageComment.canAddComment'),
+			'commentCanAdd' => WCF::getSession()->getPermission('user.page.canAddComment'),
 			'commentList' => $this->objectList,
 			'commentObjectTypeID' => CommentHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.page'),
 			'lastCommentTime' => $this->objectList->getMinCommentTime(),
@@ -47,6 +47,6 @@ class PageCommentListBoxController extends AbstractDatabaseObjectListBoxControll
 	 * @inheritDoc
 	 */
 	public function hasContent() {
-		return WCF::getSession()->getPermission('user.pageComment.canAddComment') || parent::hasContent();
+		return WCF::getSession()->getPermission('user.page.canAddComment') || parent::hasContent();
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php
index e113290809..df6d5066b0 100644
--- a/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php
+++ b/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php
@@ -22,32 +22,32 @@ class PageCommentManager extends AbstractCommentManager implements IViewableLike
 	/**
 	 * @inheritDoc
 	 */
-	protected $permissionAdd = 'user.pageComment.canAddComment';
+	protected $permissionAdd = 'user.page.canAddComment';
 	
 	/**
 	 * @inheritDoc
 	 */
-	protected $permissionDelete = 'user.pageComment.canDeleteComment';
+	protected $permissionDelete = 'user.page.canDeleteComment';
 	
 	/**
 	 * @inheritDoc
 	 */
-	protected $permissionEdit = 'user.pageComment.canEditComment';
+	protected $permissionEdit = 'user.page.canEditComment';
 	
 	/**
 	 * @inheritDoc
 	 */
-	protected $permissionModDelete = 'mod.pageComment.canDeleteComment';
+	protected $permissionModDelete = 'mod.page.canDeleteComment';
 	
 	/**
 	 * @inheritDoc
 	 */
-	protected $permissionModEdit = 'mod.pageComment.canEditComment';
+	protected $permissionModEdit = 'mod.page.canEditComment';
 	
 	/**
 	 * @inheritDoc
 	 */
-	protected $permissionCanModerate = 'mod.pageComment.canModerateComment';
+	protected $permissionCanModerate = 'mod.page.canModerateComment';
 	
 	/**
 	 * @inheritDoc
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c8a147d5f7..c158fec651 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -491,6 +491,31 @@
 		<item name="wcf.acp.group.copy.copyUserGroupOptions.description"><![CDATA[Die neue Benutzergruppe wird die gleichen Berechtigungen besitzen wie die kopierte Benutzergruppe.]]></item>
 		<item name="wcf.acp.group.option.admin.paidSubscription.canManageSubscription"><![CDATA[Kann bezahlte Mitgliedschaften verwalten]]></item>
 		<item name="wcf.acp.group.option.user.tag.canViewTag"><![CDATA[Kann Tag sehen]]></item>
+		<item name="wcf.acp.group.option.category.user.cms"><![CDATA[CMS]]></item>
+		<item name="wcf.acp.group.option.admin.content.article.canManageArticle"><![CDATA[Kann Artikel verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.content.article.canManageCategory"><![CDATA[Kann Artikel-Kategorien verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canManageBox"><![CDATA[Kann Boxen verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canManageMedia"><![CDATA[Kann Medien verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canManagePage"><![CDATA[Kann Seiten verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canUseMedia"><![CDATA[Kann Medien einbinden]]></item>
+		<item name="wcf.acp.group.option.category.mod.cms"><![CDATA[CMS]]></item>
+		<item name="wcf.acp.group.option.category.mod.article"><![CDATA[Artikel]]></item>
+		<item name="wcf.acp.group.option.category.mod.page"><![CDATA[Seiten]]></item>
+		<item name="wcf.acp.group.option.category.user.article"><![CDATA[Artikel]]></item>
+		<item name="wcf.acp.group.option.category.user.page"><![CDATA[Seiten]]></item>
+		<item name="wcf.acp.group.option.mod.article.canDeleteComment"><![CDATA[Kann Kommentare löschen]]></item>
+		<item name="wcf.acp.group.option.mod.article.canEditComment"><![CDATA[Kann Kommentare bearbeiten]]></item>
+		<item name="wcf.acp.group.option.mod.article.canModerateComment"><![CDATA[Kann Kommentare moderieren]]></item>
+		<item name="wcf.acp.group.option.mod.page.canDeleteComment"><![CDATA[Kann Kommentare löschen]]></item>
+		<item name="wcf.acp.group.option.mod.page.canEditComment"><![CDATA[Kann Kommentare bearbeiten]]></item>
+		<item name="wcf.acp.group.option.mod.page.canModerateComment"><![CDATA[Kann Kommentare moderieren]]></item>
+		<item name="wcf.acp.group.option.user.article.canAddComment"><![CDATA[Kann Kommentare erstellen]]></item>
+		<item name="wcf.acp.group.option.user.article.canDeleteComment"><![CDATA[Kann eigene Kommentare löschen]]></item>
+		<item name="wcf.acp.group.option.user.article.canEditComment"><![CDATA[Kann eigene Kommentare bearbeiten]]></item>
+		<item name="wcf.acp.group.option.user.article.canReadArticle"><![CDATA[Kann Artikel lesen]]></item>
+		<item name="wcf.acp.group.option.user.page.canAddComment"><![CDATA[Kann Kommentare erstellen]]></item>
+		<item name="wcf.acp.group.option.user.page.canDeleteComment"><![CDATA[Kann eigene Kommentare löschen]]></item>
+		<item name="wcf.acp.group.option.user.page.canEditComment"><![CDATA[Kann eigene Kommentare bearbeiten]]></item>
 	</category>
 	
 	<category name="wcf.acp.index">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 204a0e84a9..6e937727c5 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -491,6 +491,31 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.copy.copyUserGroupOptions.description"><![CDATA[The new user group will have the same permissions as the copied user group.]]></item>
 		<item name="wcf.acp.group.option.admin.paidSubscription.canManageSubscription"><![CDATA[Can manage paid subscriptions]]></item>
 		<item name="wcf.acp.group.option.user.tag.canViewTag"><![CDATA[Can view tags]]></item>
+		<item name="wcf.acp.group.option.category.user.cms"><![CDATA[CMS]]></item>
+		<item name="wcf.acp.group.option.admin.content.article.canManageArticle"><![CDATA[Can manage articles]]></item>
+		<item name="wcf.acp.group.option.admin.content.article.canManageCategory"><![CDATA[Can manage article categories]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canManageBox"><![CDATA[Can manage boxes]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canManageMedia"><![CDATA[Can manage media]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canManagePage"><![CDATA[Can manage pages]]></item>
+		<item name="wcf.acp.group.option.admin.content.cms.canUseMedia"><![CDATA[Can use media]]></item>
+		<item name="wcf.acp.group.option.category.mod.cms"><![CDATA[CMS]]></item>
+		<item name="wcf.acp.group.option.category.mod.article"><![CDATA[Articles]]></item>
+		<item name="wcf.acp.group.option.category.mod.page"><![CDATA[Pages]]></item>
+		<item name="wcf.acp.group.option.category.user.article"><![CDATA[Articles]]></item>
+		<item name="wcf.acp.group.option.category.user.page"><![CDATA[Pages]]></item>
+		<item name="wcf.acp.group.option.mod.article.canDeleteComment"><![CDATA[Can delete comments]]></item>
+		<item name="wcf.acp.group.option.mod.article.canEditComment"><![CDATA[Can edit comments]]></item>
+		<item name="wcf.acp.group.option.mod.article.canModerateComment"><![CDATA[Can moderate comments]]></item>
+		<item name="wcf.acp.group.option.mod.page.canDeleteComment"><![CDATA[Can delete comments]]></item>
+		<item name="wcf.acp.group.option.mod.page.canEditComment"><![CDATA[Can edit comments]]></item>
+		<item name="wcf.acp.group.option.mod.page.canModerateComment"><![CDATA[Can moderate comments]]></item>
+		<item name="wcf.acp.group.option.user.article.canAddComment"><![CDATA[Can create comments]]></item>
+		<item name="wcf.acp.group.option.user.article.canDeleteComment"><![CDATA[Can delete their own comments]]></item>
+		<item name="wcf.acp.group.option.user.article.canEditComment"><![CDATA[Can edit their own comments]]></item>
+		<item name="wcf.acp.group.option.user.article.canReadArticle"><![CDATA[Can read articles]]></item>
+		<item name="wcf.acp.group.option.user.page.canAddComment"><![CDATA[Can create comments]]></item>
+		<item name="wcf.acp.group.option.user.page.canDeleteComment"><![CDATA[Can delete their own comments]]></item>
+		<item name="wcf.acp.group.option.user.page.canEditComment"><![CDATA[Can edit their own comments]]></item>
 	</category>
 	
 	<category name="wcf.acp.index">
-- 
2.20.1