aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-13 17:21:12 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-13 17:21:12 +0200
commit2c961328f1898e080cf5053f74f8bb0f2f2369f7 (patch)
tree19ae66f4b7b6f41d267569f190d993a80da52b4c /view
parent54c615dbc28ffe3dbf02499cf08ee60f43c1d3af (diff)
parentc36773674ec0e918ca7d56dcee7ee461e7d45e98 (diff)
downloadvolse-hubzilla-2c961328f1898e080cf5053f74f8bb0f2f2369f7.tar.gz
volse-hubzilla-2c961328f1898e080cf5053f74f8bb0f2f2369f7.tar.bz2
volse-hubzilla-2c961328f1898e080cf5053f74f8bb0f2f2369f7.zip
Merge branch 'dev' into 3.8RC
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js41
-rwxr-xr-xview/tpl/js_strings.tpl2
2 files changed, 20 insertions, 23 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 3e81ba0e4..48277f5cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -44,28 +44,25 @@ $(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']);
-
- jQuery.timeago.settings.strings = {
- prefixAgo : aStr['t01'],
- prefixFromNow : aStr['t02'],
- suffixAgo : aStr['t03'],
- suffixFromNow : aStr['t04'],
- seconds : aStr['t05'],
- minute : aStr['t06'],
- minutes : function(value){return aStr['t07'].split("/")[tf(value)];},
- hour : aStr['t08'],
- hours : function(value){return aStr['t09'].split("/")[tf(value)];},
- day : aStr['t10'],
- days : function(value){return aStr['t11'].split("/")[tf(value)];},
- month : aStr['t12'],
- months : function(value){return aStr['t13'].split("/")[tf(value)];},
- year : aStr['t14'],
- years : function(value){return aStr['t15'].split("/")[tf(value)];},
- wordSeparator : aStr['t16'],
- numbers : aStr['t17'],
- };
-
+ jQuery.timeago.settings.strings = {
+ prefixAgo : aStr['t01'],
+ prefixFromNow : aStr['t02'],
+ suffixAgo : aStr['t03'],
+ suffixFromNow : aStr['t04'],
+ seconds : aStr['t05'],
+ minute : aStr['t06'],
+ minutes : aStr['t07'],
+ hour : aStr['t08'],
+ hours : aStr['t09'],
+ day : aStr['t10'],
+ days : aStr['t11'],
+ month : aStr['t12'],
+ months : aStr['t13'],
+ year : aStr['t14'],
+ years : aStr['t15'],
+ wordSeparator : aStr['t16'],
+ numbers : aStr['t17'],
+ };
//mod_mail only
$(".mail-conv-detail .autotime").timeago();
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index f7425ba98..01fc3f993 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -34,7 +34,7 @@
'name_ok1' : "{{$name_ok1}}",
'name_ok2' : "{{$name_ok2}}",
- 'plural_func' : "{{$plural_func}}",
+
't01' : "{{$t01}}",
't02' : "{{$t02}}",