1 files changed, 46 insertions, 16 deletions

diff --git a/lib/general.lib.php b/lib/general.lib.php
index d09be316..d8ff2072 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -382,7 +382,7 @@ function get_languages() {
 	$results = array(); 
 
 	/* Prepend English */
-	$results['en_US'] = 'English';
+	$results['en_US'] = 'English (US)';
 
 	while ($file = readdir($handle)) { 
 
@@ -391,21 +391,51 @@ function get_languages() {
 		/* Check to see if it's a directory */
 		if (is_dir($full_file) AND substr($file,0,1) != '.' AND $file != 'base') { 
 				
-			switch($file) { 
-				case 'de_DE'; $name = 'Deutsch'; break;
-				case 'en_US'; $name = 'English'; break;
-				case 'ca_CA'; $name = 'Català'; break;
-				case 'en_GB'; $name = 'British English'; break;
-				case 'es_ES'; $name = 'Español'; break;
-				case 'el_GR'; $name = 'Greek (Ελληνικά)'; break; 
-				case 'fr_FR'; $name = 'Français'; break;
-				case 'it_IT'; $name = 'Italiano'; break;
-				case 'is_IS'; $name = 'Íslenska'; break;
-				case 'nl_NL'; $name = 'Nederlands'; break;
-				case 'tr_TR'; $name = 'Turkish'; break;
-				case 'zh_CN'; $name = _('Simplified Chinese') . " (简体中文)"; break;
-				case 'ru_RU'; $name = 'Russian (Русский)'; break;
-				case 'ja_JP'; $name = 'Japanese (日本語)'; break;
+			switch($file) {
+				case 'af_ZA'; $name = 'Afrikaans'; break; /* Afrikaans */
+				case 'ca_ES'; $name = 'Català'; break; /* Catalan */
+				case 'cs_CZ'; $name = 'Česky'; break; /* Czech */
+				case 'da_DK'; $name = 'Dansk'; break; /* Danish */
+				case 'de_DE'; $name = 'Deutsch'; break; /* German */
+				case 'en_US'; $name = 'English (US)'; break; /* English */
+				case 'en_GB'; $name = 'English (UK)'; break; /* English */
+				case 'es_ES'; $name = 'Español'; break; /* Spanish */
+				case 'es_MX'; $name = 'Español (MX)'; break; /* Spanish */
+				case 'es_AR'; $name = 'Español (AR)'; break; /* Spanish */
+				case 'et_EE'; $name = 'Eesti'; break; /* Estonian */
+				case 'eu_ES'; $name = 'Euskara'; break; /* Basque */
+				case 'fr_FR'; $name = 'Français'; break; /* French */
+				case 'ga_IE'; $name = 'Gaeilge'; break; /* Irish */
+				case 'el_GR'; $name = 'Greek'; break; /* Greek */
+				case 'is_IS'; $name = 'Icelandic'; break; /* Icelandic */
+				case 'it_IT'; $name = 'Italiano'; break; /* Italian */
+				case 'lv_LV'; $name = 'Latviešu'; break; /* Latvian */
+				case 'lt_LT'; $name = 'Lietuvių'; break; /* Lithuanian */
+				case 'hu_HU'; $name = 'Magyar'; break; /* Hungarian */
+				case 'nl_NL'; $name = 'Nederlands'; break; /* Dutch */
+				case 'no_NO'; $name = 'Norsk bokmål'; break; /* Norwegian */
+				case 'pl_PL'; $name = 'Polski'; break; /* Polish */
+				case 'pt_BR'; $name = 'Português Brasileiro'; break; /* Portuguese */
+				case 'pt_PT'; $name = 'Português'; break; /* Portuguese */
+				case 'ro_RO'; $name = 'Română'; break; /* Romanian */
+				case 'sk_SK'; $name = 'Slovenčina'; break; /* Slovak */
+				case 'sl_SI'; $name = 'Slovenščina'; break; /* Slovenian */
+				case 'sr_CS'; $name = 'Srpski'; break; /* Serbian */
+				case 'fi_FI'; $name = 'Suomi'; break; /* Finnish */
+				case 'sv_SE'; $name = 'Svenska'; break; /* Swedish */
+				case 'uk_UA'; $name = 'Українська'; break; /* Ukrainian */
+				case 'vi_VN'; $name = 'Tiếng Việt'; break; /* Vietnamese */
+				case 'tr_TR'; $name = 'Türkçe'; break; /* Turkish */
+				case 'bg_BG'; $name = 'Български'; break; /* Bulgarian */
+				case 'ru_RU'; $name = 'Русский'; break; /* Russian */
+				case 'zh_CN'; $name = '简体中文'; break; /* Chinese */
+				case 'zn_TW'; $name = '繁體中文'; break; /* Chinese */
+				case 'ko_KR'; $name = '한국말'; break; /* Korean */
+				case 'ja_JP'; $name = '日本語'; break; /* Japanese */
+				/* These languages are right to left. */
+				case 'ar_SA'; $name = 'العربية'; break; /* Arabic */
+				case 'he_IL'; $name = 'עברית'; break; /* Hebrew */
+				case 'fa_IR'; $name = 'فارسي'; break; /* Farsi */
 				default: $name = _('Unknown'); break;
 			} // end switch