harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 3.8RC

Browse Source
This commit is contained in:
Mario Vavti 2018-10-13 17:21:12 +02:00
commit 2c961328f1
4 changed files with 25 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/js_strings.php
View File

@ -38,15 +38,6 @@ function js_strings() {
// using the defaults set below if left untranslated, empty strings if // using the defaults set below if left untranslated, empty strings if
// translated to "NONE" and the corresponding language strings // translated to "NONE" and the corresponding language strings
// if translated to anything else // 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'))), '$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'))), '$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'))), '$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 // translatable main strings for jquery.timeago
'$t05' => t('less than a minute'), '$t05' => t('less than a minute'),
'$t06' => t('about a minute'), '$t06' => t('about a minute'),
'$t07' => ta('%d minutes'), '$t07' => t('%d minutes'),
'$t08' => t('about an hour'), '$t08' => t('about an hour'),
'$t09' => ta('about %d hours'), '$t09' => t('about %d hours'),
'$t10' => t('a day'), '$t10' => t('a day'),
'$t11' => ta('%d days'), '$t11' => t('%d days'),
'$t12' => t('about a month'), '$t12' => t('about a month'),
'$t13' => ta('%d months'), '$t13' => t('%d months'),
'$t14' => t('about a year'), '$t14' => t('about a year'),
'$t15' => ta('%d years'), '$t15' => t('%d years'),
'$t16' => t(' '), // wordSeparator '$t16' => t(' '), // wordSeparator
'$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'),

28
include/language.php
View File

@ -254,34 +254,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 * @brief Provide a fallback which will not collide with a function defined in
* any language file. * any language file.

41
view/js/main.js
View File

@ -44,28 +44,25 @@ $(document).ready(function() {
$(document).on('click', '.conversation-settings-link', getConversationSettings); $(document).on('click', '.conversation-settings-link', getConversationSettings);
$(document).on('click', '#settings_module_ajax_submit', postConversationSettings); $(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
var tf = new Function('n', aStr['plural_func']); jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
jQuery.timeago.settings.strings = { prefixFromNow : aStr['t02'],
prefixAgo : aStr['t01'], suffixAgo : aStr['t03'],
prefixFromNow : aStr['t02'], suffixFromNow : aStr['t04'],
suffixAgo : aStr['t03'], seconds : aStr['t05'],
suffixFromNow : aStr['t04'], minute : aStr['t06'],
seconds : aStr['t05'], minutes : aStr['t07'],
minute : aStr['t06'], hour : aStr['t08'],
minutes : function(value){return aStr['t07'].split("/")[tf(value)];}, hours : aStr['t09'],
hour : aStr['t08'], day : aStr['t10'],
hours : function(value){return aStr['t09'].split("/")[tf(value)];}, days : aStr['t11'],
day : aStr['t10'], month : aStr['t12'],
days : function(value){return aStr['t11'].split("/")[tf(value)];}, months : aStr['t13'],
month : aStr['t12'], year : aStr['t14'],
months : function(value){return aStr['t13'].split("/")[tf(value)];}, years : aStr['t15'],
year : aStr['t14'], wordSeparator : aStr['t16'],
years : function(value){return aStr['t15'].split("/")[tf(value)];}, numbers : aStr['t17'],
wordSeparator : aStr['t16'], };
numbers : aStr['t17'],
};
//mod_mail only //mod_mail only
$(".mail-conv-detail .autotime").timeago(); $(".mail-conv-detail .autotime").timeago();

2
view/tpl/js_strings.tpl
View File

@ -34,7 +34,7 @@
'name_ok1' : "{{$name_ok1}}", 'name_ok1' : "{{$name_ok1}}",
'name_ok2' : "{{$name_ok2}}", 'name_ok2' : "{{$name_ok2}}",
'plural_func' : "{{$plural_func}}",
't01' : "{{$t01}}", 't01' : "{{$t01}}",
't02' : "{{$t02}}", 't02' : "{{$t02}}",