Commit 721461dd authored by Mario's avatar Mario

Merge branch 'patch-16' into 'dev'

JS plurals displaying code cleanup

See merge request !1338
parents 7042528d ce52c27a
......@@ -277,7 +277,7 @@ function ta($k){
function tf() {
$s = "plural_function_code";
return (x(App::$strings, $s) ? App::$strings[$s] : "return 0;");
return (x(App::$strings, $s) ? App::$strings[$s] : "0");
}
/**
......
......@@ -60,7 +60,7 @@ function po2php_run($argc,$argv) {
$out .= '}}'."\n";
$out .= 'App::$rtl = ' . intval($rtl) . ";\n" ;
$out .= 'App::$strings["plural_function_code"] = "return ' . str_replace("$", "", $cond) . ';"';
$out .= 'App::$strings["plural_function_code"] = "' . str_replace("$", "", $cond) . '"';
}
if ($k!="" && substr($l,0,7)=="msgstr "){
......
......@@ -44,7 +44,7 @@ $(document).ready(function() {
$(document).on('click', '.conversation-settings-link', getConversationSettings);
$(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
var tf = new Function('n', aStr['plural_func']);
var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
......@@ -53,19 +53,20 @@ $(document).ready(function() {
suffixFromNow : aStr['t04'],
seconds : aStr['t05'],
minute : aStr['t06'],
minutes : function(value){var str=aStr['t07'].split("/")[tf(value)]; return (str ? str : aStr['t07']);},
minutes : function(value){return tf(value, aStr['t07']);},
hour : aStr['t08'],
hours : function(value){var str=aStr['t09'].split("/")[tf(value)]; return (str ? str : aStr['t09']);},
hours : function(value){return tf(value, aStr['t09']);},
day : aStr['t10'],
days : function(value){var str=aStr['t11'].split("/")[tf(value)]; return (str ? str : aStr['t11']);},
days : function(value){return tf(value, aStr['t11']);},
month : aStr['t12'],
months : function(value){var str=aStr['t13'].split("/")[tf(value)]; return (str ? str : aStr['t13']);},
months : function(value){return tf(value, aStr['t13']);},
year : aStr['t14'],
years : function(value){var str=aStr['t15'].split("/")[tf(value)]; return (str ? str : aStr['t15']);},
years : function(value){return tf(value, aStr['t15']);},
wordSeparator : aStr['t16'],
numbers : aStr['t17'],
};
//mod_mail only
$(".mail-conv-detail .autotime").timeago();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment