From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 13 Nov 2012 16:42:27 +0000 (+0100)
Subject: Added option to use WCF.Language.Chooser as language filter
X-Git-Tag: 2.0.0_Beta_1~781^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=65b1d6a04d6e0f2cda616cca5bc245b512d11f4d;p=GitHub%2FWoltLab%2FWCF.git

Added option to use WCF.Language.Chooser as language filter
---

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 9e8c0bfad9..0a23ee5d12 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -38,6 +38,11 @@
 	//<![CDATA[
 	$(function() {
 		WCF.Language.addObject({
+			'__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
+			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
+			'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
+			'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
+			'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
 			'wcf.global.button.add': '{lang}wcf.global.button.add{/lang}',
 			'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
 			'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
@@ -52,26 +57,22 @@
 			'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
 			'wcf.global.button.search': '{lang}wcf.global.button.search{/lang}',
 			'wcf.global.button.submit': '{lang}wcf.global.button.submit{/lang}',
+			'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
+			'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
+			'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
+			'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
 			'wcf.global.error.title': '{lang}wcf.global.error.title{/lang}',
+			'wcf.global.form.edit.success': '{lang}wcf.global.form.edit.success{/lang}',
+			'wcf.global.language.noSelection': '{lang}wcf.global.language.noSelection{/lang}',
 			'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
-			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-			'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
-			'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
-			'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
-			'__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
-			'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
-			'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
 			'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}',
 			'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}',
 			'wcf.global.page.pageNavigation': '{lang}wcf.global.page.pageNavigation{/lang}',
 			'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
 			'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
-			'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
-			'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
-			'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
+			'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
 			'wcf.sitemap.title': '{lang}wcf.sitemap.title{/lang}',
-			'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}',
-			'wcf.global.form.edit.success': '{lang}wcf.global.form.edit.success{/lang}'
+			'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}'
 			{event name='javascriptLanguageImport'}
 		});
 		
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 8933e8c0ed..9549ed1115 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -6835,8 +6835,9 @@ WCF.Language.Chooser = Class.extend({
 	 * @param	integer		languageID
 	 * @param	object		languages
 	 * @param	object		callback
+	 * @param	boolean		allowEmptyValue
 	 */
-	init: function(containerID, inputFieldID, languageID, languages, callback) {
+	init: function(containerID, inputFieldID, languageID, languages, callback, allowEmptyValue) {
 		var $container = $('#' + containerID);
 		if ($container.length != 1) {
 			console.debug("[WCF.Language.Chooser] Invalid container id '" + containerID + "' given");
@@ -6877,6 +6878,16 @@ WCF.Language.Chooser = Class.extend({
 			}
 		}
 		
+		// allow an empty selection (e.g. using as language filter)
+		if (allowEmptyValue) {
+			$('<li class="dropdownDivider" />').appendTo($dropdownMenu);
+			var $item = $('<li><a>' + WCF.Language.get('wcf.global.language.noSelection') + '</a></li>').data('languageID', 0).click($.proxy(this._click, this)).appendTo($dropdownMenu);
+			
+			if (languageID === 0) {
+				this._dropdown.children('.dropdownToggle').empty().append($item.html());
+			}
+		}
+		
 		WCF.Dropdown.init();
 	},
 	
@@ -6887,13 +6898,14 @@ WCF.Language.Chooser = Class.extend({
 	 */
 	_click: function(event) {
 		var $item = $(event.currentTarget);
+		var $languageID = $item.data('languageID');
 		
 		// update input field
-		this._input.val($item.data('languageID'));
+		this._input.val($languageID);
 		
 		// update dropdown label
 		var $html = $('' + $item.html());
-		var $innerContent = $html.children().detach();
+		var $innerContent = ($languageID === 0) ? $html : $html.children().detach();
 		this._dropdown.children('.dropdownToggle').empty().append($innerContent);
 		
 		// execute callback
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a2ea62a049..631bc6382f 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -703,6 +703,7 @@
 		<item name="wcf.global.form.error"><![CDATA[Ihre Angaben sind ungültig. Bitte überprüfen Sie die markierten Eingabefelder.]]></item>
 		<item name="wcf.global.form.error.empty"><![CDATA[Bitte füllen Sie dieses Eingabefeld aus.]]></item>
 		<item name="wcf.global.form.error.multilingual"><![CDATA[Bitte füllen Sie dieses Eingabefeld für jede Sprache aus.]]></item>
+		<item name="wcf.global.language.noSelection"><![CDATA[Keine Auswahl]]></item>
 		<item name="wcf.global.loading"><![CDATA[Lädt …]]></item>
 		<item name="wcf.global.locale.unix"><![CDATA[de_DE]]></item> <!-- system variable; do not translate -->
 		<item name="wcf.global.locale.win"><![CDATA[deu_deu]]></item> <!-- system variable; do not translate -->