From 246f6fdf4085f00d8d5c18044d0df29f49e0cbdc Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 6 Jan 2021 10:09:10 +0100 Subject: [PATCH] stats: l10n everything and use existing keys as much as possible --- admin/stats.php | 6 +++++- admin/themes/default/js/stats.js | 4 ++-- admin/themes/default/template/stats.tpl | 9 +++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/admin/stats.php b/admin/stats.php index 47625c7df..bf64ac035 100644 --- a/admin/stats.php +++ b/admin/stats.php @@ -381,6 +381,8 @@ if (count(get_last(60, 'year')) > 1 ) ); } +ksort($lang['month']); + $template->assign(array( 'compareYears' => get_month_of_last_years($conf['stat_compare_year_displayed']), 'monthStats' => get_month_stats(), @@ -388,7 +390,9 @@ $template->assign(array( 'lastDays' => $last_days, 'lastMonths' => $last_months, 'lastYears' => $last_years, - 'langCode' => strval($user['language']) + 'langCode' => strval($user['language']), + 'month_labels' => join('~', $lang['month']), + 'ADMIN_PAGE_TITLE' => l10n('History'), )); $template->assign_var_from_handle('ADMIN_CONTENT', 'stats'); diff --git a/admin/themes/default/js/stats.js b/admin/themes/default/js/stats.js index c5d4f4a15..a63807a7f 100644 --- a/admin/themes/default/js/stats.js +++ b/admin/themes/default/js/stats.js @@ -116,7 +116,7 @@ function changeData(dataType, options = displayOptions) { yAxes: [{ scaleLabel: { display: true, - labelString: 'Page visited' + labelString: str_number_page_visited }, tick: { min: 0 @@ -142,7 +142,7 @@ function changeData(dataType, options = displayOptions) { yAxes: [{ scaleLabel: { display: true, - labelString: 'Page visited' + labelString: str_number_page_visited } }] } diff --git a/admin/themes/default/template/stats.tpl b/admin/themes/default/template/stats.tpl index d97e5fe5a..b0d896d0d 100644 --- a/admin/themes/default/template/stats.tpl +++ b/admin/themes/default/template/stats.tpl @@ -11,8 +11,9 @@ var str_unit_format = { "day":"dddd", "month":"MMM YYYY" } -var str_avg = "{'Average last 12 months'|@translate}" -var str_months = ["{'January'|@translate}", "{'February'|@translate}", "{'March'|@translate}", "{'April'|@translate}", "{'May'|@translate}", "{'June'|@translate}", "{'July'|@translate}", "{'August'|@translate}", "{'September'|@translate}", "{'Octobember'|@translate}", "{'November'|@translate}", "{'December'|@translate}"]; +var str_avg = "{'Average last 12 months'|@translate}"; +var str_months_tosplit = "{$month_labels}"; +var str_months = str_months_tosplit.split('~'); moment.locale("{$langCode}"); {/footer_script} @@ -23,10 +24,6 @@ moment.locale("{$langCode}"); {combine_script id='stats' load='footer' path='admin/themes/default/js/stats.js'} -
-

{'History'|@translate}

-
-