Merge pull request #263 from yak1ex/messages_in_plural_form_in_js

Create message table entries for plural forms and lookup them in JS.

1 files changed, 9 insertions, 4 deletions

diff --git a/include/functions.php b/include/functions.php
index 1abaaf60f..3c1956ea2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -4270,16 +4270,21 @@
 		}
 
 		function ngettext(msg1, msg2, n) {
-			return (parseInt(n) > 1) ? msg2 : msg1;
+			return __((parseInt(n) > 1) ? msg2 : msg1);
 		}';
 
 		$l10n = _get_reader();
 
 		for ($i = 0; $i < $l10n->total; $i++) {
 			$orig = $l10n->get_original_string($i);
-			$translation = __($orig);
-
-			print T_js_decl($orig, $translation);
+			if(strpos($orig, "\000") !== FALSE) { // Plural forms
+				$key = explode(chr(0), $orig);
+				print T_js_decl($key[0], ngettext($key[0], $key[1], 1)); // Singular
+				print T_js_decl($key[1], ngettext($key[0], $key[1], 2)); // Plural
+			} else {
+				$translation = __($orig);
+				print T_js_decl($orig, $translation);
+			}
 		}
 	}