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/language.php | |
parent | 004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (diff) | |
parent | b17fc0ca5b90d2cdc957ebc4870fbd2791b9e1b9 (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'lib/language.php')
-rw-r--r-- | lib/language.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/language.php b/lib/language.php index 1805707ad..d93e4e0ad 100644 --- a/lib/language.php +++ b/lib/language.php @@ -213,16 +213,16 @@ function _mdomain($backtrace) $plug = strpos($path, '/plugins/'); if ($plug === false) { // We're not in a plugin; return default domain. - return 'statusnet'; + $final = 'statusnet'; } else { $cut = $plug + 9; $cut2 = strpos($path, '/', $cut); if ($cut2) { - $cached[$path] = substr($path, $cut, $cut2 - $cut); + $final = substr($path, $cut, $cut2 - $cut); } else { // We might be running directly from the plugins dir? // If so, there's no place to store locale info. - return 'statusnet'; + $final = 'statusnet'; } } $cached[$path] = $final; @@ -307,6 +307,7 @@ function get_all_languages() { 'br' => array('q' => 0.8, 'lang' => 'br', 'name' => 'Breton', 'direction' => 'ltr'), 'ca' => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'), 'cs' => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'), + 'da' => array('q' => 0.8, 'lang' => 'da', 'name' => 'Danish', 'direction' => 'ltr'), 'de' => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'), 'el' => array('q' => 0.1, 'lang' => 'el', 'name' => 'Greek', 'direction' => 'ltr'), 'en-us' => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'), |