Removed show holidays config option.

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index c6693bec38923834fa17ac952cab13e3c0ee1157..2a5eb1dcff3c18c5b89a0c2d219a20d0a8009275 100644 (file)
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -41,7 +41,6 @@ class ttGroup {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.

-  var $show_holidays = 0;       // Whether to show holidays in calendar.

   var $tracking_mode = 0;       // Tracking mode.
   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 $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.


@@ -114,7 +113,6 @@ class ttGroup {
       $this->config = $val['config'];
       $this->configHelper = new ttConfigHelper($val['config']);
       // Set user config options.
       $this->config = $val['config'];
       $this->configHelper = new ttConfigHelper($val['config']);
       // Set user config options.

-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');

       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a40a5fda1eedc4a8ef41e9ba17ae16333460dde4..14e7007b802a49a7f7ffe167cbe658c7fc4fe12f 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -55,7 +55,6 @@ class ttUser {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.

-  var $show_holidays = 0;       // Whether to show holidays in calendar.

   var $tracking_mode = 0;       // Tracking mode.
   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 $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.


@@ -148,7 +147,6 @@ class ttUser {
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.

-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');

       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 435e3ebefa8ee47c79f2bda31b270726c23c4704..e24a13d5196667115563db7e33603a68204b1234 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -582,7 +582,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e8c032286fc53926a85e8418f4dd86620bd65fdf..2aa9ebb372e64341cc77220af098762d1acdd0f7 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -595,7 +595,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 08109ba80851cb38a0a9469de7e4edec9364a874..aa4e97beaa1175e092e23f46afa73ba2ba946ce6 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -554,7 +554,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 timers',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 timers',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Registrerings tilstand',
 'form.group_edit.mode_time' => 'Tid',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Registrerings tilstand',
 'form.group_edit.mode_time' => 'Tid',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 57a755a925c152a45d34f873f7a680ef900ce2c2..49837588d69fd0f8123175500d4c7aa494276b98 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -530,8 +530,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 Stunden',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 Stunden',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-'form.group_edit.show_holidays' => 'Zeige Feiertage',
-// TODO: translate the following.

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index da27233c7bd3496921bc23bcb2c1c78b5e758d40..f7d8ac4b661dbf567c3370f39dcae5d19e887dab 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -516,7 +516,6 @@ $i18n_key_words = array(
 'form.group_edit.12_hours' => '12 hours',
 'form.group_edit.24_hours' => '24 hours',
 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.12_hours' => '12 hours',
 'form.group_edit.24_hours' => '24 hours',
 'form.group_edit.display_options' => 'Display options',

-'form.group_edit.show_holidays' => 'Show holidays',

 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',
 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bbbc3f0e1072fcba8480bca5342ad5912838a81e..97d3c50a8fd9da1b7c34aaae0f0c003c081db0bf 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -596,7 +596,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5ea92117d0aa1610b72d336d256851c5b063f7ad..41fe752c26291b6a326c6e1e507575e8c4c3ffae 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -559,8 +559,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 tundi',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 tundi',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-'form.group_edit.show_holidays' => 'Näita pühi',
-// TODO: translate the following.

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Jälgimise režiim',
 'form.group_edit.mode_time' => 'ajaarvestus',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Jälgimise režiim',
 'form.group_edit.mode_time' => 'ajaarvestus',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 823f1b7cdb2f33a489ab3b448d281d10e2f9464a..c3831228ff017089d39bf3d4a73e816464e2987d 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -577,7 +577,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 ساعت',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 ساعت',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'حالت رهگیری',
 'form.group_edit.mode_time' => 'زمان',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'حالت رهگیری',
 'form.group_edit.mode_time' => 'زمان',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 74a8b64d480e48a818cc57242b565fe593029528..05750331e757c3eaf12d976b2e5541ce11f2aeb8 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -560,7 +560,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24-tuntinen',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24-tuntinen',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Seurantamuoto',
 'form.group_edit.mode_time' => 'aika',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Seurantamuoto',
 'form.group_edit.mode_time' => 'aika',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d5067b58dde6e4c2e886a95ea3d2d64a2542dca2..b8eb0d5bc0edd332288739687275cbd3abcaefb6 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -551,7 +551,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 heures',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 heures',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Mode suivi',
 'form.group_edit.mode_time' => 'Heures',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Mode suivi',
 'form.group_edit.mode_time' => 'Heures',

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9960f1c09ad608e9a0c5dfd3d4fab31cf25c8717..49ab0a12ca70db76bbe9fb82ece3621707559b08 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -539,8 +539,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 ώρες',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 ώρες',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-'form.group_edit.show_holidays' => 'Προβολή διακοπών',
-// TODO: translate the following.

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
 'form.group_edit.mode_time' => 'χρόνος',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
 'form.group_edit.mode_time' => 'χρόνος',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8c9ba6a9c85856e5e51d48d0241844c95252dbb0..d8e99d695228f368336ad40962f03d590343e3db 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -581,7 +581,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 שעות',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 שעות',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'סוג מעקב',
 'form.group_edit.mode_time' => 'זמן',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'סוג מעקב',
 'form.group_edit.mode_time' => 'זמן',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f95621005777957be44aa50e1792ca56346fc54c..441db3fe971acd0781437666145e70a60814553a 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -587,7 +587,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index dc339b8fb0e8697c6cacc63098d1f83693e2273b..4b76fef3ac9815f29a6dfa3157508eb0a56ab3d2 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -553,8 +553,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 ore',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 ore',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-'form.group_edit.show_holidays' => 'Mostra vacanze',
-// TODO: translate the following.

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modalità di registrazione',
 'form.group_edit.mode_time' => 'tempo',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modalità di registrazione',
 'form.group_edit.mode_time' => 'tempo',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ba1abffaf91e6807bd6acfdad471e30e6c38c237..6db174108192f02447892760d573e5b91f363d43 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -590,7 +590,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dc8ef51dcebc8a01a2c4b70d194a3d9287721657..d8ed7b8c59165b99b215bac6ddc256a128d43b77 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -588,7 +588,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0a25f8b389841dc7a52d0325bd1070c122a34279..859741a2b838753363f6fc477ead0ddec8a7edd6 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -515,8 +515,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 uurs',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 uurs',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-'form.group_edit.show_holidays' => 'Toon vakantiedagen',
-// TODO: translate the following.

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b5fa206a45b620631f59af00e8f90a1156876862..5a108fc553b08c02b1b26394b11af80664b98d6a 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -587,7 +587,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c6d1af1e10025d27d620d37d611adbabda983a17..60f5e1af5bc2e86eaa3c6e2585b6b1b3dba84005 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -563,7 +563,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 godziny',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 godziny',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tryb śledzenia',
 'form.group_edit.mode_time' => 'czas',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tryb śledzenia',
 'form.group_edit.mode_time' => 'czas',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 544a4958a9c1bcb9367389dbc1a85d094baac66f..5013cde5dc9b935cb5e38b1306af04d3444e3100 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -558,7 +558,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2d8298ffe467a6e05aa552b86aaa96daee9659a3..cc44e6f186899f1b0810da90d234d37f65ec66fb 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -569,7 +569,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9a03b8431a069fbf7da37ae40dba65c8d74f8eef..94690cd51990676a8c75d8d0c6cc5cb1e2f29513 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -590,7 +590,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 7caf38e7f1894056b0eb728fd853526a7dc87201..22d9a2bdbbe12a2a9b294588dc7bb1bd924082be 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -507,7 +507,6 @@ $i18n_key_words = array(
 'form.group_edit.12_hours' => '12 часов',
 'form.group_edit.24_hours' => '24 часа',
 'form.group_edit.display_options' => 'Опции отображения',
 'form.group_edit.12_hours' => '12 часов',
 'form.group_edit.24_hours' => '24 часа',
 'form.group_edit.display_options' => 'Опции отображения',

-'form.group_edit.show_holidays' => 'Показывать праздники',

 'form.group_edit.holidays' => 'Праздники',
 'form.group_edit.tracking_mode' => 'Режим работы',
 'form.group_edit.mode_time' => 'время',
 'form.group_edit.holidays' => 'Праздники',
 'form.group_edit.tracking_mode' => 'Режим работы',
 'form.group_edit.mode_time' => 'время',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 76bfaaaef3ebc3aec636256255302b974a529c87..664c26f5a2938f7b153cfdd791b812b360f249a5 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -570,7 +570,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24-hodinový',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24-hodinový',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Režim sledovania',
 'form.group_edit.mode_time' => 'čas',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Režim sledovania',
 'form.group_edit.mode_time' => 'čas',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 14ab00040821566f4678b36b8d832fc790703e4c..d9001b1ecb24bd8a1f3418abf55e3ef6ff3b02f9 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -564,7 +564,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f742c1c0bccc6b96c08a65a79efa6c8f43a91e00..79769f9c9bd58578a5f6bf7798835331fbb9eddc 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -561,7 +561,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 časova',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24 časova',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Način evidencije',
 'form.group_edit.mode_time' => 'vreme',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Način evidencije',
 'form.group_edit.mode_time' => 'vreme',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d5007226f100d6623baf209b2bc6bd10fbf46dfb..a442a6e481c0a6f6140e68917ed201f78f9beb7d 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -558,7 +558,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24-timmars',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.24_hours' => '24-timmars',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Spårningsmetod',
 'form.group_edit.mode_time' => 'Endast tid',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Spårningsmetod',
 'form.group_edit.mode_time' => 'Endast tid',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 05b99c5557b5ecba6dba214d4cd42b1c04e66a9b..2ed0eef3cd1ada02060af1300f28f312c006f481 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -603,7 +603,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 795b49133ef54f151385b17424eff63c74893195..868bf16ab1b71c79ffb002ec379082fea91817e3 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -574,7 +574,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 7d19a6e92b6bd931ce9df725ffe023bd3069ea78..fa8d4a007799479736e7e40add8fa6febc9281d6 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -580,7 +580,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',

-// 'form.group_edit.show_holidays' => 'Show holidays',

 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 343a4d04a95425f5463cf9ab9ed13474c197ebbd..b303ed998ea505e83ef1c74dd6fcce4ceac55809 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>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.4996 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.4997 | 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>
             <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/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index a68e28eb8d4c6766b919f2f5247a6c6a069fda52..0da797ffdaa0d812fd7b84ca487d00df1bd9f614 100644 (file)
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -74,13 +74,9 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
             <td><a href="display_options.php">{$i18n.label.configure}</a></td>
           </tr>
             <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
             <td><a href="display_options.php">{$i18n.label.configure}</a></td>
           </tr>

-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
-            <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>

           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>

-            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_36.htm" target="_blank">{$i18n.label.what_is_it}</a></td>

           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>

diff --git a/group_edit.php b/group_edit.php
index 2855de8816de994d47f59f6d559e33aa2081616c..894546e5eb2b7920ec97b69d0577435167d40bce 100644 (file)
--- a/group_edit.php
+++ b/group_edit.php
@@ -85,7 +85,6 @@ if ($request->isPost() && !$groupChanged) {
   $cl_date_format = $request->getParameter('date_format');
   $cl_time_format = $request->getParameter('time_format');
   $cl_start_week = $request->getParameter('start_week');
   $cl_date_format = $request->getParameter('date_format');
   $cl_time_format = $request->getParameter('time_format');
   $cl_start_week = $request->getParameter('start_week');

-  $cl_show_holidays = $request->getParameter('show_holidays');

   $cl_holidays = trim($request->getParameter('holidays'));
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');
   $cl_holidays = trim($request->getParameter('holidays'));
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');


@@ -107,7 +106,6 @@ if ($request->isPost() && !$groupChanged) {
   $cl_date_format = $group['date_format'];
   $cl_time_format = $group['time_format'];
   $cl_start_week = $group['week_start'];
   $cl_date_format = $group['date_format'];
   $cl_time_format = $group['time_format'];
   $cl_start_week = $group['week_start'];

-  $cl_show_holidays = $config->getDefinedValue('show_holidays');

   $cl_holidays = $group['holidays'];
   $cl_tracking_mode = $group['tracking_mode'];
   $cl_project_required = $group['project_required'];
   $cl_holidays = $group['holidays'];
   $cl_tracking_mode = $group['tracking_mode'];
   $cl_project_required = $group['project_required'];


@@ -181,8 +179,7 @@ foreach ($i18n->weekdayNames as $id => $week_dn) {
 }
 $form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
 
 }
 $form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
 

-// Show holidays checkbox.
-$form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
+// Show holidays control.

 $form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_holidays));
 
 // Prepare tracking mode choices.
 $form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_holidays));
 
 // Prepare tracking mode choices.


@@ -249,7 +246,6 @@ if ($request->isPost()) {
 
     if ($err->no()) {
       // Update config.
 
     if ($err->no()) {
       // Update config.

-      $config->setDefinedValue('show_holidays', $cl_show_holidays);

       $config->setDefinedValue('punch_mode', $cl_punch_mode);
       $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
       $config->setDefinedValue('future_entries', $cl_future_entries);
       $config->setDefinedValue('punch_mode', $cl_punch_mode);
       $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
       $config->setDefinedValue('future_entries', $cl_future_entries);