diff options
| -rw-r--r-- | _nav/lib.php | 50 | ||||
| -rw-r--r-- | langs.inc.php | 31 |
2 files changed, 35 insertions, 46 deletions
diff --git a/_nav/lib.php b/_nav/lib.php index 0cf33b47a..96d5c4539 100644 --- a/_nav/lib.php +++ b/_nav/lib.php @@ -20,6 +20,38 @@ require_once('php-mo.php'); +// languages for home +$langs = array( + 'ast' => 'Asturianu', + 'ca' => 'Català', + 'cs' => 'Čeština', + 'de' => 'Deutsch', + 'el' => 'Ελληνικά', + 'en' => 'English', + 'eo' => 'Esperanto', + 'es' => 'Español', + 'et' => 'Eesti', + 'fi' => 'Suomeksi', + 'fr' => 'Français', + 'id' => 'Bahasa Indonesia', + 'it' => 'Italiano', + 'lv' => 'Latviešu', + 'nb' => 'Bokmål', + 'nl' => 'Nederlands', + 'pl' => 'Polski', + 'pt' => 'Português', + 'pt-br' => 'Português do Brasil', + 'ro' => 'Română', + 'ru' => 'Русский', + 'sl' => 'Slovenščina', + 'sv' => 'Svenska', + 'tr' => 'Türkçe', + 'uk' => 'Українська', + 'ur' => 'اردو', + 'zh-cn' => '简体中文', + 'zh-tw' => '正體中文' +); + class NCache { function __construct() { } @@ -297,22 +329,8 @@ function _lang_check($s = null) return 'en'; } - $supported = array( - 'ast', - 'cs', - 'de', - 'el', 'en', 'eo', 'es', 'et', - 'fi', 'fr', - 'id', 'it', - 'lv', - 'nb', 'nl', - 'pl', 'pt', 'pt-br', - 'ro', 'ru', - 'sl', 'sv', - 'tr', - 'uk', 'ur', - 'zh-cn', 'zh-tw' - ); + global $langs; + $supported = array_keys($langs); if (in_array($s, $supported)) return $s; diff --git a/langs.inc.php b/langs.inc.php index 6607f7edc..5e9dceab5 100644 --- a/langs.inc.php +++ b/langs.inc.php @@ -7,36 +7,7 @@ define('G_APP_ROOT', $g_app_root); define('G_VHOST', $_SERVER['SERVER_NAME']); // languages for home -$langs = array( - 'ast' => 'Asturianu', - 'ca' => 'Català', - 'cs' => 'Čeština', - 'de' => 'Deutsch', - 'el' => 'Ελληνικά', - 'en' => 'English', - 'eo' => 'Esperanto', - 'es' => 'Español', - 'et' => 'Eesti', - 'fi' => 'Suomeksi', - 'fr' => 'Français', - 'id' => 'Bahasa Indonesia', - 'it' => 'Italiano', - 'lv' => 'Latviešu', - 'nb' => 'Bokmål', - 'nl' => 'Nederlands', - 'pl' => 'Polski', - 'pt' => 'Português', - 'pt-br' => 'Português do Brasil', - 'ro' => 'Română', - 'ru' => 'Русский', - 'sl' => 'Slovenščina', - 'sv' => 'Svenska', - 'tr' => 'Türkçe', - 'uk' => 'Українська', - 'ur' => 'اردو', - 'zh-cn' => '简体中文', - 'zh-tw' => '正體中文' -); +// $langs = array() is now in /_nav/lib.php // TODO (rda) define fallback languages for each language // for instance, pt-br could fallback on pt and pt on pt-br (but without |