Some refactoring of labels in translation files.

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index cd789eedc6585aad7d49233c303b896ca6d80646..0b7bef4b1966cd6f0e70343ed0d1f0b34553b6c6 100644 (file)
--- 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 c66ea993d95b72f1be5b940a61304b2d925bb4b3..a48161da74fdd255379648d45112ff87e7e0d392 100644 (file)
--- 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 e5c732e741a3d5d1614cd4d9179ffe01f0303201..222256c9f0f7553df654e861cdbb094e91ee0342 100644 (file)
--- 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 caef942c9c61437b7869e97017b98889db3cb892..77e56153613a89f397d1eb4101b6cc9c05f8fee1 100644 (file)
--- 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 7379697e3674876324a61f455c876dc455f9b10f..372ee23809e59b568c15bbb1a56cb29996289e8f 100644 (file)
--- 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 5d1db85a543d7bc6d025705fdf67e51701b69e4c..35bb1c0f512d09f1fc606ed7238870af9e3dac40 100644 (file)
--- 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 4e5a23d76eff73437a1cb091b95c3544fdd71f66..cef0c9c4037311898ff9174cc096603b55e7d0da 100644 (file)
--- 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 575299c45e0bba028b1eedfd75f52aa6ba0d5827..cf6fe72573f849ae5af86416965780e8d55d2c04 100644 (file)
--- 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 3bc8e44eb2be0a0a5efb9b3f0cc9f98b4b76746a..3f2600e8d311ca43c6e7e6d749c27f089679238d 100644 (file)
--- 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 33aca87673e9a903064607fd3faca8636e3524a8..fd35ce38fca6ed417248962a446fbe1be7299e8d 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.10.3835 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.10.3836 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 4b036796b634749d9b4e9f53f70e4d798f4e4807..6e420f91846734433820ba2a1d94261846401fbf 100644 (file)
--- 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.