Renamed Punch in mode to Punch mode.

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 60d08726aa83def1edc46a302c36130f888781ed..b340c7bc63627d12b9eb8e83fa12c00d401e2d4f 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -46,7 +46,7 @@ class ttUser {
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
-  var $punch_in_mode = 0;       // Whether punch in mode is enabled for user.
+  var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
@@ -117,7 +117,7 @@ class ttUser {
 
       // Set user config options.
       $this->show_holidays = in_array('show_holidays', $config_array);
-      $this->punch_in_mode = in_array('punch_in_mode', $config_array);
+      $this->punch_mode = in_array('punch_mode', $config_array);
       $this->allow_overlap = in_array('allow_overlap', $config_array);
       $this->future_entries = in_array('future_entries', $config_array);
       $this->uncompleted_indicators = in_array('uncompleted_indicators', $config_array);
@@ -174,8 +174,9 @@ define('ROLE_MANAGER', 324);     // Team manager. Can do everything for a team.
 define('ROLE_SITE_ADMIN', 1024); // Site administrator.
 */
 
-      // Adjust punch_in_mode for managers as they are allowed to overwrite start and end times.
-      if ($this->canManageTeam()) $this->punch_in_mode = 0;
+      // Adjust punch_mode for managers as they are allowed to overwrite start and end times.
+      // TODO: because of this we currently have a bug on the Team Profile page with "Punch mode" checkbox always off.
+      if ($this->canManageTeam()) $this->punch_mode = 0;
     }
   }
 

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ad08cfa8a67af39694416a42a5a886a474cfabc4..e3f9fa07953efb5e32a932ea9358da3cca891eac 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -485,7 +485,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index cd5abbbb302790cca68c385e3640ec23bc290613..ebbececc88662627113258836ff1ad439c25cc2e 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -500,7 +500,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 34c62b8aabfa12546f0b7040f8b61b0e9c6d5685..f3346ec24327f5d9dcd4f22c586f8244908e9378 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -433,7 +433,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'Start og slut',
 'form.profile.type_duration' => 'Varighed',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Uafsluttede indikatore',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 793507eb74c2ef07e5bda68199f5bb855e03c143..3df7b2a559ad4e82e0b1ded1e32f37456b5d3939 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -431,7 +431,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'Start und Ende',
 'form.profile.type_duration' => 'Dauer',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 618745f04f3d867e56a037c85df6cb446c9d5121..eec4c0982b137178b8fb6bea49bca595476ec936 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -426,7 +426,7 @@ $i18n_key_words = array(
 'form.profile.type_all' => 'all',
 'form.profile.type_start_finish' => 'start and finish',
 'form.profile.type_duration' => 'duration',
-'form.profile.punch_in_mode' => 'Punch in mode',
+'form.profile.punch_mode' => 'Punch mode',
 'form.profile.allow_overlap' => 'Allow overlap',
 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 51d69f50ce42f23e8980b4867b148c4cb0b13fd8..39ac200149aaf5f265c332dd0ccfbcaad8d11626 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -498,7 +498,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b12921a01f0c2f921a2497e2d13d38ff4f027f6d..3bfbe86014d18909552de992e6403de1aea0a201 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -496,7 +496,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a6ec5ff2b8762007a196f5d87379e90e960d9d7d..02846df91b175610b55908747320c75ae4c18025 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -462,7 +462,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'شروع و اتمام',
 'form.profile.type_duration' => 'مدت زمان',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 87958d5c8d97688fd1176ce4ad990820a606e824..ee24cd1ed7b09d02c88334180e1cb51c3453df26 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -440,7 +440,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'aloitus ja lopetus',
 'form.profile.type_duration' => 'kesto',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6898cbedf706e242aa2756a4a720b1a275280ea1..e48db54f89274c1e5f1ac9aabdbb4bcf82d5a3bf 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -430,7 +430,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'Début et fin',
 'form.profile.type_duration' => 'Durée',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ce8f1f33f39595c49f617ee39c8cce0e06c6ab4a..fb1e74a4ae25917943321a14307d0c564df9a50d 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -467,7 +467,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'התחלה וסיום',
 'form.profile.type_duration' => 'משך זמן',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 81270f5c7aa0a1554e5c3bb77e947b8b31ce7bb8..935bc5f91ccbd8f1d4d4bf00e48915f7e8cd9e88 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -493,7 +493,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 83045b570cfc54453439b9c0e60223651b1a94a0..8e63198504ec46c2e8a0a44c7ed1dc5167f51109 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -432,7 +432,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'inizio e fine',
 'form.profile.type_duration' => 'durata',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Indicatori incompleti',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b0e2b1f59954d3a2fa7788d4d0ceb8c51eb2d7cc..c08d69c75186d84e0637f4215dc77642e8be8a61 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -485,7 +485,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c18aa17315d158dacca5b91a7e7da61e88fd7d35..3c8aa8ece43facb046fdbbb5a8c85113e3001b14 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -487,7 +487,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0ae1f1e7981d5f404a5220ed772cad2b15bacaf4..4ca682384043488b118ede6a9741c47bc25ee3c1 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -429,7 +429,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'begin en einde',
 'form.profile.type_duration' => 'duur',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Onvolledige indicatoren',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e533d70ae6b3c395a6e8cfd012967cd537bf8215..553cbf7f61f53a2c7b13946a5a228adbb77aeba8 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -483,7 +483,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index bb47e0df4fd7134e46c84ecae672005023d8246e..04c64fb62bde702fc813bd609d2fee4ccf56652a 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -443,7 +443,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'początek i koniec',
 'form.profile.type_duration' => 'czas trwania',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 702c820c16387aa4edfadd88356366d4b212ccbd..c1ec2b1173bb407e293ebae587b7e35a79a20d34 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -438,7 +438,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'início e fim',
 'form.profile.type_duration' => 'duração',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 65196bad8dc3bf3998d54cdb8b41aea896734aaa..63be90c21103a1ddad20a8ed850735d94db66064 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -476,7 +476,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 74035115ca954c6e72b1a28420b4b061877614eb..c7c6f99cdeb44aa975f9626871383526b88dfa94 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -493,7 +493,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index cff534030a63412b29be892a1385e1a8d0b72946..18e81a66ccd46edc2173d52afc024e951fd0a052 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -424,7 +424,7 @@ $i18n_key_words = array(
 'form.profile.type_all' => 'все',
 'form.profile.type_start_finish' => 'начало и конец',
 'form.profile.type_duration' => 'длительность',
-'form.profile.punch_in_mode' => 'Пробивать время',
+'form.profile.punch_mode' => 'Пробивать время',
 'form.profile.allow_overlap' => 'Возможное перекрывание',
 'form.profile.future_entries' => 'Будущие записи',
 'form.profile.uncompleted_indicators' => 'Индикаторы незавершения',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 9ed685340b4d2f5f153feb44357b9ab10d772dc0..f0ae26cca173fc1a335dd490824cf0dcf147419a 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -459,7 +459,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'začiatok a koniec',
 'form.profile.type_duration' => 'trvanie',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ac649271794dcae8c1f558d1dcd2f111d5d1e6f7..69fac855064d708f3586c41949eb842a6f4914ab 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -472,7 +472,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c4c16e561f39300e0d27f946538adb35088bec48..4fa1a325beb414fd661c6d06096a2e2724ae6d99 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -441,7 +441,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'početak i kraj',
 'form.profile.type_duration' => 'trajanje',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b9f92583cb86cefb11f483fe6315f103ca73732b..92664c5312e3d4429b1298905b5a221fdc126cbc 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -438,7 +438,7 @@ $i18n_key_words = array(
 'form.profile.type_start_finish' => 'Starttid och sluttid',
 'form.profile.type_duration' => 'Varaktighet',
 // TODO: translate the following.
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index ddadaa5ad399f0a3228c6254c2df1278f504663f..0897e2dfa741bd7307ad3effce039b8af153d05c 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -504,8 +504,8 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Allow overlap',
-// 'form.profile.allow_overlap' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
+// 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.profile.plugins' => 'Plugins',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 610c68c86fdc1ccad925a1414f9ddb11fd51a541..2b2e1ac28aeeefb1a595c93cfae3e06dde7a3426 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -472,7 +472,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5e38bf6279b771a7794b02d5efe46bfe2c5c09ae..b3286ab3ec72d70c552dda04037b66097cb9e2e2 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -482,7 +482,7 @@ $i18n_key_words = array(
 // 'form.profile.type_all' => 'all',
 // 'form.profile.type_start_finish' => 'start and finish',
 // 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_in_mode' => 'Punch in mode',
+// 'form.profile.punch_mode' => 'Punch mode',
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index df6a8da698d5123874482d8aef1a572d36f2ba81..58b3b77dc41565fdee44a71e375a99b782922a8c 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.23.4000 | 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.23.4001 | 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/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index ce4a6bf203c4b2b2e2e55e8c1f6f1ed78a997932..48511182cb69616ce814fa3d92ce5c08452e4141 100644 (file)
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -173,8 +173,8 @@ function handlePluginCheckboxes() {
             <td>{$forms.profileForm.record_type.control}</td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.punch_in_mode}:</td>
-            <td>{$forms.profileForm.punch_in_mode.control} <a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td align="right" nowrap>{$i18n.form.profile.punch_mode}:</td>
+            <td>{$forms.profileForm.punch_mode.control} <a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.profile.allow_overlap}:</td>

diff --git a/mobile/time.php b/mobile/time.php
index 0479f0cdbdd14060e4e19aa4d7a7368531385b92..9bb2a26d8653b5bf132d5487fcb0eab12248a1b8 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -155,7 +155,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_in_mode) {
+  if ($user->punch_mode) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 06ea90919e69b0a43cb75ce86d798e290565ec15..6861262bea9ed8f6348abc8c633207f37dca7734 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -175,7 +175,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_in_mode) {
+  if ($user->punch_mode) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);

diff --git a/profile_edit.php b/profile_edit.php
index e9afa970554547978673472c47d7d7dd4266f8a8..c4e325df3559f06ad770a8d51a91ddd605986c75 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -62,7 +62,7 @@ if ($request->isPost()) {
     $cl_project_required = $request->getParameter('project_required');
     $cl_task_required = $request->getParameter('task_required');
     $cl_record_type = $request->getParameter('record_type');
-    $cl_punch_in_mode = $request->getParameter('punch_in_mode');
+    $cl_punch_mode = $request->getParameter('punch_mode');
     $cl_allow_overlap = $request->getParameter('allow_overlap');
     $cl_future_entries = $request->getParameter('future_entries');
     $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
@@ -99,7 +99,7 @@ if ($request->isPost()) {
     $cl_project_required = $user->project_required;
     $cl_task_required = $user->task_required;
     $cl_record_type = $user->record_type;
-    $cl_punch_in_mode = $user->punch_in_mode;
+    $cl_punch_mode = $user->punch_mode;
     $cl_allow_overlap = $user->allow_overlap;
     $cl_future_entries = $user->future_entries;
     $cl_uncompleted_indicators = $user->uncompleted_indicators;
@@ -195,8 +195,8 @@ if ($user->canManageTeam()) {
   $record_type_options[TYPE_DURATION] = $i18n->getKey('form.profile.type_duration');
   $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
-  // Punch in mode checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'punch_in_mode','value'=>$cl_punch_in_mode));
+  // Punch mode checkbox.
+  $form->addInput(array('type'=>'checkbox','name'=>'punch_mode','value'=>$cl_punch_mode));
 
   // Allow overlap checkbox.
   $form->addInput(array('type'=>'checkbox','name'=>'allow_overlap','value'=>$cl_allow_overlap));
@@ -298,8 +298,8 @@ if ($request->isPost()) {
       // Prepare config string.
       if ($cl_show_holidays)
         $config .= ',show_holidays';
-      if ($cl_punch_in_mode)
-        $config .= ',punch_in_mode';
+      if ($cl_punch_mode)
+        $config .= ',punch_mode';
       if ($cl_allow_overlap)
         $config .= ',allow_overlap';
       if ($cl_future_entries)

diff --git a/time.php b/time.php
index 39bac8015fe360993806a5a39b9a5ce593dd1683..f7bd3d3dd61c9639788873066a45138f2f7fe032 100644 (file)
--- a/time.php
+++ b/time.php
@@ -187,7 +187,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_in_mode) {
+  if ($user->punch_mode) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);

diff --git a/time_edit.php b/time_edit.php
index 5f135e45a6b5e465870158e5728f10f42fa2afb9..1a358ed78d4874467d835f3c84b7cfb262ea20aa 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -178,7 +178,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_in_mode) {
+  if ($user->punch_mode) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);