summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-25 19:22:37 +0000
committerZach Copley <zach@status.net>2009-11-25 19:22:37 +0000
commit88d41988679b6188095d20b8bbfdf016e3f2d605 (patch)
treec5c143411a985e71104b8a0c44ffcfd74997b667 /lib
parent40e875f9cc5ec0c17605adcef73205a49f422abd (diff)
parent4ef515973aae9640ad96d187ab7dcbcbb6081169 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/util.php b/lib/util.php
index 5bf4f6091..6946f60fe 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -58,18 +58,17 @@ function common_init_language()
// (say, ga_ES for Galego/Galician) it seems to take it.
common_init_locale("en_US");
+ // Note that this setlocale() call may "fail" but this is harmless;
+ // gettext will still select the right language.
$language = common_language();
$locale_set = common_init_locale($language);
+
setlocale(LC_CTYPE, 'C');
// So we do not have to make people install the gettext locales
$path = common_config('site','locale_path');
bindtextdomain("statusnet", $path);
bind_textdomain_codeset("statusnet", "UTF-8");
textdomain("statusnet");
-
- if(!$locale_set) {
- common_log(LOG_INFO, 'Language requested:' . $language . ' - locale could not be set. Perhaps that system locale is not installed.', __FILE__);
- }
}
function common_timezone()