From 79218be1d2214095eae1272eac7559a67a55a786 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Thu, 18 Apr 2013 14:17:37 +0200
Subject: [PATCH 1/2] Priorize common languages.

---
 settings/js/personal.js         |  4 ++++
 settings/personal.php           | 15 ++++++++++++---
 settings/templates/personal.php |  7 ++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/settings/js/personal.js b/settings/js/personal.js
index 7c879bcafe..271de1599d 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -88,6 +88,10 @@ $(document).ready(function(){
 	$("#languageinput").chosen();
 
 	$("#languageinput").change( function(){
+		// the divider is no language
+		if ($("#languageinput option").hasClass('divider')) {
+			return false;
+		}
 		// Serialize the data
 		var post = $( "#languageinput" ).serialize();
 		// Ajax foo
diff --git a/settings/personal.php b/settings/personal.php
index 9bbc66c9b7..57a7e4ee9c 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -22,8 +22,14 @@ $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 
+// array of common languages
+$commonlangcodes = array(
+	'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
+);
+
 $languageNames=include 'languageCodes.php';
 $languages=array();
+$commonlanguages = array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
@@ -34,8 +40,12 @@ foreach($languageCodes as $lang) {
 		$ln=array('code'=>$lang, 'name'=>$lang);
 	}
 
+	// put apropriate languages into apropriate arrays, to print them sorted
+	// used language -> common languages -> divider -> other languages
 	if ($lang === $userLang) {
 		$userLang = $ln;
+	} elseif (in_array($lang, $commonlangcodes)) {
+		$commonlanguages[]=$ln;
 	} else {
 		$languages[]=$ln;
 	}
@@ -46,9 +56,6 @@ usort( $languages, function ($a, $b) {
 	return strcmp($a['name'], $b['name']);
 });
 
-//put the current language in the front
-array_unshift($languages, $userLang);
-
 //links to clients
 $clients = array(
 	'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
@@ -64,6 +71,8 @@ $tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('clients', $clients);
 $tmpl->assign('email', $email);
 $tmpl->assign('languages', $languages);
+$tmpl->assign('commonlanguages', $commonlanguages);
+$tmpl->assign('activelanguage', $userLang);
 $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 03073069ab..c0fcf5c1bd 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -78,11 +78,16 @@ if($_['displayNameChangeSupported']) {
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Language'));?></strong></legend>
 		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
+		<option value="<?php p($_['activelanguage']['code']);?>"><?php p($_['activelanguage']['name']);?></option>
+		<?php foreach($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
+		<?php endforeach;?>
+		<option class="divider">––––––––––</option>
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>
 		</select>
-		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['languages'][0]['code']);?>/"
+		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
 			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
 	</fieldset>
 </form>

From 7a2be0c5dc487d2c2e3dbef67cfa1c5cf2af462e Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Fri, 19 Apr 2013 00:39:42 +0200
Subject: [PATCH 2/2] Make divider not selectable

Very hacky
---
 settings/js/personal.js         | 7 +++----
 settings/templates/personal.php | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/settings/js/personal.js b/settings/js/personal.js
index 271de1599d..db18b2861a 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -86,12 +86,11 @@ $(document).ready(function(){
     });
 
 	$("#languageinput").chosen();
+	// Show only the not selectable optgroup
+	// Choosen only shows optgroup-labels if there are options in the optgroup
+	$(".languagedivider").remove();
 
 	$("#languageinput").change( function(){
-		// the divider is no language
-		if ($("#languageinput option").hasClass('divider')) {
-			return false;
-		}
 		// Serialize the data
 		var post = $( "#languageinput" ).serialize();
 		// Ajax foo
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index c0fcf5c1bd..6730787205 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -82,7 +82,7 @@ if($_['displayNameChangeSupported']) {
 		<?php foreach($_['commonlanguages'] as $language):?>
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>
-		<option class="divider">––––––––––</option>
+		<optgroup label="––––––––––"><option class="languagedivider">-</option></optgroup>
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>