Merge branch 'refs/heads/tm8544-default_settings' into develop

# Conflicts:
#	application/language/arabic/translations_lang.php
#	application/language/bulgarian/translations_lang.php
#	application/language/catalan/translations_lang.php
#	application/language/chinese/translations_lang.php
#	application/language/croatian/translations_lang.php
#	application/language/czech/translations_lang.php
#	application/language/danish/translations_lang.php
#	application/language/dutch/translations_lang.php
#	application/language/english/translations_lang.php
#	application/language/estonian/translations_lang.php
#	application/language/finnish/translations_lang.php
#	application/language/french/translations_lang.php
#	application/language/german/translations_lang.php
#	application/language/greek/translations_lang.php
#	application/language/hebrew/translations_lang.php
#	application/language/hindi/translations_lang.php
#	application/language/hungarian/translations_lang.php
#	application/language/italian/translations_lang.php
#	application/language/japanese/translations_lang.php
#	application/language/luxembourgish/translations_lang.php
#	application/language/marathi/translations_lang.php
#	application/language/persian/translations_lang.php
#	application/language/polish/translations_lang.php
#	application/language/portuguese-br/translations_lang.php
#	application/language/portuguese/translations_lang.php
#	application/language/romanian/translations_lang.php
#	application/language/russian/translations_lang.php
#	application/language/serbian/translations_lang.php
#	application/language/slovak/translations_lang.php
#	application/language/spanish/translations_lang.php
#	application/language/swedish/translations_lang.php
#	application/language/thai/translations_lang.php
#	application/language/turkish/translations_lang.php
#	assets/js/components/appointments_modal.js
#	assets/js/pages/admins.js
#	assets/js/pages/customers.js
#	assets/js/pages/providers.js
#	assets/js/pages/secretaries.js

application/controllers/Admins.php

@@ -83,6 +83,8 @@ public function index(): void
             'role_slug' => $role_slug,
             'timezones' => $this->timezones->to_array(),
             'min_password_length' => MIN_PASSWORD_LENGTH,
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([

application/controllers/Booking.php

@@ -264,6 +264,8 @@ public function index(): void
             'appointment_data' => $appointment,
             'provider_data' => $provider,
             'customer_data' => $customer,
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([

application/controllers/Calendar.php

@@ -178,6 +178,8 @@ public function index(string $appointment_hash = ''): void
             'secretary_providers' => $secretary_providers,
             'edit_appointment' => $edit_appointment,
             'customers' => $this->customers_model->get(null, 50, null, 'update_datetime DESC'),
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([

application/controllers/Customers.php

@@ -107,6 +107,8 @@ public function index(): void
             'time_format' => $time_format,
             'timezones' => $this->timezones->to_array(),
             'secretary_providers' => $secretary_providers,
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([

application/controllers/General_settings.php

@@ -30,6 +30,7 @@ public function __construct()
         $this->load->model('settings_model');
 
         $this->load->library('accounts');
+        $this->load->library('timezones');
     }
 
     /**
@@ -62,13 +63,15 @@ public function index(): void
         script_vars([
             'user_id' => $user_id,
             'role_slug' => $role_slug,
+            'timezones' => $this->timezones->to_array(),
             'general_settings' => $this->settings_model->get(),
         ]);
 
         html_vars([
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
+            'grouped_timezones' => $this->timezones->to_grouped_array(),
             'available_themes' => $available_themes,
         ]);
 

application/controllers/Providers.php

@@ -108,6 +108,8 @@ public function index(): void
             'min_password_length' => MIN_PASSWORD_LENGTH,
             'timezones' => $this->timezones->to_array(),
             'services' => $services,
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([

application/controllers/Secretaries.php

@@ -97,6 +97,8 @@ public function index(): void
             'timezones' => $this->timezones->to_array(),
             'min_password_length' => MIN_PASSWORD_LENGTH,
             'providers' => $providers,
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([

application/language/arabic/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/bulgarian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/catalan/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/chinese/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/croatian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/czech/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/danish/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/dutch/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/english/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/estonian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/finnish/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/french/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/german/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/greek/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/hebrew/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/hindi/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/hungarian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/italian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/japanese/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/luxembourgish/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/marathi/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/persian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/polish/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/portuguese-br/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/portuguese/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/romanian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/russian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/serbian/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/slovak/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End

application/language/spanish/translations_lang.php

@@ -456,4 +456,8 @@
 $lang['hide_from_public'] = 'Hide From Public';
 $lang['matomo_analytics_site_id'] = 'Matomo Analytics Site ID';
 $lang['matomo_analytics_site_id_hint'] = 'Set the site ID that will be tracked by Matomo (the default site has the ID "1").';
+$lang['default_timezone'] = 'Default Timezone';
+$lang['default_timezone_hint'] = 'Set the default timezone value that will be used for new records.';
+$lang['default_language'] = 'Default Language';
+$lang['default_language_hint'] = 'Set the default language value that will be used for new records.';
 // End