aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-21 15:37:16 -0700
committerFriendika <info@friendika.com>2011-09-21 15:37:16 -0700
commit030e1e82c32a3061abf71ffb90e65f2b9197d8a4 (patch)
treecb1764419691742ace43b6e5a4e47d0ee13fd76d
parentc63adcfae061809ce25217207f638b1e6c1d1bee (diff)
downloadvolse-hubzilla-030e1e82c32a3061abf71ffb90e65f2b9197d8a4.tar.gz
volse-hubzilla-030e1e82c32a3061abf71ffb90e65f2b9197d8a4.tar.bz2
volse-hubzilla-030e1e82c32a3061abf71ffb90e65f2b9197d8a4.zip
finish up ability to switch languages without function collision
-rw-r--r--boot.php2
-rw-r--r--include/pgettext.php13
2 files changed, 13 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 61384a427..d068122ed 100644
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.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 ( 'DB_UPDATE_VERSION', 1091 );
diff --git a/include/pgettext.php b/include/pgettext.php
index c7fc58698..83e76ba9d 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -119,6 +119,8 @@ function tt($singular, $plural, $count){
if(x($a->strings,$singular)) {
$t = $a->strings[$singular];
$f = 'string_plural_select_' . str_replace('-','_',$lang);
+ if(! function_exists($f))
+ $f = 'string_plural_select_default';
$k = $f($count);
return is_array($t)?$t[$k]:$t;
}
@@ -128,4 +130,13 @@ function tt($singular, $plural, $count){
} else {
return $singular;
}
-}} \ No newline at end of file
+}}
+
+// 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);
+}}
+