summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2008-10-02 14:13:38 -0400
committerCiaranG <ciaran@ciarang.com>2008-10-02 14:13:38 -0400
commitb49c2f051a0d95ac280af0250e69215faee6018b (patch)
tree54e027a90c022cf1c11e46e1bd3f77fb87aed397 /lib
parent7f1639fda15161db0b0b5c6c10824d7d515123f1 (diff)
Combined language patches that got missed due to repo dependencies
darcs-hash:20081002181338-f6e2c-cf9cf3791680634fa457cb83dc2e4f933073a9b1.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/language.php60
-rw-r--r--lib/util.php29
2 files changed, 51 insertions, 38 deletions
diff --git a/lib/language.php b/lib/language.php
index 5ad5c449d..32091dcf6 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -23,7 +23,7 @@ if (!defined('LACONICA')) { exit(1); }
function client_prefered_language($httplang) {
$client_langs = array();
- $all_languages = get_all_languages();
+ $all_languages = common_config('site','languages');
preg_match_all('"(((\S\S)-?(\S\S)?)(;q=([0-9.]+))?)\s*(,\s*|$)"',strtolower($httplang),$httplang);
for ($i = 0; $i < count($httplang); $i++) {
@@ -49,35 +49,45 @@ function client_prefered_language($httplang) {
function get_nice_language_list() {
$nice_lang = array();
- $all_languages = get_all_languages();
+ $all_languages = common_config('site','languages');
foreach ($all_languages as $lang) {
$nice_lang = $nice_lang + array($lang['lang'] => $lang['name']);
}
return $nice_lang;
}
+// Get a list of all languages that are enabled in the default config. This
+// should ONLY be called when setting up the default config in common.php.
+// Any other attempt to get a list of lanugages should instead call
+// common_config('site','languages')
function get_all_languages() {
- $all_languages = array(
- 'en-us' => array('q' => 1, 'lang' => 'en_US', 'name' => 'English (US)', 'direction' => 'ltr'),
- 'en-nz' => array('q' => 1, 'lang' => 'en_NZ', 'name' => 'English (NZ)', 'direction' => 'ltr'),
- 'en-gb' => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
- 'en' => array('q' => 1, 'lang' => 'en', 'name' => 'English', 'direction' => 'ltr'),
- 'da' => array('q' => 1, 'lang' => 'da_DK', 'name' => 'Danish', 'direction' => 'ltr'),
- 'nl' => array('q' => 1, 'lang' => 'nl_NL', 'name' => 'Dutch', 'direction' => 'ltr'),
- 'eo' => array('q' => 1, 'lang' => 'eo', 'name' => 'Esperanto', 'direction' => 'ltr'),
- 'fr-fr' => array('q' => 1, 'lang' => 'fr_FR', 'name' => 'French', 'direction' => 'ltr'),
- 'de' => array('q' => 1, 'lang' => 'de_DE', 'name' => 'German', 'direction' => 'ltr'),
- 'it' => array('q' => 1, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'ltr'),
- 'ko' => array('q' => 1, 'lang' => 'ko', 'name' => 'Korean', 'direction' => 'ltr'),
- 'nb' => array('q' => 1, 'lang' => 'nb_NO', 'name' => 'Norwegian (bokmal)', 'direction' => 'ltr'),
- 'pt' => array('q' => 1, 'lang' => 'pt', 'name' => 'Portuguese', 'direction' => 'ltr'),
- 'pt-br' => array('q' => 1, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
- 'ru' => array('q' => 1, 'lang' => 'ru_RU', 'name' => 'Russian', 'direction' => 'ltr'),
- 'es' => array('q' => 1, 'lang' => 'es', 'name' => 'Spanish', 'direction' => 'ltr'),
- 'tr' => array('q' => 1, 'lang' => 'tr_TR', 'name' => 'Turkish', 'direction' => 'ltr'),
- 'uk' => array('q' => 1, 'lang' => 'uk_UA', 'name' => 'Ukrainian', 'direction' => 'ltr'),
- 'lt' => array('q' => 1, 'lang' => 'lt_LT', 'name' => 'Lithuanian', 'direction' => 'ltr'),
- 'sv' => array('q' => 1, 'lang' => 'sv_SE', 'name' => 'Swedish', 'direction' => 'ltr'),
- );
- return $all_languages;
+ return array(
+ 'en-us' => array('q' => 1, 'lang' => 'en_US', 'name' => 'English (US)', 'direction' => 'ltr'),
+ 'en-nz' => array('q' => 1, 'lang' => 'en_NZ', 'name' => 'English (NZ)', 'direction' => 'ltr'),
+ 'en-gb' => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
+ 'en' => array('q' => 1, 'lang' => 'en', 'name' => 'English', 'direction' => 'ltr'),
+ 'da' => array('q' => 0.1, 'lang' => 'da_DK', 'name' => 'Danish', 'direction' => 'ltr'),
+ 'nl' => array('q' => 1, 'lang' => 'nl_NL', 'name' => 'Dutch', 'direction' => 'ltr'),
+ 'eo' => array('q' => 0.1, 'lang' => 'eo', 'name' => 'Esperanto', 'direction' => 'ltr'),
+ 'fr-fr' => array('q' => 0.9, 'lang' => 'fr_FR', 'name' => 'French', 'direction' => 'ltr'),
+ 'de' => array('q' => 1, 'lang' => 'de_DE', 'name' => 'German', 'direction' => 'ltr'),
+ 'it' => array('q' => 1, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'ltr'),
+ 'ko' => array('q' => 0.1, 'lang' => 'ko', 'name' => 'Korean', 'direction' => 'ltr'),
+ 'nb' => array('q' => 1, 'lang' => 'nb_NO', 'name' => 'Norwegian (bokmal)', 'direction' => 'ltr'),
+ 'pt' => array('q' => 0.2, 'lang' => 'pt', 'name' => 'Portuguese', 'direction' => 'ltr'),
+ 'pt-br' => array('q' => 0.1, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
+# 'ru' => array('q' => 0.1, 'lang' => 'ru_RU', 'name' => 'Russian', 'direction' => 'ltr'),
+ 'es' => array('q' => 1, 'lang' => 'es', 'name' => 'Spanish', 'direction' => 'ltr'),
+ 'tr' => array('q' => 1, 'lang' => 'tr_TR', 'name' => 'Turkish', 'direction' => 'ltr'),
+ 'uk' => array('q' => 1, 'lang' => 'uk_UA', 'name' => 'Ukrainian', 'direction' => 'ltr'),
+# 'lt' => array('q' => 0.1, 'lang' => 'lt_LT', 'name' => 'Lithuanian', 'direction' => 'ltr'),
+# 'sv' => array('q' => 1, 'lang' => 'sv_SE', 'name' => 'Swedish', 'direction' => 'ltr'),
+ 'pl' => array('q' => 1, 'lang' => 'pl_PL', 'name' => 'Polish', 'direction' => 'ltr'),
+ 'mk' => array('q' => 1, 'lang' => 'mk_MK', 'name' => 'Macedonian', 'direction' => 'ltr'),
+ 'jp' => array('q' => 0.1, 'lang' => 'ja_JP', 'name' => 'Japanese', 'direction' => 'ltr'),
+ 'cs' => array('q' => 1, 'lang' => 'cs_CZ', 'name' => 'Czech', 'direction' => 'ltr'),
+ 'ca' => array('q' => 1, 'lang' => 'ca_ES', 'name' => 'Catalan', 'direction' => 'ltr'),
+# 'hr' => array('q' => 0.1, 'lang' => 'he_IL', 'name' => 'Hebrew', 'direction' => 'ltr')
+ );
}
+
diff --git a/lib/util.php b/lib/util.php
index 87c7f8fb0..cf514564e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -146,6 +146,7 @@ function common_init_language() {
bind_textdomain_codeset("laconica", "UTF-8");
textdomain("laconica");
setlocale(LC_CTYPE, 'C');
+ common_log(LOG_INFO,'Language requested:'.$language.' Locale set:'.$locale_set,__FILE__);
}
define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
@@ -483,25 +484,27 @@ function common_timezone() {
}
function common_language() {
- $httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL;
- $language = array();
- $user_language = FALSE;
+ // If there is a user logged in and they've set a language preference
+ // then return that one...
if (common_logged_in()) {
$user = common_current_user();
$user_language = $user->language;
+ if ($user_language)
+ return $user_language;
}
- if ($user_language) {
- return $user_language;
- } else if (!empty($httplang)) {
- $language = client_prefered_language($httplang);
- if ($language) {
- return $language;
- }
- } else {
- return common_config('site', 'language');
- }
+ // Otherwise, find the best match for the languages requested by the
+ // user's browser...
+ $httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL;
+ if (!empty($httplang)) {
+ $language = client_prefered_language($httplang);
+ if ($language)
+ return $language;
+ }
+
+ // Finally, if none of the above worked, use the site's default...
+ return common_config('site', 'language');
}
# salted, hashed passwords are stored in the DB