diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/js_strings.php | 19 | ||||
| -rw-r--r-- | include/language.php | 28 |
2 files changed, 5 insertions, 42 deletions
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') : '[]'), diff --git a/include/language.php b/include/language.php index c56d5acda..69a7e3004 100644 --- a/include/language.php +++ b/include/language.php @@ -255,34 +255,6 @@ function tt($singular, $plural, $count, $ctx = ''){ } /** - * @brief Return slash separated string of plurals translation forms - * - * @param string $k key in translations array - * @return string - */ -function ta($k){ - - $t = App::$strings[$k]; - if (is_array($t)) - $t = implode("/", $t); - return ($t == "" ? $k : $t); -} - -/** - * @brief Return string_plural_select_xx function code - * - * @return string - */ -function tf() { - - $r = ""; - $lang = str_replace('-', '_', App::$language); - if(function_exists("string_plural_select_".$lang)) - $r = trim(shell_exec("sed -n '5p' view/".$lang."/hstrings.php | grep 'return' | tr -d '$'")); - return ($r != "" ? $r : "return 0;"); -} - -/** * @brief Provide a fallback which will not collide with a function defined in * any language file. * |