From f5a2615a3b9e8dc673cbdc62e6c831eccf62c477 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Wed, 18 Feb 2009 03:57:03 +0100
Subject: [PATCH] [svn r18559] FS#3594: Adding missing language codes to the
 'language' table. Adding comments to the functions api_get_language_isocode()
 and Database::get_language_isocode() mentioning the used language-code
 standards.

---
 main/inc/lib/database.lib.php | 12 ++++++++---
 main/inc/lib/main_api.lib.php | 11 +++++++---
 main/install/dokeos_main.sql  | 38 +++++++++++++++++------------------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php
index bf8a6c8dbc..345484025e 100644
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@@ -1,4 +1,4 @@
-<?php // $Id: database.lib.php 18543 2009-02-17 15:04:15Z cfasanando $
+<?php // $Id: database.lib.php 18559 2009-02-18 02:57:03Z ivantcholakov $
 /* See license terms in /dokeos_license.txt */
 /**
 ==============================================================================
@@ -430,7 +430,13 @@ class Database
 		return Database::format_table_name($database, $short_table_name);
 	}
 	/**
-	*	Returns the isocode corresponding to the language directory given.
+	 * Returns the isocode corresponding to the language directory given.
+	 * Returned codes are according to the following standards (in order of preference):
+	 * -  ISO 639-1 : Alpha-2 code (two-letters code - en, fr, es, ...)
+	 * -  RFC 4646  : five-letter code based on the ISO 639 two-letter language codes
+	 *    and the ISO 3166 two-letter territory codes (pt-BR, ...)
+	 * -  ISO 639-2 : Alpha-3 code (three-letters code - ast, fur, ...)
+	 * @return	string	The isocode
 	*/
 	function get_language_isocode($lang_folder)
 	{
@@ -817,4 +823,4 @@ class Database
 
     
 }
-//end class Database
\ No newline at end of file
+//end class Database
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index e9e3ab6634..3337bb0bf1 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -1910,8 +1910,13 @@ function api_get_languages() {
 	return $language_list;
 }
 /**
- * Get language isocode column from the language table, taking the current language as a query
- * @return	string	The isocode (two-letters code or 5 letters code, fr or fr-BE) or null if error
+ * Gets language isocode column from the language table, taking the current language as a query parameter.
+ * Returned codes are according to the following standards (in order of preference):
+ * -  ISO 639-1 : Alpha-2 code (two-letters code - en, fr, es, ...)
+ * -  RFC 4646  : five-letter code based on the ISO 639 two-letter language codes
+ *    and the ISO 3166 two-letter territory codes (pt-BR, ...)
+ * -  ISO 639-2 : Alpha-3 code (three-letters code - ast, fur, ...)
+ * @return	string	The isocode or null if error
  */
 function api_get_language_isocode() {
 	$tbl_language = Database::get_main_table(TABLE_MAIN_LANGUAGE);
@@ -3129,4 +3134,4 @@ function api_is_xml_http_request() {
 	} else {
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/main/install/dokeos_main.sql b/main/install/dokeos_main.sql
index ba23148e87..7d77bb6834 100644
--- a/main/install/dokeos_main.sql
+++ b/main/install/dokeos_main.sql
@@ -328,56 +328,56 @@ CREATE TABLE language (
 LOCK TABLES language WRITE;
 INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available) VALUES
 ('Arabija (el)','arabic','ar','arabic',0),
-('Asturian','asturian','','asturian',0),
+('Asturian','asturian','ast','asturian',0),
 ('Balgarski','bulgarian','bg','bulgarian',0),
-('Bosanski','bosnian',NULL,'bosnian',1),
+('Bosanski','bosnian','bs','bosnian',1),
 ('Catal&agrave;','catalan','ca','catalan',0),
 ('Chinese (simplified)','simpl_chinese','zh','simpl_chinese',0),
-('Czech','czech','','czech',0),
+('Czech','czech','cs','czech',0),
 ('Dansk','danish','da','danish',0),
-('Dari','dari','','dari',0),
+('Dari','dari','prs','dari',0),
 ('Deutsch','german','de','german',1),
 ('Ellinika','greek','el','greek',0),
 ('English','english','en','english',1),
 ('Espa&ntilde;ol','spanish','es','spanish',1),
 ('Esperanto','esperanto','eo','esperanto',0),
-('Euskera','euskera','','euskera',0),
+('Euskara','euskera','eu','euskera',0),
 ('Farsi','persian','fa','persian',0),
 ('Fran&ccedil;ais','french','fr','french',1),
-('Friulian','friulian','','friulian',0),
+('Friulian','friulian','fur','friulian',0),
 ('Galego','galician','gl','galician',0),
-('Georgian','georgian','','georgian',0),
+('Georgian','georgian','ka','georgian',0),
 ('Hrvatski','croatian','hr','croatian',0),
-('Hebrew','hebrew','','hebrew',0),
+('Hebrew','hebrew','he','hebrew',0),
 ('Indonesia (Bahasa I.)','indonesian','id','indonesian',1),
 ('Italiano','italian','it','italian',1),
-('Korean','korean','','korean',0),
-('Latvian','latvian','','latvian',0),
-('Lithuanian','lithuanian','','lithuanian',0),
-('Macedonian','macedonian','','macedonian',0),
+('Korean','korean','ko','korean',0),
+('Latvian','latvian','lv','latvian',0),
+('Lithuanian','lithuanian','lt','lithuanian',0),
+('Macedonian','macedonian','mk','macedonian',0),
 ('Magyar','hungarian','hu','hungarian',1),
 ('Melayu (Bahasa M.)','malay','ms','malay',0),
 ('Nederlands','dutch','nl','dutch',1),
 ('Nihongo','japanese','ja','japanese',0),
 ('Norsk','norwegian','no','norwegian',0),
-('Pashto','pashto','','pashto',0),
+('Pashto','pashto','ps','pashto',0),
 ('Polski','polish','pl','polish',0),
 ('Portugu&ecirc;s (Portugal)','portuguese','pt','portuguese',1),
 ('Portugu&ecirc;s (Brazil)','brazilian','pt-BR','brazilian',1),
-('Romanian','romanian','','romanian',0),
-('Runasimi','quechua_cusco','','quechua_cusco',0),
+('Romanian','romanian','ro','romanian',0),
+('Runasimi','quechua_cusco','qu','quechua_cusco',0),
 ('Russkij','russian','ru','russian',0),
-('Slovak','slovak','','slovak',0),
+('Slovak','slovak','sk','slovak',0),
 ('Slovenscina','slovenian','sl','slovenian',1),
 ('Srpski','serbian','sr','serbian',0),
 ('Suomi','finnish','fi','finnish',0),
 ('Svenska','swedish','sv','swedish',0),
 ('Thai','thai','th','thai',0),
 ('T&uuml;rk&ccedil;e','turkce','tr','turkce',0),
-('Ukrainian','ukrainian','','ukrainian',0),
+('Ukrainian','ukrainian','uk','ukrainian',0),
 ('Vi&ecirc;t (Ti&ecirc;ng V.)','vietnamese','vi','vietnamese',0),
 ('Swahili (kiSw.)','swahili','sw','swahili',0),
-('Yoruba','yoruba','','yoruba',0);
+('Yoruba','yoruba','yo','yoruba',0);
 
 UNLOCK TABLES;
 /*!40000 ALTER TABLE language ENABLE KEYS */;
@@ -1299,4 +1299,4 @@ VALUES
 (3,'SocialFriend'),
 (4,'SocialGoodFriend'),
 (5,'SocialEnemy'),
-(6,'SocialDeleted');
\ No newline at end of file
+(6,'SocialDeleted');