From da058f16eb5413d0c859196cbe837dc8328f27a5 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sat, 15 Dec 2012 09:48:24 +0100
Subject: Bug 1124: changed the order of the entries from country-language to
 language-country

---
 pages/account/41.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/account/41.php b/pages/account/41.php
index d2cfc8c..26ad11c 100644
--- a/pages/account/41.php
+++ b/pages/account/41.php
@@ -74,7 +74,7 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
 	while($row = mysql_fetch_assoc($res))
 	{
 		echo "<option value='".sanitizeHTML($row['locale'])."'";
-		echo ">".$row['country']." - ".$row['lang']."</option>\n";
+		echo ">".$row['lang']." - ".$row['country']."</option>\n";
 	}
 ?>
 	</select>
-- 
cgit v1.2.1


From 1b2ceade6acb5f3d3b498ae7de9873d27ca1795e Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Wed, 20 Feb 2013 00:05:45 +0100
Subject: bug 1124: Changed sorting order

---
 pages/account/41.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/account/41.php b/pages/account/41.php
index 26ad11c..545161a 100644
--- a/pages/account/41.php
+++ b/pages/account/41.php
@@ -69,7 +69,7 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
     <td class="DataTD"><?=_("Secondary languages")?>:</td>
     <td class="DataTD"><select name="addlang">
 <?
-	$query = "select * from `languages` order by `locale`";
+	$query = "select * from `languages` order by `lang`,`country`";
 	$res = mysql_query($query);
 	while($row = mysql_fetch_assoc($res))
 	{
-- 
cgit v1.2.1


From 47f72a7ca006dd9efff645545e58a391e64468a6 Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Tue, 12 Mar 2013 23:29:32 +0100
Subject: bug 1124: Changed display to [locale] Language (country) eg[de-AT]
 German (Austria)

---
 pages/account/41.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/account/41.php b/pages/account/41.php
index 545161a..aac45dd 100644
--- a/pages/account/41.php
+++ b/pages/account/41.php
@@ -74,7 +74,7 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
 	while($row = mysql_fetch_assoc($res))
 	{
 		echo "<option value='".sanitizeHTML($row['locale'])."'";
-		echo ">".$row['lang']." - ".$row['country']."</option>\n";
+		echo ">[".$row['locale']."] ".$row['lang']." - (".$row['country'].")</option>\n";
 	}
 ?>
 	</select>
-- 
cgit v1.2.1


From e876e93e5941e295807c311a990775a2188d4d4a Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Wed, 13 Mar 2013 09:08:42 +0100
Subject: bug 1124: Sanatize properly and make code look better

---
 pages/account/41.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/account/41.php b/pages/account/41.php
index aac45dd..148944a 100644
--- a/pages/account/41.php
+++ b/pages/account/41.php
@@ -73,8 +73,12 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
 	$res = mysql_query($query);
 	while($row = mysql_fetch_assoc($res))
 	{
-		echo "<option value='".sanitizeHTML($row['locale'])."'";
-		echo ">[".$row['locale']."] ".$row['lang']." - (".$row['country'].")</option>\n";
+		printf("<option value=\"%s\">[%s] %s (%s)</option>\n",
+			sanitizeHTML($row['locale']),
+			sanitizeHTML($row['locale']),
+			sanitizeHTML($row['lang']),
+			sanitizeHTML($row['country'])
+			);
 	}
 ?>
 	</select>
-- 
cgit v1.2.1


From 3c4d3fa9a9bf74090fc5ef86847e0a1b58f5c96f Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Wed, 13 Mar 2013 18:38:52 +0100
Subject: bug 1124: Avoid duplicate escaping and do ordering by locale

---
 pages/account/41.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/account/41.php b/pages/account/41.php
index 148944a..4974537 100644
--- a/pages/account/41.php
+++ b/pages/account/41.php
@@ -69,15 +69,15 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
     <td class="DataTD"><?=_("Secondary languages")?>:</td>
     <td class="DataTD"><select name="addlang">
 <?
-	$query = "select * from `languages` order by `lang`,`country`";
+	$query = "select * from `languages` order by `locale`";
 	$res = mysql_query($query);
 	while($row = mysql_fetch_assoc($res))
 	{
 		printf("<option value=\"%s\">[%s] %s (%s)</option>\n",
 			sanitizeHTML($row['locale']),
 			sanitizeHTML($row['locale']),
-			sanitizeHTML($row['lang']),
-			sanitizeHTML($row['country'])
+			$row['lang'],
+			$row['country']
 			);
 	}
 ?>
-- 
cgit v1.2.1