From 8f2681e0de5fe68120004b4bf8641e8ee1163151 Mon Sep 17 00:00:00 2001 From: anuko Date: Tue, 31 Oct 2017 02:09:55 +0000 Subject: [PATCH] Work in progress refactoring dropdown option translations for intervals like today and yesterday. --- WEB-INF/resources/ca.lang.php | 20 ++++++++++++-------- WEB-INF/resources/da.lang.php | 21 +++++++++++++-------- WEB-INF/resources/de.lang.php | 22 +++++++++++++++------- WEB-INF/resources/en.lang.php | 20 ++++++++++++-------- WEB-INF/resources/es.lang.php | 26 ++++++++++++++++---------- WEB-INF/resources/fa.lang.php | 24 ++++++++++++++++-------- WEB-INF/resources/fi.lang.php | 20 +++++++++++++------- WEB-INF/resources/fr.lang.php | 20 +++++++++++++------- WEB-INF/resources/ru.lang.php | 19 ++++++++++++------- WEB-INF/templates/footer.tpl | 2 +- charts.php | 8 ++++---- reports.php | 12 ++++++------ 12 files changed, 133 insertions(+), 81 deletions(-) diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index c35961a1..b3648dc7 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -291,14 +291,18 @@ $i18n_key_words = array( // TODO: translate the following. // 'dropdown.all' => '--- all ---', // 'dropdown.no' => '--- no ---', -// NOTE TO TRANSLATORS: dropdown.this_day does not necessarily means "today". It means a specific ("this") day selected on calendar. See Charts. -// 'dropdown.this_day' => 'this day', -// 'dropdown.last_day' => 'last day', -// 'dropdown.this_week' => 'this week', -// 'dropdown.last_week' => 'last week', -// 'dropdown.this_month' => 'this month', -// 'dropdown.last_month' => 'last month', -// 'dropdown.this_year' => 'this year', +// 'dropdown.current_day' => 'today', +// 'dropdown.previous_day' => 'yesterday', +// 'dropdown.selected_day' => 'day', +// 'dropdown.current_week' => 'this week', +// 'dropdown.previous_week' => 'previous week', +// 'dropdown.selected_week' => 'week', +// 'dropdown.current_month' => 'this month', +// 'dropdown.previous_month' => 'previous month', +// 'dropdown.selected_month' => 'month', +// 'dropdown.current_year' => 'this year', +// 'dropdown.previous_year' => 'previous year', +// 'dropdown.selected_year' => 'year', // 'dropdown.all_time' => 'all time', // 'dropdown.projects' => 'projects', // 'dropdown.tasks' => 'tasks', diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index a74d98a0..489c4ad0 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -270,15 +270,20 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- Alle ---', 'dropdown.no' => '--- Ingen ---', -// NOTE TO TRANSLATORS: dropdown.this_day does not necessarily means "today". It means a specific ("this") day selected on calendar. See Charts. -'dropdown.this_day' => 'Denne dag', // TODO: translate the following. -// 'dropdown.last_day' => 'last day', -'dropdown.this_week' => 'Denne uge', -'dropdown.last_week' => 'Sidste uge', -'dropdown.this_month' => 'Denne måned', -'dropdown.last_month' => 'Sidste måned', -'dropdown.this_year' => 'Dette år', +// 'dropdown.current_day' => 'today', +// 'dropdown.previous_day' => 'yesterday', +'dropdown.selected_day' => 'dag', +'dropdown.current_week' => 'Denne uge', +'dropdown.previous_week' => 'Sidste uge', +'dropdown.selected_week' => 'uge', +'dropdown.current_month' => 'Denne måned', +'dropdown.previous_month' => 'Sidste måned', +'dropdown.selected_month' => 'måned', +'dropdown.current_year' => 'Dette år', +// TODO: translate the following. +// 'dropdown.previous_year' => 'previous year', +'dropdown.selected_year' => 'år', 'dropdown.all_time' => 'Alt', 'dropdown.projects' => 'Projekter', 'dropdown.tasks' => 'Opgaver', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 6aa1b745..399f5f56 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -261,14 +261,22 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- alle ---', 'dropdown.no' => '--- nein ---', -'dropdown.this_day' => 'aktueller Tag', // TODO: translate the following. -// 'dropdown.last_day' => 'last day', -'dropdown.this_week' => 'aktuelle Woche', -'dropdown.last_week' => 'vorherige Woche', -'dropdown.this_month' => 'aktueller Monat', -'dropdown.last_month' => 'vorheriger Monat', -'dropdown.this_year' => 'aktuelles Jahr', +// 'dropdown.current_day' => 'today', +// 'dropdown.previous_day' => 'yesterday', +'dropdown.selected_day' => 'Tag', +// TODO: translate the following. +// 'dropdown.current_week' => 'this week', +'dropdown.previous_week' => 'vorherige Woche', +'dropdown.selected_week' => 'Woche', +// TODO: translate the following. +// 'dropdown.current_month' => 'this month', +'dropdown.previous_month' => 'vorheriger Monat', +'dropdown.selected_month' => 'Monat', +// TODO: translate the following. +// 'dropdown.current_year' => 'this year', +// 'dropdown.previous_year' => 'previous year', +'dropdown.selected_year' => 'Jahr', 'dropdown.all_time' => 'Gesamtzeitraum', 'dropdown.projects' => 'Projekte', 'dropdown.tasks' => 'Aufgaben', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index c06ae761..30682198 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -271,14 +271,18 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- all ---', 'dropdown.no' => '--- no ---', -// NOTE TO TRANSLATORS: dropdown.this_day does not necessarily means "today". It means a specific ("this") day selected on calendar. See Charts. -'dropdown.this_day' => 'this day', -'dropdown.last_day' => 'last day', -'dropdown.this_week' => 'this week', -'dropdown.last_week' => 'last week', -'dropdown.this_month' => 'this month', -'dropdown.last_month' => 'last month', -'dropdown.this_year' => 'this year', +'dropdown.current_day' => 'today', +'dropdown.previous_day' => 'yesterday', +'dropdown.selected_day' => 'day', +'dropdown.current_week' => 'this week', +'dropdown.previous_week' => 'previous week', +'dropdown.selected_week' => 'week', +'dropdown.current_month' => 'this month', +'dropdown.previous_month' => 'previous month', +'dropdown.selected_month' => 'month', +'dropdown.current_year' => 'this year', +'dropdown.previous_year' => 'previous year', +'dropdown.selected_year' => 'year', 'dropdown.all_time' => 'all time', 'dropdown.projects' => 'projects', 'dropdown.tasks' => 'tasks', diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index 8b4b5c5e..45fbe779 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -311,16 +311,22 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- todos ---', 'dropdown.no' => '--- no ---', -// TODO: translate dropdown.this_day -// 'dropdown.this_day' => 'this day', -// 'dropdown.last_day' => 'last day', -'dropdown.this_week' => 'esta semana', -// TODO: translate dropdown.last_week. -// 'dropdown.last_week' => 'last week', -'dropdown.this_month' => 'este mes', -'dropdown.last_month' => 'el mes pasado', -// TODO: translate dropdown.this_year and dropdown.all_time. -// 'dropdown.this_year' => 'this year', +// TODO: translate the following. +// 'dropdown.current_day' => 'today', +// 'dropdown.previous_day' => 'yesterday', +'dropdown.selected_day' => 'dia', +'dropdown.current_week' => 'esta semana', +// TODO: translate the following. +// 'dropdown.previous_week' => 'previous week', +'dropdown.selected_week' => 'semana', +'dropdown.current_month' => 'este mes', +'dropdown.previous_month' => 'el mes pasado', +'dropdown.selected_month' => 'mes', +// TODO: translate the following. +// 'dropdown.current_year' => 'this year', +// 'dropdown.previous_year' => 'previous year', +'dropdown.selected_year' => 'año', +// TODO: translate the following. // 'dropdown.all_time' => 'all time', 'dropdown.projects' => 'proyectos', // TODO: translate the following strings. diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index e115476b..050d086e 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -283,14 +283,22 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- همه ---', 'dropdown.no' => '--- هیچکدام ---', -// TODO: check translation of dropdown.this_day. It does not necessarily means "today". It means a specific ("this") day selected on calendar. See charts.php. -// 'dropdown.this_day' => 'امروز', -// 'dropdown.last_day' => 'last day', -'dropdown.this_week' => 'هفته جاری', -'dropdown.last_week' => 'هفته آخر', -'dropdown.this_month' => 'ماه جاری', -'dropdown.last_month' => 'ماه آخر', -'dropdown.this_year' => 'سال جاری', +// TODO: translate the following. +// 'dropdown.current_day' => 'today', +// 'dropdown.previous_day' => 'yesterday', +// 'dropdown.selected_day' => 'day', +'dropdown.current_week' => 'هفته جاری', +'dropdown.previous_week' => 'هفته آخر', +// TODO: translate the following. +// 'dropdown.selected_week' => 'week', +'dropdown.current_month' => 'ماه جاری', +'dropdown.previous_month' => 'ماه آخر', +// TODO: translate the following. +// 'dropdown.selected_month' => 'month', +'dropdown.current_year' => 'سال جاری', +// TODO: translate the following. +// 'dropdown.previous_year' => 'previous year', +// 'dropdown.selected_year' => 'year', 'dropdown.all_time' => 'همه زمان ها', 'dropdown.projects' => 'پروژه ها', 'dropdown.tasks' => 'وظایف', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index 71a2efa0..31dba324 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -265,14 +265,20 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- kaikki ---', 'dropdown.no' => '--- ei ---', -'dropdown.this_day' => 'tämä päivä', // TODO: translate the following. -// 'dropdown.last_day' => 'last day', -'dropdown.this_week' => 'tämä viikko', -'dropdown.last_week' => 'viime viikko', -'dropdown.this_month' => 'tämä kuu', -'dropdown.last_month' => 'viime kuu', -'dropdown.this_year' => 'tämä vuosi', +// 'dropdown.current_day' => 'today', +// 'dropdown.previous_day' => 'yesterday', +'dropdown.selected_day' => 'päivä', +'dropdown.current_week' => 'tämä viikko', +'dropdown.previous_week' => 'viime viikko', +'dropdown.selected_week' => 'viikko', +'dropdown.current_month' => 'tämä kuu', +'dropdown.previous_month' => 'viime kuu', +'dropdown.selected_month' => 'kuu', +'dropdown.current_year' => 'tämä vuosi', +// TODO: translate the following. +// 'dropdown.previous_year' => 'previous year', +'dropdown.selected_year' => 'vuosi', 'dropdown.all_time' => 'kaikki tunnit', 'dropdown.projects' => 'projektit', 'dropdown.tasks' => 'tehtävät', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index f462ceae..a7937556 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -259,13 +259,19 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- tous ---', 'dropdown.no' => '--- aucun ---', -'dropdown.this_day' => 'ce jour', -'dropdown.last_day' => 'dernier jour', -'dropdown.this_week' => 'cette semaine', -'dropdown.last_week' => 'la semaine passée', -'dropdown.this_month' => 'ce mois', -'dropdown.last_month' => 'le mois passé', -'dropdown.this_year' => 'cette année', +'dropdown.current_day' => 'aujourd\\\'hui', +'dropdown.previous_day' => 'hier', +'dropdown.selected_day' => 'jour', +'dropdown.current_week' => 'semaine en cours', +'dropdown.previous_week' => 'la semaine dernière', +'dropdown.selected_week' => 'semaine', +'dropdown.current_month' => 'mois en cours', +'dropdown.previous_month' => 'le mois dernier', +'dropdown.selected_month' => 'mois', +'dropdown.current_year' => 'année en cours', +// TODO: translate the following. +// 'dropdown.previous_year' => 'previous year', +'dropdown.selected_year' => 'année', 'dropdown.all_time' => 'depuis toujours', 'dropdown.projects' => 'Projets', 'dropdown.tasks' => 'Tâches', diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 74b68f8f..bbc5f8bd 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -269,13 +269,18 @@ $i18n_key_words = array( // Strings that are used in a single form must go to the specific form section. 'dropdown.all' => '--- все ---', 'dropdown.no' => '--- нет ---', -'dropdown.this_day' => 'этот день', -'dropdown.last_day' => 'прошлый день', -'dropdown.this_week' => 'эта неделя', -'dropdown.last_week' => 'прошлая неделя', -'dropdown.this_month' => 'этот месяц', -'dropdown.last_month' => 'прошлый месяц', -'dropdown.this_year' => 'этот год', +'dropdown.current_day' => 'сегодня', +'dropdown.previous_day' => 'вчера', +'dropdown.selected_day' => 'день', +'dropdown.current_week' => 'эта неделя', +'dropdown.previous_week' => 'прошлая неделя', +'dropdown.selected_week' => 'неделя', +'dropdown.current_month' => 'этот месяц', +'dropdown.previous_month' => 'прошлый месяц', +'dropdown.selected_month' => 'месяц', +'dropdown.current_year' => 'этот год', +'dropdown.previous_year' => 'прошлый год', +'dropdown.selected_year' => 'год', 'dropdown.all_time' => 'всё время', 'dropdown.projects' => 'проекты', 'dropdown.tasks' => 'задачи', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 0c1cff9f..735ea1c7 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.12.2.3676 | Copyright © Anuko | +  Anuko Time Tracker 1.12.2.3677 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/charts.php b/charts.php index 3ef76e52..985a1ae8 100644 --- a/charts.php +++ b/charts.php @@ -139,10 +139,10 @@ if ($user->canManageTeam()) { // Chart interval options. $intervals = array(); -$intervals[INTERVAL_THIS_DAY] = $i18n->getKey('dropdown.this_day'); -$intervals[INTERVAL_THIS_WEEK] = $i18n->getKey('dropdown.this_week'); -$intervals[INTERVAL_THIS_MONTH] = $i18n->getKey('dropdown.this_month'); -$intervals[INTERVAL_THIS_YEAR] = $i18n->getKey('dropdown.this_year'); +$intervals[INTERVAL_THIS_DAY] = $i18n->getKey('dropdown.selected_day'); +$intervals[INTERVAL_THIS_WEEK] = $i18n->getKey('dropdown.selected_week'); +$intervals[INTERVAL_THIS_MONTH] = $i18n->getKey('dropdown.selected_month'); +$intervals[INTERVAL_THIS_YEAR] = $i18n->getKey('dropdown.selected_year'); $intervals[INTERVAL_ALL_TIME] = $i18n->getKey('dropdown.all_time'); // Chart interval dropdown. diff --git a/reports.php b/reports.php index 9062abf8..1b91b231 100644 --- a/reports.php +++ b/reports.php @@ -161,12 +161,12 @@ if ($user->canManageTeam() || $user->isClient()) { $form->addInput(array('type'=>'combobox', 'name'=>'period', 'style'=>'width: 250px;', - 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.this_month'), - INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.last_month'), - INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.this_week'), - INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.last_week'), - INTERVAL_THIS_DAY=>$i18n->getKey('dropdown.this_day'), - INTERVAL_LAST_DAY=>$i18n->getKey('dropdown.last_day')), + 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.current_month'), + INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.previous_month'), + INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.current_week'), + INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.previous_week'), + INTERVAL_THIS_DAY=>$i18n->getKey('dropdown.current_day'), + INTERVAL_LAST_DAY=>$i18n->getKey('dropdown.previous_day')), 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); // Add controls for start and end dates. $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date')); -- 2.20.1