diff options
author | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
commit | 9f0715a9935966f3ec483bccc476d5baf3324b3c (patch) | |
tree | 9874247927e5e24044c75a48a9c04e427b0ba477 /lib/util.php | |
parent | 004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (diff) | |
parent | b17fc0ca5b90d2cdc957ebc4870fbd2791b9e1b9 (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/util.php b/lib/util.php index d8fb3b65e..8eff4e568 100644 --- a/lib/util.php +++ b/lib/util.php @@ -88,8 +88,8 @@ function common_init_language() // don't do the job. en_US.UTF-8 should be there most of the // time, but not guaranteed. $ok = common_init_locale("en_US"); - if (!$ok) { - // Try to find a complete, working locale... + if (!$ok && strtolower(substr(PHP_OS, 0, 3)) != 'win') { + // Try to find a complete, working locale on Unix/Linux... // @fixme shelling out feels awfully inefficient // but I don't think there's a more standard way. $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); } |