From 1525dcb2eb2094c83ac9762675d957c285762434 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sun, 18 Feb 2018 19:23:57 +0000 Subject: [PATCH] Renamed Punch in mode to Punch mode. --- WEB-INF/lib/ttUser.class.php | 9 +++++---- WEB-INF/resources/ca.lang.php | 2 +- WEB-INF/resources/cs.lang.php | 2 +- WEB-INF/resources/da.lang.php | 2 +- WEB-INF/resources/de.lang.php | 2 +- WEB-INF/resources/en.lang.php | 2 +- WEB-INF/resources/es.lang.php | 2 +- WEB-INF/resources/et.lang.php | 2 +- WEB-INF/resources/fa.lang.php | 2 +- WEB-INF/resources/fi.lang.php | 2 +- WEB-INF/resources/fr.lang.php | 2 +- WEB-INF/resources/he.lang.php | 2 +- WEB-INF/resources/hu.lang.php | 2 +- WEB-INF/resources/it.lang.php | 2 +- WEB-INF/resources/ja.lang.php | 2 +- WEB-INF/resources/ko.lang.php | 2 +- WEB-INF/resources/nl.lang.php | 2 +- WEB-INF/resources/no.lang.php | 2 +- WEB-INF/resources/pl.lang.php | 2 +- WEB-INF/resources/pt-br.lang.php | 2 +- WEB-INF/resources/pt.lang.php | 2 +- WEB-INF/resources/ro.lang.php | 2 +- WEB-INF/resources/ru.lang.php | 2 +- WEB-INF/resources/sk.lang.php | 2 +- WEB-INF/resources/sl.lang.php | 2 +- WEB-INF/resources/sr.lang.php | 2 +- WEB-INF/resources/sv.lang.php | 2 +- WEB-INF/resources/tr.lang.php | 4 ++-- WEB-INF/resources/zh-cn.lang.php | 2 +- WEB-INF/resources/zh-tw.lang.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/profile_edit.tpl | 4 ++-- mobile/time.php | 2 +- mobile/time_edit.php | 2 +- profile_edit.php | 12 ++++++------ time.php | 2 +- time_edit.php | 2 +- 37 files changed, 48 insertions(+), 47 deletions(-) diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 60d08726..b340c7bc 100644 --- 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 ad08cfa8..e3f9fa07 100644 --- 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 cd5abbbb..ebbececc 100644 --- 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 34c62b8a..f3346ec2 100644 --- 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 793507eb..3df7b2a5 100644 --- 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 618745f0..eec4c098 100644 --- 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 51d69f50..39ac2001 100644 --- 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 b12921a0..3bfbe860 100644 --- 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 a6ec5ff2..02846df9 100644 --- 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 87958d5c..ee24cd1e 100644 --- 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 6898cbed..e48db54f 100644 --- 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 ce8f1f33..fb1e74a4 100644 --- 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 81270f5c..935bc5f9 100644 --- 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 83045b57..8e631985 100644 --- 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 b0e2b1f5..c08d69c7 100644 --- 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 c18aa173..3c8aa8ec 100644 --- 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 0ae1f1e7..4ca68238 100644 --- 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 e533d70a..553cbf7f 100644 --- 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 bb47e0df..04c64fb6 100644 --- 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 702c820c..c1ec2b11 100644 --- 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 65196bad..63be90c2 100644 --- 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 74035115..c7c6f99c 100644 --- 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 cff53403..18e81a66 100644 --- 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 9ed68534..f0ae26cc 100644 --- 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 ac649271..69fac855 100644 --- 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 c4c16e56..4fa1a325 100644 --- 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 b9f92583..92664c53 100644 --- 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 ddadaa5a..0897e2df 100644 --- 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 610c68c8..2b2e1ac2 100644 --- 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 5e38bf62..b3286ab3 100644 --- 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 df6a8da6..58b3b77d 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + + diff --git a/mobile/time.php b/mobile/time.php index 0479f0cd..9bb2a26d 100644 --- 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 06ea9091..6861262b 100644 --- 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 e9afa970..c4e325df 100644 --- 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 39bac801..f7bd3d3d 100644 --- 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 5f135e45..1a358ed7 100644 --- 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); -- 2.20.1
 Anuko Time Tracker 1.17.23.4000 | Copyright © Anuko | +  Anuko Time Tracker 1.17.23.4001 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl index ce4a6bf2..48511182 100644 --- a/WEB-INF/templates/profile_edit.tpl +++ b/WEB-INF/templates/profile_edit.tpl @@ -173,8 +173,8 @@ function handlePluginCheckboxes() { {$forms.profileForm.record_type.control}
{$i18n.form.profile.punch_in_mode}:{$forms.profileForm.punch_in_mode.control} {$i18n.label.what_is_it}{$i18n.form.profile.punch_mode}:{$forms.profileForm.punch_mode.control} {$i18n.label.what_is_it}
{$i18n.form.profile.allow_overlap}: