Initial implementation of Gettext based selection.

- Loads list of available languages
- Sets locale
- Loads transitional messages file

libraries/select_lang.lib.php

@@ -156,14 +156,8 @@ function PMA_langDetect(&$str, $envType)
     return false;
 } // end of the 'PMA_langDetect()' function
 
+
 /**
- * Returns list of languages supported by phpMyAdmin
- *
- * @return array
- */
-function PMA_langList()
-{
-    /**
  * All the supported languages have to be listed in the array below.
  * 1. The key must be the "official" ISO 639 language code and, if required,
  *    the dialect code. It can also contain some information about the
@@ -190,77 +184,178 @@ function PMA_langList()
  * example.
  *
  */
-    return array(
+function PMA_langDetails($lang) {
-        'af-utf-8'    => array('af|afrikaans', 'afrikaans-utf-8', 'af', ''),
+    switch ($lang) {
-        'ar-utf-8'    => array('ar|arabic', 'arabic-utf-8', 'ar', 'العربية'),
+        case 'en':
-        'az-utf-8'    => array('az|azerbaijani', 'azerbaijani-utf-8', 'az', 'Azərbaycanca'),
+            return array('en|english',  'english-utf-8', 'en', '');
-        'bn-utf-8'    => array('bn|bangla', 'bangla-utf-8', 'bn', ''),
+        case 'af':
-        'becyr-utf-8' => array('be|belarusian', 'belarusian_cyrillic-utf-8', 'be', 'Беларуская'),
+            return array('af|afrikaans', 'afrikaans-utf-8', 'af', '');
-        'belat-utf-8' => array('be[-_]lat|belarusian latin', 'belarusian_latin-utf-8', 'be-lat', 'Biełaruskaja'),
+        case 'ar':
-        'bg-utf-8'    => array('bg|bulgarian', 'bulgarian-utf-8', 'bg', 'Български'),
+            return array('ar|arabic', 'arabic-utf-8', 'ar', 'العربية');
-        'bs-utf-8'    => array('bs|bosnian', 'bosnian-utf-8', 'bs', 'Bosanski'),
+        case 'az':
-        'ca-utf-8'    => array('ca|catalan', 'catalan-utf-8', 'ca', 'Català'),
+            return array('az|azerbaijani', 'azerbaijani-utf-8', 'az', 'Azərbaycanca');
-        'cs-utf-8'    => array('cs|czech', 'czech-utf-8', 'cs', 'Česky'),
+        case 'bn':
-        'da-utf-8'    => array('da|danish', 'danish-utf-8', 'da', 'Dansk'),
+            return array('bn|bangla', 'bangla-utf-8', 'bn', '');
-        'de-utf-8'    => array('de|german', 'german-utf-8', 'de', 'Deutsch'),
+        case 'be':
-        'el-utf-8'    => array('el|greek',  'greek-utf-8', 'el', 'Ελληνικά'),
+            return array('be|belarusian', 'belarusian_cyrillic-utf-8', 'be', 'Беларуская');
-        'en-utf-8'    => array('en|english',  'english-utf-8', 'en', ''),
+        case 'be@latin':
-        'en-gb-utf-8' => array('en[_-]gb|english (United Kingdom)',  'english-gb-utf-8', 'en', ''),
+            return array('be[-_]lat|belarusian latin', 'belarusian_latin-utf-8', 'be-lat', 'Biełaruskaja');
-        'es-utf-8'    => array('es|spanish', 'spanish-utf-8', 'es', 'Español'),
+        case 'bg':
-        'et-utf-8'    => array('et|estonian', 'estonian-utf-8', 'et', 'Eesti'),
+            return array('bg|bulgarian', 'bulgarian-utf-8', 'bg', 'Български');
-        'eu-utf-8'    => array('eu|basque', 'basque-utf-8', 'eu', 'Euskara'),
+        case 'bs':
-        'fa-utf-8'    => array('fa|persian', 'persian-utf-8', 'fa', 'فارسی'),
+            return array('bs|bosnian', 'bosnian-utf-8', 'bs', 'Bosanski');
-        'fi-utf-8'    => array('fi|finnish', 'finnish-utf-8', 'fi', 'Suomi'),
+        case 'ca':
-        'fr-utf-8'    => array('fr|french', 'french-utf-8', 'fr', 'Français'),
+            return array('ca|catalan', 'catalan-utf-8', 'ca', 'Català');
-        'gl-utf-8'    => array('gl|galician', 'galician-utf-8', 'gl', 'Galego'),
+        case 'cs':
-        'he-utf-8'    => array('he|hebrew', 'hebrew-utf-8', 'he', 'עברית'),
+            return array('cs|czech', 'czech-utf-8', 'cs', 'Česky');
-        'hi-utf-8'    => array('hi|hindi', 'hindi-utf-8', 'hi', 'हिन्दी'),
+        case 'da':
-        'hr-utf-8'    => array('hr|croatian', 'croatian-utf-8', 'hr', 'Hrvatski'),
+            return array('da|danish', 'danish-utf-8', 'da', 'Dansk');
-        'hu-utf-8'    => array('hu|hungarian', 'hungarian-utf-8', 'hu', 'Magyar'),
+        case 'de':
-        'id-utf-8'    => array('id|indonesian', 'indonesian-utf-8', 'id', 'Bahasa Indonesia'),
+            return array('de|german', 'german-utf-8', 'de', 'Deutsch');
-        'it-utf-8'    => array('it|italian', 'italian-utf-8', 'it', 'Italiano'),
+        case 'el':
-        'ja-utf-8'    => array('ja|japanese', 'japanese-utf-8', 'ja', '日本語'),
+            return array('el|greek',  'greek-utf-8', 'el', 'Ελληνικά');
-        'ko-utf-8'    => array('ko|korean', 'korean-utf-8', 'ko', '한국어'),
+        case 'en':
-        'ka-utf-8'    => array('ka|georgian', 'georgian-utf-8', 'ka', 'ქართული'),
+            return array('en|english',  'english-utf-8', 'en', '');
-        'lt-utf-8'    => array('lt|lithuanian', 'lithuanian-utf-8', 'lt', 'Lietuvių'),
+        case 'en_GB':
-        'lv-utf-8'    => array('lv|latvian', 'latvian-utf-8', 'lv', 'Latviešu'),
+            return array('en[_-]gb|english (United Kingdom)',  'english-gb-utf-8', 'en', '');
-        'mkcyr-utf-8' => array('mk|macedonian', 'macedonian_cyrillic-utf-8', 'mk', 'Macedonian'),
+        case 'es':
-        'mn-utf-8'    => array('mn|mongolian', 'mongolian-utf-8', 'mn', 'Монгол'),
+            return array('es|spanish', 'spanish-utf-8', 'es', 'Español');
-        'ms-utf-8'    => array('ms|malay', 'malay-utf-8', 'ms', 'Bahasa Melayu'),
+        case 'et':
-        'nl-utf-8'    => array('nl|dutch', 'dutch-utf-8', 'nl', 'Nederlands'),
+            return array('et|estonian', 'estonian-utf-8', 'et', 'Eesti');
-        'no-utf-8'    => array('no|norwegian', 'norwegian-utf-8', 'no', 'Norsk'),
+        case 'eu':
-        'pl-utf-8'    => array('pl|polish', 'polish-utf-8', 'pl', 'Polski'),
+            return array('eu|basque', 'basque-utf-8', 'eu', 'Euskara');
-        'ptbr-utf-8'  => array('pt[-_]br|brazilian portuguese', 'brazilian_portuguese-utf-8', 'pt-BR', 'Português'),
+        case 'fa':
-        'pt-utf-8'    => array('pt|portuguese', 'portuguese-utf-8', 'pt', 'Português'),
+            return array('fa|persian', 'persian-utf-8', 'fa', 'فارسی');
-        'ro-utf-8'    => array('ro|romanian', 'romanian-utf-8', 'ro', 'Română'),
+        case 'fi':
-        'ru-utf-8'    => array('ru|russian', 'russian-utf-8', 'ru', 'Русский'),
+            return array('fi|finnish', 'finnish-utf-8', 'fi', 'Suomi');
-        'si-utf-8'    => array('si|sinhala', 'sinhala-utf-8', 'si', 'සිංහල'),
+        case 'fr':
-        'sk-utf-8'    => array('sk|slovak', 'slovak-utf-8', 'sk', 'Slovenčina'),
+            return array('fr|french', 'french-utf-8', 'fr', 'Français');
-        'sl-utf-8'    => array('sl|slovenian', 'slovenian-utf-8', 'sl', 'Slovenščina'),
+        case 'gl':
-        'sq-utf-8'    => array('sq|albanian', 'albanian-utf-8', 'sq', 'Shqip'),
+            return array('gl|galician', 'galician-utf-8', 'gl', 'Galego');
-        'srlat-utf-8' => array('sr[-_]lat|serbian latin', 'serbian_latin-utf-8', 'sr-lat', 'Srpski'),
+        case 'he':
-        'srcyr-utf-8' => array('sr|serbian', 'serbian_cyrillic-utf-8', 'sr', 'Српски'),
+            return array('he|hebrew', 'hebrew-utf-8', 'he', 'עברית');
-        'sv-utf-8'    => array('sv|swedish', 'swedish-utf-8', 'sv', 'Svenska'),
+        case 'hi':
-        'th-utf-8'    => array('th|thai', 'thai-utf-8', 'th', 'ภาษาไทย'),
+            return array('hi|hindi', 'hindi-utf-8', 'hi', 'हिन्दी');
-        'tr-utf-8'    => array('tr|turkish', 'turkish-utf-8', 'tr', 'Türkçe'),
+        case 'hr':
-        'tt-utf-8'    => array('tt|tatarish', 'tatarish-utf-8', 'tt', 'Tatarça'),
+            return array('hr|croatian', 'croatian-utf-8', 'hr', 'Hrvatski');
-        'uk-utf-8'    => array('uk|ukrainian', 'ukrainian-utf-8', 'uk', 'Українська'),
+        case 'hu':
-        'uzlat-utf-8' => array('uz[-_]lat|uzbek-latin', 'uzbek_latin-utf-8', 'uz-lat', 'O‘zbekcha'),
+            return array('hu|hungarian', 'hungarian-utf-8', 'hu', 'Magyar');
-        'uzcyr-utf-8' => array('uz[-_]cyr|uzbek-cyrillic', 'uzbek_cyrillic-utf-8', 'uz-cyr', 'Ўзбекча'),
+        case 'id':
-        'zhtw-utf-8'  => array('zh[-_](tw|hk)|chinese traditional', 'chinese_traditional-utf-8', 'zh-TW', '中文'),
+            return array('id|indonesian', 'indonesian-utf-8', 'id', 'Bahasa Indonesia');
-        'zh-utf-8'    => array('zh|chinese simplified', 'chinese_simplified-utf-8', 'zh', '中文'),
+        case 'it':
-    );
+            return array('it|italian', 'italian-utf-8', 'it', 'Italiano');
+        case 'jp':
+            return array('jp|japanese', 'japanese-utf-8', 'jp', '日本語');
+        case 'ko':
+            return array('ko|korean', 'korean-utf-8', 'ko', '한국어');
+        case 'ka':
+            return array('ka|georgian', 'georgian-utf-8', 'ka', 'ქართული');
+        case 'lt':
+            return array('lt|lithuanian', 'lithuanian-utf-8', 'lt', 'Lietuvių');
+        case 'lv':
+            return array('lv|latvian', 'latvian-utf-8', 'lv', 'Latviešu');
+        case 'mk':
+            return array('mk|macedonian', 'macedonian_cyrillic-utf-8', 'mk', 'Macedonian');
+        case 'mn':
+            return array('mn|mongolian', 'mongolian-utf-8', 'mn', 'Монгол');
+        case 'ms':
+            return array('ms|malay', 'malay-utf-8', 'ms', 'Bahasa Melayu');
+        case 'nl':
+            return array('nl|dutch', 'dutch-utf-8', 'nl', 'Nederlands');
+        case 'no':
+            return array('no|norwegian', 'norwegian-utf-8', 'no', 'Norsk');
+        case 'pl':
+            return array('pl|polish', 'polish-utf-8', 'pl', 'Polski');
+        case 'pt_BR':
+            return array('pt[-_]br|brazilian portuguese', 'brazilian_portuguese-utf-8', 'pt-BR', 'Português');
+        case 'pt':
+            return array('pt|portuguese', 'portuguese-utf-8', 'pt', 'Português');
+        case 'ro':
+            return array('ro|romanian', 'romanian-utf-8', 'ro', 'Română');
+        case 'ru':
+            return array('ru|russian', 'russian-utf-8', 'ru', 'Русский');
+        case 'si':
+            return array('si|sinhala', 'sinhala-utf-8', 'si', 'සිංහල');
+        case 'sk':
+            return array('sk|slovak', 'slovak-utf-8', 'sk', 'Slovenčina');
+        case 'sl':
+            return array('sl|slovenian', 'slovenian-utf-8', 'sl', 'Slovenščina');
+        case 'sq':
+            return array('sq|albanian', 'albanian-utf-8', 'sq', 'Shqip');
+        case 'sr@latin':
+            return array('sr[-_]lat|serbian latin', 'serbian_latin-utf-8', 'sr-lat', 'Srpski');
+        case 'sr':
+            return array('sr|serbian', 'serbian_cyrillic-utf-8', 'sr', 'Српски');
+        case 'sv':
+            return array('sv|swedish', 'swedish-utf-8', 'sv', 'Svenska');
+        case 'th':
+            return array('th|thai', 'thai-utf-8', 'th', 'ภาษาไทย');
+        case 'tr':
+            return array('tr|turkish', 'turkish-utf-8', 'tr', 'Türkçe');
+        case 'tt':
+            return array('tt|tatarish', 'tatarish-utf-8', 'tt', 'Tatarça');
+        case 'uk':
+            return array('uk|ukrainian', 'ukrainian-utf-8', 'uk', 'Українська');
+        case 'uz@latin':
+            return array('uz[-_]lat|uzbek-latin', 'uzbek_latin-utf-8', 'uz-lat', 'O‘zbekcha');
+        case 'uz':
+            return array('uz[-_]cyr|uzbek-cyrillic', 'uzbek_cyrillic-utf-8', 'uz-cyr', 'Ўзбекча');
+        case 'zh_TW':
+            return array('zh[-_](tw|hk)|chinese traditional', 'chinese_traditional-utf-8', 'zh-TW', '中文');
+        case 'zh_CN':
+            return array('zh|chinese simplified', 'chinese_simplified-utf-8', 'zh', '中文');
+    }
+    return array($lang, $lang, $lang, '');
+}
+
+/**
+ * Returns list of languages supported by phpMyAdmin
+ *
+ * @return array
+ */
+function PMA_langList()
+{
+    /* We can always speak English */
+    $result = array('en-utf-8' => PMA_langDetails('en'));
+
+    /* Open the directory */
+    $handle = @opendir($GLOBALS['lang_path']);
+    if ($handle === FALSE) {
+        trigger_error('phpMyAdmin: path not found: '
+            . $GLOBALS['lang_path'] . ', check your language directory.',
+            E_USER_WARNING);
+        return $result;
+    }
+
+    /* Process all files */
+    while (FALSE !== ($file = readdir($handle))) {
+        if ($file != "." && $file != ".." && file_exists($GLOBALS['lang_path'] . '/' . $file . '/LC_MESSAGES/phpmyadmin.mo')) {
+            $result[$file] = PMA_langDetails($file);
+        }
+    }
+    /* Close the handle */
+    closedir($handle);
+
+    return $result;
 }
 
 /**
  * @global string  path to the translations directory
  */
-$GLOBALS['lang_path'] = './lang/';
+$GLOBALS['lang_path'] = './locale/';
+
+define('LOCALE_DIR', realpath($GLOBALS['lang_path']));
+define('DEFAULT_LOCALE', 'en_US');
+
+/**
+ * Load gettext functions.
+ */
+require_once './libraries/php-gettext/gettext.inc';
 
 /**
  * @global string  interface language
  */
-$GLOBALS['lang'] = 'en-utf-8';
+$GLOBALS['lang'] = 'en';
 /**
  * @global boolean whether loading lang from cfg failed
  */
@@ -297,28 +392,6 @@ if (! empty($GLOBALS['cfg']['FilterLanguages'])) {
     unset($key, $val, $new_lang);
 }
 
-/**
- * first check for lang dir exists
- */
-if (! is_dir($GLOBALS['lang_path'])) {
-    // language directory not found
-    trigger_error('phpMyAdmin-ERROR: path not found: '
-        . $GLOBALS['lang_path'] . ', check your language directory.',
-        E_USER_WARNING);
-    // and tell the user
-    PMA_fatalError('path to languages is invalid: ' . $GLOBALS['lang_path']);
-}
-
-/**
- * check for language files
- */
-foreach ($GLOBALS['available_languages'] as $each_lang_key => $each_lang) {
-    if (! file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) {
-        unset($GLOBALS['available_languages'][$each_lang_key]);
-    }
-}
-unset($each_lang_key, $each_lang);
-
 /**
  * @global array MySQL charsets map
  */
@@ -376,9 +449,11 @@ if (! PMA_langCheck()) {
     }
 }
 
-// Defines the associated filename and load the translation
+// Set locale
-$lang_file = $GLOBALS['lang_path'] . $GLOBALS['available_languages'][$GLOBALS['lang']][1] . '.inc.php';
+T_setlocale(LC_MESSAGES, $GLOBALS['lang']);
-require_once $lang_file;
+
+// Load messages
+require_once './libraries/messages.inc.php';
 
 // now, that we have loaded the language strings we can send the errors
 if ($GLOBALS['lang_failed_cfg']) {