From c36773674ec0e918ca7d56dcee7ee461e7d45e98 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 13 Oct 2018 17:18:42 +0200 Subject: Revert "Merge branch 'patch-11' into 'dev'" This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849. --- include/js_strings.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'include/js_strings.php') diff --git a/include/js_strings.php b/include/js_strings.php index 5ad7c072a..d9038e838 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -38,15 +38,6 @@ function js_strings() { // using the defaults set below if left untranslated, empty strings if // translated to "NONE" and the corresponding language strings // if translated to anything else - 'minutes' => tt('%d minutes', '%d minutes', '%d'), - 'hours' => tt('about %d hours', 'about %d hours', '%d'), - 'days' => tt('%d days', '%d days', '%d'), - 'months' => tt('%d months', '%d months', '%d'), - 'years' => tt('%d years', '%d years', '%d'), - - // get plural function code - 'plural_func' => tf(), - '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), @@ -55,15 +46,15 @@ function js_strings() { // translatable main strings for jquery.timeago '$t05' => t('less than a minute'), '$t06' => t('about a minute'), - '$t07' => ta('%d minutes'), + '$t07' => t('%d minutes'), '$t08' => t('about an hour'), - '$t09' => ta('about %d hours'), + '$t09' => t('about %d hours'), '$t10' => t('a day'), - '$t11' => ta('%d days'), + '$t11' => t('%d days'), '$t12' => t('about a month'), - '$t13' => ta('%d months'), + '$t13' => t('%d months'), '$t14' => t('about a year'), - '$t15' => ta('%d years'), + '$t15' => t('%d years'), '$t16' => t(' '), // wordSeparator '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), -- cgit v1.2.3