tobias/friendica
1
0
Fork 0
Code Pull requests Activity

finish up ability to switch languages without function collision

Browse source
This commit is contained in:
Friendika 2011-09-21 15:37:16 -07:00
parent c63adcfae0
commit 030e1e82c3
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.3.1110' ); define ( 'FRIENDIKA_VERSION', '2.3.1111' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1091 ); define ( 'DB_UPDATE_VERSION', 1091 );

13
include/pgettext.php
View file

@ -119,6 +119,8 @@ function tt($singular, $plural, $count){
if(x($a->strings,$singular)) { if(x($a->strings,$singular)) {
$t = $a->strings[$singular]; $t = $a->strings[$singular];
$f = 'string_plural_select_' . str_replace('-','_',$lang); $f = 'string_plural_select_' . str_replace('-','_',$lang);
if(! function_exists($f))
$f = 'string_plural_select_default';
$k = $f($count); $k = $f($count);
return is_array($t)?$t[$k]:$t; return is_array($t)?$t[$k]:$t;
} }
@ -128,4 +130,13 @@ function tt($singular, $plural, $count){
} else { } else {
return $singular; return $singular;
} }
}} }}
// provide a fallback which will not collide with
// a function defined in any language file
if(! function_exists('string_plural_select_default')) {
function string_plural_select_default($n) {
return ($n != 1);
}}