From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 27 Apr 2013 14:29:33 +0000 (+0200)
Subject: Improves multilingual form
X-Git-Tag: 2.0.0_Beta_1~293^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=af6315ca5213051be8085f0188df2ac1231f64ba;p=GitHub%2FWoltLab%2FWCF.git

Improves multilingual form

* Fixes typo in English language item
* Adds missing object property documentation
* Removes necessary object property
* Disables unsetting default language as available language since it will be added anyway again
---

diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index 41d1f3e8ec..c68097d4fe 100644
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -45,7 +45,9 @@
 			<dl id="languageIDs" class="marginTop{if $errorField == 'languageIDs'} formError{/if}">
 				<dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
 				<dd class="floated">
-					{htmlCheckboxes options=$languages name=languageIDs selected=$languageIDs disableEncoding=true}
+					{foreach from=$languages item='language'}
+						<label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked="checked" disabled="disabled"{elseif $language->languageID|in_array:$languageIDs} checked="checked"{/if} /> {$language}</label>
+					{/foreach}
 					
 					{if $errorField == 'languageIDs'}
 						<small class="innerError">
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php
index 80fcfada0b..d5b5fe2d42 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php
@@ -30,12 +30,23 @@ class LanguageMultilingualismForm extends AbstractForm {
 	 */
 	public $neededPermissions = array('admin.language.canManageLanguage');
 	
-	// data
-	// todo: comment
+	/**
+	 * indicates if multilingualism is enabled
+	 * @var	integer
+	 */
 	public $enable = 0;
+	
+	/**
+	 * ids of selected available languages
+	 * @var	array<integer>
+	 */
 	public $languageIDs = array();
+	
+	/**
+	 * list of available content languages
+	 * @var	array<wcf\data\language\Language>
+	 */
 	public $languages = array();
-	public $languageList = array();
 	
 	/**
 	 * @see	wcf\page\IPage::readParameters()
@@ -124,8 +135,6 @@ class LanguageMultilingualismForm extends AbstractForm {
 				$this->enable = 1;
 			}
 		}
-		
-		$this->languageList = LanguageFactory::getInstance()->getLanguages();
 	}
 	
 	/**
@@ -135,9 +144,10 @@ class LanguageMultilingualismForm extends AbstractForm {
 		parent::assignVariables();
 		
 		WCF::getTPL()->assign(array(
+			'defaultLanguageID' => LanguageFactory::getInstance()->getDefaultLanguageID(),
 			'enable' => $this->enable,
 			'languageIDs' => $this->languageIDs,
-			'languages' => $this->languageList
+			'languages' => $this->languages
 		));
 	}
 	
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 55912d2180..7fa232853c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -187,7 +187,7 @@
 		<item name="wcf.acp.language.list"><![CDATA[Languages]]></item>
 		<item name="wcf.acp.language.multilingualism"><![CDATA[Multilingualism]]></item>
 		<item name="wcf.acp.language.multilingualism.enable"><![CDATA[Enable multilingualism]]></item>
-		<item name="wcf.acp.language.multilingualism.enable.description"><![CDATA[Enabling miltilingualism provides the ability to associate user-generated content with a specific language; Newly created content is automatically associated with the user’s interface language. Users may filter content for specific languages through their settings.]]></item>
+		<item name="wcf.acp.language.multilingualism.enable.description"><![CDATA[Enabling multilingualism provides the ability to associate user-generated content with a specific language; Newly created content is automatically associated with the user’s interface language. Users may filter content for specific languages through their settings.]]></item>
 		<item name="wcf.acp.language.multilingualism.languages"><![CDATA[Available Languages]]></item>
 		<item name="wcf.acp.language.multilingualism.languages.error.empty"><![CDATA[You need to select at least two languages.]]></item>
 		<item name="wcf.acp.language.setAsDefault"><![CDATA[Set As Default]]></item>