From a32d1441bb4b6e2cf58467f14c20f67ef0cf50c7 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 29 Jan 2018 20:01:25 +0000 Subject: [PATCH] Some refactoring of labels in translation files. --- WEB-INF/resources/ja.lang.php | 16 +++++++++------- WEB-INF/resources/ko.lang.php | 16 +++++++++------- WEB-INF/resources/no.lang.php | 16 +++++++++------- WEB-INF/resources/pt.lang.php | 14 ++++++++------ WEB-INF/resources/ro.lang.php | 16 +++++++++------- WEB-INF/resources/sl.lang.php | 14 ++++++++------ WEB-INF/resources/tr.lang.php | 16 +++++++++------- WEB-INF/resources/zh-cn.lang.php | 9 +++++---- WEB-INF/resources/zh-tw.lang.php | 16 +++++++++------- WEB-INF/templates/footer.tpl | 2 +- plugins/MonthlyQuota.class.php | 3 ++- 11 files changed, 78 insertions(+), 60 deletions(-) diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index cd789eed..0b7bef4b 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -140,17 +140,19 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +'label.currency' => '通貨', +// TODO: translate the following. +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name -// 'label.team_name' => 'team name', -'label.currency' => '通貨', -// TODO: translate label.manager_name and label.manager_login. -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => 'パスワード', 'label.confirm_password' => 'パスワードの確認', 'label.email' => 'Eメール', diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index c66ea993..a48161da 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -140,17 +140,19 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +'label.currency' => '화폐', +// TODO: translate the following. +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name -// 'label.team_name' => 'team name', -'label.currency' => '화폐', -// TODO: translate label.manager_name and label.manager_login. -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => '암호', 'label.confirm_password' => '암호 확인', 'label.email' => '이메일', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index e5c732e7..222256c9 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -139,17 +139,19 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +'label.currency' => 'Valuta', +// TODO: translate the following. +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// Labels for controls on forms. Labels in this section are used on multiple forms. -// TODO: translate label.team_name -// 'label.team_name' => 'Team name', -'label.currency' => 'Valuta', -// TODO: translate these strings. -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', // 'label.person_name' => 'Name', // 'label.thing_name' => 'Name', 'label.password' => 'Passord', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index caef942c..77e56153 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -134,16 +134,18 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +// 'label.currency' => 'Currency', +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name and strings below. -// 'label.team_name' => 'team name', -// 'label.currency' => 'currency', -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => 'senha', 'label.confirm_password' => 'confirme a senha', // 'label.email' => 'Email', diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 7379697e..372ee238 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -142,17 +142,19 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +'label.currency' => 'Moneda', +// TODO: translate the following. +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name -// 'label.team_name' => 'team name', -'label.currency' => 'moneda', -// TODO: translate label.manager_name and label.manager_login. -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => 'parola', 'label.confirm_password' => 'confirma parola', 'label.email' => 'E-mail', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index 5d1db85a..35bb1c0f 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -135,16 +135,18 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +// 'label.currency' => 'Currency', +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name and the strings below. -// 'label.team_name' => 'team name', -// 'label.currency' => 'currency', -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => 'geslo', // 'label.confirm_password' => 'confirm password', 'label.email' => 'Email', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 4e5a23d7..cef0c9c4 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -146,17 +146,19 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +'label.currency' => 'Para birimi', +// TODO: translate the following. +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name -// 'label.team_name' => 'team name', -'label.currency' => 'para birimi', -// TODO: translate label.manager_name and label.manager_login. -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => 'parola', 'label.confirm_password' => 'parolayı tekrala', 'label.email' => 'E-posta', diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index 575299c4..cf6fe725 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -129,10 +129,6 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', - - -// TODO: refactoring ongoing down from here. - // Labels for controls on forms. Labels in this section are used on multiple forms. 'label.team_name' => '团队名称', // TODO: translate the following. @@ -140,6 +136,11 @@ $i18n_key_words = array( 'label.currency' => '货币', 'label.manager_name' => '管理员姓名', 'label.manager_login' => '管理员登录', + + + +// TODO: refactoring ongoing down from here. + // TODO: translate the following. // 'label.person_name' => 'Name', // 'label.thing_name' => 'Name', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index 3bc8e44e..3f2600e8 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -137,17 +137,19 @@ $i18n_key_words = array( // 'button.close' => 'Close', // 'button.stop' => 'Stop', +// Labels for controls on forms. Labels in this section are used on multiple forms. +// TODO: translate the following. +// 'label.team_name' => 'Team name', +// 'label.address' => 'Address', +'label.currency' => '貨幣', +// TODO: translate the following. +// 'label.manager_name' => 'Manager name', +// 'label.manager_login' => 'Manager login', + // TODO: refactoring ongoing down from here. -// labels for controls on various forms -// TODO: translate label.team_name -// 'label.team_name' => 'team name', -'label.currency' => '貨幣', -// TODO: translate label.manager_name and label.manager_login. -// 'label.manager_name' => 'manager name', -// 'label.manager_login' => 'manager login', 'label.password' => '密碼', 'label.confirm_password' => '確認密碼', 'label.email' => '電子郵件', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 33aca876..fd35ce38 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.10.3835 | Copyright © Anuko | +  Anuko Time Tracker 1.17.10.3836 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php index 4b036796..6e420f91 100644 --- a/plugins/MonthlyQuota.class.php +++ b/plugins/MonthlyQuota.class.php @@ -80,7 +80,8 @@ class MonthlyQuota { // If we did not find a record, return a calculated monthly quota. $numWorkdays = $this->getNumWorkdays($month, $year); global $user; - return $numWorkdays * $user->workday_hours; + return $numWorkdays * $user->workday_hours; // TODO: fix a rounding issue for small values like 0:01 + // Possibly with a database field type change (minutes?). } // getMany - returns an array of quotas for a given year for team. -- 2.20.1