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

Ticket 2433: Skip locale fallback list check on Windows ('locale -a' shell-out doesn't work there)

Browse Source
This commit is contained in:
Brion Vibber 2010-07-12 09:56:32 -07:00
parent 43dd6cca63
commit 974c4df029
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/util.php
View File

@ -88,8 +88,8 @@ function common_init_language()
// don't do the job. en_US.UTF-8 should be there most of the // don't do the job. en_US.UTF-8 should be there most of the
// time, but not guaranteed. // time, but not guaranteed.
$ok = common_init_locale("en_US"); $ok = common_init_locale("en_US");
if (!$ok) { if (!$ok && strtolower(substr(PHP_OS, 0, 3)) != 'win') {
// Try to find a complete, working locale... // Try to find a complete, working locale on Unix/Linux...
// @fixme shelling out feels awfully inefficient // @fixme shelling out feels awfully inefficient
// but I don't think there's a more standard way. // but I don't think there's a more standard way.
$all = `locale -a`; $all = `locale -a`;
@ -101,9 +101,9 @@ function common_init_language()
} }
} }
} }
if (!$ok) { }
common_log(LOG_ERR, "Unable to find a UTF-8 locale on this system; UI translations may not work."); if (!$ok) {
} common_log(LOG_ERR, "Unable to find a UTF-8 locale on this system; UI translations may not work.");
} }
$locale_set = common_init_locale($language); $locale_set = common_init_locale($language);
} }