From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 15 Nov 2017 17:29:30 +0000 (+0100)
Subject: Unified language chooser
X-Git-Tag: 3.1.0_Beta_4~97
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5432feb3ed040afb5e945e3cc6f4bf2b448ad7aa;p=GitHub%2FWoltLab%2FWCF.git

Unified language chooser
---

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 2c49cd1529..99399df212 100644
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -143,13 +143,34 @@
 			
 			<dl>
 				<dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-				<dd>
-					<select id="languageID" name="languageID">
-						{foreach from=$availableLanguages item=language}
-							<option value="{@$language->languageID}"{if $language->languageID == $languageID} selected{/if}>{$language}</option>
-						{/foreach}
-					</select>
-					<small>{lang}wcf.user.language.description{/lang}</small>
+				<dd id="languageIDContainer">
+					<script data-relocate="true">
+						$(function() {
+							var $languages = {
+								{implode from=$availableLanguages item=language}
+								'{@$language->languageID}': {
+									iconPath: '{@$language->getIconPath()|encodeJS}',
+									languageName: '{@$language|encodeJS}'
+								}
+								{/implode}
+							};
+							
+							require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
+								LanguageChooser.init('languageIDContainer', 'languageID', {@$languageID}, $languages);
+								
+								var small = elCreate('small');
+								small.innerHTML = '{lang}wcf.user.language.description{/lang}';
+								elById('languageIDContainer').appendChild(small);
+							});
+						});
+					</script>
+					<noscript>
+						<select name="languageID" id="languageID">
+							{foreach from=$availableLanguages item=language}
+								<option value="{@$language->languageID}"{if $language->languageID == $languageID} selected{/if}>{$language}</option>
+							{/foreach}
+						</select>
+					</noscript>
 				</dd>
 			</dl>
 			
diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index a453533b2d..87992dcf08 100644
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -32,7 +32,13 @@
 									{/implode}
 								};
 								
-								new WCF.Language.Chooser('languageIDContainer', 'languageID', {@$languageID}, $languages);
+								require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
+									LanguageChooser.init('languageIDContainer', 'languageID', {@$languageID}, $languages);
+									
+									var small = elCreate('small');
+									small.innerHTML = '{lang}wcf.user.language.description{/lang}';
+									elById('languageIDContainer').appendChild(small);
+								});
 							});
 						</script>
 						<noscript>