GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up.

Browse Source
This commit is contained in:
Brion Vibber 2009-11-25 11:20:41 -08:00
parent affffdf808
commit 4ef515973a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/util.php
View File

@ -58,18 +58,17 @@ function common_init_language()
// (say, ga_ES for Galego/Galician) it seems to take it. // (say, ga_ES for Galego/Galician) it seems to take it.
common_init_locale("en_US"); 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(); $language = common_language();
$locale_set = common_init_locale($language); $locale_set = common_init_locale($language);
setlocale(LC_CTYPE, 'C'); setlocale(LC_CTYPE, 'C');
// So we do not have to make people install the gettext locales // So we do not have to make people install the gettext locales
$path = common_config('site','locale_path'); $path = common_config('site','locale_path');
bindtextdomain("statusnet", $path); bindtextdomain("statusnet", $path);
bind_textdomain_codeset("statusnet", "UTF-8"); bind_textdomain_codeset("statusnet", "UTF-8");
textdomain("statusnet"); 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() function common_timezone()