From eaee27c9e4f7a533fea8e2cda7a0b2c7230a5dfb Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 13 Oct 2018 18:16:56 +0000 Subject: Merge branch 'patch-14' into 'dev' Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 (cherry picked from commit a2575059e2a068a67cd984888422265c6888f261) 5c0d3187 Add date/time plurals translation in JavaScript 729d0d53 Update language.php f68674b3 Update js_strings.tpl 3ac4337a Update main.js e96e3dc6 Update po2php.php 54bdf59d Update js_strings.php --- util/po2php.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'util/po2php.php') diff --git a/util/po2php.php b/util/po2php.php index 50941c062..4aea1c943 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -58,8 +58,9 @@ function po2php_run($argc,$argv) { $out .= 'function string_plural_select_' . $lang . '($n){'."\n"; $out .= ' return '.$cond.';'."\n"; $out .= '}}'."\n"; - - $out .= 'App::$rtl = ' . intval($rtl) ; + + $out .= 'App::$rtl = ' . intval($rtl) . ";\n" ; + $out .= 'App::$strings["plural_function_code"] = "return ' . str_replace("$", "", $cond) . ';"'; } if ($k!="" && substr($l,0,7)=="msgstr "){ -- cgit v1.2.3