From 3b13a539f9bd1d02c90887e2406a88e26093bf6e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 30 Sep 2011 16:40:26 +0200
Subject: [PATCH] Fixed usage of i18n within user group management

---
 wcfsetup/install/files/acp/templates/userGroupAdd.tpl         | 4 ++--
 .../install/files/lib/acp/form/UserGroupAddForm.class.php     | 2 +-
 .../install/files/lib/acp/form/UserGroupEditForm.class.php    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 530a4c1289..98fff66be1 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -6,7 +6,7 @@
 		WCF.TabMenu.init();
 
 		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
-		var $groupNameValues = { {implode from=$groupName_i18n key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+		var $groupNameValues = { {implode from=$i18nValues['groupName'] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
 		new WCF.MultipleLanguageInput('groupName', false, $groupNameValues, $availableLanguages);
 	});
 	//]]>
@@ -49,7 +49,7 @@
 			<dl{if $errorType.groupName|isset} class="formError"{/if}>
 				<dt><label for="groupName">{lang}wcf.acp.group.groupName{/lang}</label></dt>
 				<dd>
-					<input type="text" id="groupName" name="groupName" value="{$groupName}" class="medium" />
+					<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" class="medium" />
 					{if $errorType.groupName|isset}
 						<small class="innerError">
 							{if $errorType.groupName == 'empty'}
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index 8d4eeaba7c..94da5422c1 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -179,7 +179,7 @@ class UserGroupAddForm extends AbstractOptionListForm {
 	public function assignVariables() {
 		parent::assignVariables();
 		
-		I18nHandler::getInstance()->assignVariables(1);
+		I18nHandler::getInstance()->assignVariables();
 		
 		WCF::getTPL()->assign(array(
 			'groupName' => $this->groupName,
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
index d60fe52578..7441214ef0 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
@@ -67,7 +67,7 @@ class UserGroupEditForm extends UserGroupAddForm {
 	 */
 	public function readData() {
 		if (!count($_POST)) {
-			I18nHandler::getInstance()->setOptions('groupName',  $this->group->groupName, 'wcf.acp.group.group\d+');
+			I18nHandler::getInstance()->setOptions('groupName', 1, $this->group->groupName, 'wcf.acp.group.group\d+');
 			$this->groupName = $this->group->groupName;
 			
 			// get default values
@@ -99,7 +99,7 @@ class UserGroupEditForm extends UserGroupAddForm {
 		parent::assignVariables();
 		
 		$useRequestData = (count($_POST)) ? true : false;
-		I18nHandler::getInstance()->assignVariables(1, $useRequestData);
+		I18nHandler::getInstance()->assignVariables($useRequestData);
 		
 		WCF::getTPL()->assign(array(
 			'groupID' => $this->group->groupID,
-- 
2.20.1