small update for __n() required due to version upgrade of PHP-Gettext…

… emulator
routenull0 · Mar 23, 2016 · 23bd9a8 · 23bd9a8
1 parent 641d147
commit 23bd9a8
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/include/global_languages.php b/include/global_languages.php
@@ -218,13 +218,15 @@ function __gettext($text, $domain = 'cacti') {
 		}else {
 			return $text;
 		}
-
 	}
 
-
-	function __n($single, $plural, $number, $domain = 'cacti') {
+	function __n($singular, $plural, $number, $domain = 'cacti'){
 		global $l10n;
-		return $l10n->_ngettext($single, $plural, $number);
+		if (isset($l10n[$domain])) {
+    		return $l10n[$domain]->ngettext($singular, $plural, $number);
+    	}else {
+			return ($number == 1) ? $singular : $plural;	
+		}
 	}
 
 
@@ -308,8 +310,8 @@ function __gettext($text, $domain = 'cacti') {
 		return $text;
 	}
 
-	function __n($single, $plural, $number, $domain = 'cacti') {
-		return ($number == 1) ? $single : $plural;
+	function __n($singular, $plural, $number, $domain = 'cacti') {
+		return ($number == 1) ? $singular : $plural;
 	}
 
 	function __() {