aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-13 17:18:42 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-13 17:18:42 +0200
commitc36773674ec0e918ca7d56dcee7ee461e7d45e98 (patch)
tree4b571c9d732737ebdaf52242cf93262720e579ec /view/js
parentcf277261dce699f89c75c198d1db4d30d6bf02b1 (diff)
downloadvolse-hubzilla-c36773674ec0e918ca7d56dcee7ee461e7d45e98.tar.gz
volse-hubzilla-c36773674ec0e918ca7d56dcee7ee461e7d45e98.tar.bz2
volse-hubzilla-c36773674ec0e918ca7d56dcee7ee461e7d45e98.zip
Revert "Merge branch 'patch-11' into 'dev'"
This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849.
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js41
1 files changed, 19 insertions, 22 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();