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

Ticket 2329 followup: my clever 'let it use the default' was foiled by PHP gettext module not quite exposing a compatible interface as the backend gettext library. (Most funcs squash null domain parameter into '' empty string, which isn't interpreted as 'use the current default'.)

Browse Source
This commit is contained in:
Brion Vibber 2010-05-28 16:03:09 -07:00
parent 429219f9ec
commit f4539b52ad
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/language.php
View File

@ -61,7 +61,7 @@ if (!function_exists('dpgettext')) {
* Not currently exposed in PHP's gettext module; implemented to be compat * Not currently exposed in PHP's gettext module; implemented to be compat
* with gettext.h's macros. * with gettext.h's macros.
* *
* @param string $domain domain identifier, or null for default domain * @param string $domain domain identifier
* @param string $context context identifier, should be some key like "menu|file" * @param string $context context identifier, should be some key like "menu|file"
* @param string $msgid English source text * @param string $msgid English source text
* @return string original or translated message * @return string original or translated message
@ -106,7 +106,7 @@ if (!function_exists('dnpgettext')) {
* Not currently exposed in PHP's gettext module; implemented to be compat * Not currently exposed in PHP's gettext module; implemented to be compat
* with gettext.h's macros. * with gettext.h's macros.
* *
* @param string $domain domain identifier, or null for default domain * @param string $domain domain identifier
* @param string $context context identifier, should be some key like "menu|file" * @param string $context context identifier, should be some key like "menu|file"
* @param string $msg singular English source text * @param string $msg singular English source text
* @param string $plural plural English source text * @param string $plural plural English source text
@ -180,7 +180,11 @@ function _m($msg/*, ...*/)
} }
/** /**
* Looks for which plugin we've been called from to set the gettext domain. * Looks for which plugin we've been called from to set the gettext domain;
* if not in a plugin subdirectory, we'll use the default 'statusnet'.
*
* Note: we can't return null for default domain since most of the PHP gettext
* wrapper functions turn null into "" before passing to the backend library.
* *
* @param array $backtrace debug_backtrace() output * @param array $backtrace debug_backtrace() output
* @return string * @return string
@ -207,8 +211,8 @@ function _mdomain($backtrace)
} }
$plug = strpos($path, '/plugins/'); $plug = strpos($path, '/plugins/');
if ($plug === false) { if ($plug === false) {
// We're not in a plugin; return null for the default domain. // We're not in a plugin; return default domain.
return null; return 'statusnet';
} else { } else {
$cut = $plug + 9; $cut = $plug + 9;
$cut2 = strpos($path, '/', $cut); $cut2 = strpos($path, '/', $cut);
@ -217,7 +221,7 @@ function _mdomain($backtrace)
} else { } else {
// We might be running directly from the plugins dir? // We might be running directly from the plugins dir?
// If so, there's no place to store locale info. // If so, there's no place to store locale info.
return null; return 'statusnet';
} }
} }
} }