From 741ffe906b488b0d3e1ee0bbd4942c7aa9141104 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Sun, 13 Dec 2015 22:48:48 +0100
Subject: [PATCH] Added select box for the date format option in the settings
 page (refs #27).

---
 .../language/chinese/translations_lang.php     |  3 +++
 .../language/danish/translations_lang.php      |  3 +++
 .../language/dutch/translations_lang.php       |  3 +++
 .../language/english/translations_lang.php     |  3 +++
 .../language/finnish/translations_lang.php     |  3 +++
 .../language/french/translations_lang.php      |  3 +++
 .../language/german/translations_lang.php      |  3 +++
 .../language/greek/translations_lang.php       |  3 +++
 .../language/hindi/translations_lang.php       |  3 +++
 .../language/hungarian/translations_lang.php   |  3 +++
 .../language/italian/translations_lang.php     |  3 +++
 .../language/japanese/translations_lang.php    |  3 +++
 .../luxembourgish/translations_lang.php        |  3 +++
 .../language/polish/translations_lang.php      |  3 +++
 .../portuguese-br/translations_lang.php        |  3 +++
 .../language/portuguese/translations_lang.php  |  3 +++
 .../language/romanian/translations_lang.php    |  3 +++
 .../language/russian/translations_lang.php     |  3 +++
 .../language/slovak/translations_lang.php      |  3 +++
 .../language/spanish/translations_lang.php     |  3 +++
 .../language/turkish/translations_lang.php     |  3 +++
 src/application/views/backend/settings.php     | 18 ++++++++++++++++++
 src/assets/js/backend_settings.js              |  3 ++-
 23 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/application/language/chinese/translations_lang.php b/src/application/language/chinese/translations_lang.php
index 7b82bc2f..e6b1e362 100644
--- a/src/application/language/chinese/translations_lang.php
+++ b/src/application/language/chinese/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/danish/translations_lang.php b/src/application/language/danish/translations_lang.php
index 9a41235c..0331c90c 100644
--- a/src/application/language/danish/translations_lang.php
+++ b/src/application/language/danish/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/dutch/translations_lang.php b/src/application/language/dutch/translations_lang.php
index 4194e80b..1a73fe9b 100644
--- a/src/application/language/dutch/translations_lang.php
+++ b/src/application/language/dutch/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/english/translations_lang.php b/src/application/language/english/translations_lang.php
index 1f022545..70995645 100644
--- a/src/application/language/english/translations_lang.php
+++ b/src/application/language/english/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/finnish/translations_lang.php b/src/application/language/finnish/translations_lang.php
index 2f8a4d52..ad3c6c80 100644
--- a/src/application/language/finnish/translations_lang.php
+++ b/src/application/language/finnish/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/french/translations_lang.php b/src/application/language/french/translations_lang.php
index f110bb10..2021c136 100644
--- a/src/application/language/french/translations_lang.php
+++ b/src/application/language/french/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/german/translations_lang.php b/src/application/language/german/translations_lang.php
index 328d55cb..3b9a6fda 100644
--- a/src/application/language/german/translations_lang.php
+++ b/src/application/language/german/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Jeder Anbieter';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Datumsformat';
+$lang['date_format_hint'] = 'Ändern Sie das Datumsanzeigeformat (D - Datum, M - Monat, Y - Jahr).';
+$lang['google_analytics_code_hint'] = 'Fügen Sie Ihre Google Analytics-ID hinzu, das auf der Buchungsseite enthalten wird.';
diff --git a/src/application/language/greek/translations_lang.php b/src/application/language/greek/translations_lang.php
index af7e2d00..354584b9 100644
--- a/src/application/language/greek/translations_lang.php
+++ b/src/application/language/greek/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Οποιοσδήποτε Πάροχος';
 $lang['requested_hour_is_unavailable'] = 'Το απαιτούμενο ραντεβού δεν είναι δυστυχώς διαθέσιμο. Παρακαλώ επιλέξτε κάποια άλλη ώρα για το ραντεβού σας.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Μορφή Ημερομηνίας';
+$lang['date_format_hint'] = 'Αλλάξτε την μορφή ημερομηνίας (D - Ημέρα, M - Μήνας, Y - Χρόνος).';
+$lang['google_analytics_code_hint'] = 'Προσθέστε τον Google Analytics ID σας το οποίο θα συμπεριληφθεί στην σελίδα κράτησης.';
diff --git a/src/application/language/hindi/translations_lang.php b/src/application/language/hindi/translations_lang.php
index 70e2e126..f97f97ce 100644
--- a/src/application/language/hindi/translations_lang.php
+++ b/src/application/language/hindi/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/hungarian/translations_lang.php b/src/application/language/hungarian/translations_lang.php
index 70ddfc34..2213be6c 100644
--- a/src/application/language/hungarian/translations_lang.php
+++ b/src/application/language/hungarian/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/italian/translations_lang.php b/src/application/language/italian/translations_lang.php
index 9708871f..b0c345fc 100644
--- a/src/application/language/italian/translations_lang.php
+++ b/src/application/language/italian/translations_lang.php
@@ -275,3 +275,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/japanese/translations_lang.php b/src/application/language/japanese/translations_lang.php
index d0f29108..a022181a 100644
--- a/src/application/language/japanese/translations_lang.php
+++ b/src/application/language/japanese/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/luxembourgish/translations_lang.php b/src/application/language/luxembourgish/translations_lang.php
index fa3c4b59..be980273 100644
--- a/src/application/language/luxembourgish/translations_lang.php
+++ b/src/application/language/luxembourgish/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/polish/translations_lang.php b/src/application/language/polish/translations_lang.php
index 9815ff04..4423e67e 100644
--- a/src/application/language/polish/translations_lang.php
+++ b/src/application/language/polish/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/portuguese-br/translations_lang.php b/src/application/language/portuguese-br/translations_lang.php
index b0423409..6305e41b 100644
--- a/src/application/language/portuguese-br/translations_lang.php
+++ b/src/application/language/portuguese-br/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/portuguese/translations_lang.php b/src/application/language/portuguese/translations_lang.php
index 80e389a7..8cb7c5b0 100644
--- a/src/application/language/portuguese/translations_lang.php
+++ b/src/application/language/portuguese/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/romanian/translations_lang.php b/src/application/language/romanian/translations_lang.php
index cea53557..46b4a9be 100644
--- a/src/application/language/romanian/translations_lang.php
+++ b/src/application/language/romanian/translations_lang.php
@@ -275,3 +275,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/russian/translations_lang.php b/src/application/language/russian/translations_lang.php
index 2652d350..0bb638a4 100644
--- a/src/application/language/russian/translations_lang.php
+++ b/src/application/language/russian/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/slovak/translations_lang.php b/src/application/language/slovak/translations_lang.php
index b42089c2..6223c135 100644
--- a/src/application/language/slovak/translations_lang.php
+++ b/src/application/language/slovak/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/spanish/translations_lang.php b/src/application/language/spanish/translations_lang.php
index fbbbca07..f4be8929 100644
--- a/src/application/language/spanish/translations_lang.php
+++ b/src/application/language/spanish/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/language/turkish/translations_lang.php b/src/application/language/turkish/translations_lang.php
index fcfff54a..0bd9746c 100644
--- a/src/application/language/turkish/translations_lang.php
+++ b/src/application/language/turkish/translations_lang.php
@@ -269,3 +269,6 @@ $lang['any_provider'] = 'Any Provider';
 $lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
 $lang['customer_notifications'] = 'Customer Notifications';
 $lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
+$lang['date_format'] = 'Date Format';
+$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
+$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index 224013ef..978a524a 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -105,6 +105,24 @@
                                 Google Analytics ID</label>
                             <input type="text" id="google-analytics-code" placeholder="UA-XXXXXXXX-X"
                                 data-field="google_analytics_code" class="form-control">
+                            <span class="help-block">
+                                <?php echo $this->lang->line('google_analytics_code_hint'); ?>
+                            </span>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="date-format">
+                                <?php echo $this->lang->line('date_format'); ?>
+                            </label>
+                            <select class="form-control" id="date-format" data-field="date_format">
+                                <option value="DMY">DMY</option>
+                                <option value="MDY">MDY</option>
+                                <option value="YMD">YMD</option>
+                            </select>
+                            <span class="help-block">
+                                <?php echo $this->lang->line('date_format_hint'); ?>
+                            </span>
                         </div>
                     </div>
                 </div>
diff --git a/src/assets/js/backend_settings.js b/src/assets/js/backend_settings.js
index a786810f..a195c76a 100644
--- a/src/assets/js/backend_settings.js
+++ b/src/assets/js/backend_settings.js
@@ -46,6 +46,7 @@ var BackendSettings = {
         // Apply setting values from database.
         $.each(GlobalVariables.settings.system, function(index, setting) {
             $('input[data-field="' + setting.name + '"]').val(setting.value);
+            $('select[data-field="' + setting.name + '"]').val(setting.value);
         });
 
         var workingPlan = {};
@@ -259,7 +260,7 @@ SystemSettings.prototype.get = function() {
     var settings = [];
 
     // General Settings Tab
-    $('#general input').each(function() {
+    $('#general').find('input, select').each(function() {
         settings.push({
             'name': $(this).attr('data-field'),
             'value': $(this).val()