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
This commit is contained in:
Alex Tselegidis 2024-05-11 19:35:30 +02:00
commit 89c19e53ad
48 changed files with 271 additions and 12 deletions

View file

@ -83,6 +83,8 @@ class Admins extends EA_Controller
'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([

View file

@ -264,6 +264,8 @@ class Booking extends EA_Controller
'appointment_data' => $appointment,
'provider_data' => $provider,
'customer_data' => $customer,
'default_language' => setting('default_language'),
'default_timezone' => setting('default_timezone'),
]);
html_vars([

View file

@ -178,6 +178,8 @@ class Calendar extends EA_Controller
'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([

View file

@ -107,6 +107,8 @@ class Customers extends EA_Controller
'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([

View file

@ -30,6 +30,7 @@ class General_settings extends EA_Controller
$this->load->model('settings_model');
$this->load->library('accounts');
$this->load->library('timezones');
}
/**
@ -62,6 +63,7 @@ class General_settings extends EA_Controller
script_vars([
'user_id' => $user_id,
'role_slug' => $role_slug,
'timezones' => $this->timezones->to_array(),
'general_settings' => $this->settings_model->get(),
]);
@ -69,6 +71,7 @@ class General_settings extends EA_Controller
'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,
]);

View file

@ -108,6 +108,8 @@ class Providers extends EA_Controller
'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([

View file

@ -97,6 +97,8 @@ class Secretaries extends EA_Controller
'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([

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Yhteystiedot';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Coordonnées';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Kontaktné informácie';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -457,4 +457,8 @@ $lang['connect'] = 'เชื่อมต่อ';
$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

View file

@ -456,4 +456,8 @@ $lang['contact_info'] = 'Contact Info';
$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

View file

@ -0,0 +1,38 @@
<?php defined('BASEPATH') or exit('No direct script access allowed');
/* ----------------------------------------------------------------------------
* Easy!Appointments - Online Appointment Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>
* @copyright Copyright (c) Alex Tselegidis
* @license https://opensource.org/licenses/GPL-3.0 - GPLv3
* @link https://easyappointments.org
* @since v1.3.2
* ---------------------------------------------------------------------------- */
class Migration_Add_default_language_setting extends EA_Migration
{
/**
* Upgrade method.
*/
public function up()
{
if (!$this->db->get_where('settings', ['name' => 'default_language'])->num_rows()) {
$this->db->insert('settings', [
'name' => 'default_language',
'value' => 'english',
]);
}
}
/**
* Downgrade method.
*/
public function down()
{
if ($this->db->get_where('settings', ['name' => 'default_language'])->num_rows()) {
$this->db->delete('settings', ['name' => 'default_language']);
}
}
}

View file

@ -0,0 +1,38 @@
<?php defined('BASEPATH') or exit('No direct script access allowed');
/* ----------------------------------------------------------------------------
* Easy!Appointments - Online Appointment Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>
* @copyright Copyright (c) Alex Tselegidis
* @license https://opensource.org/licenses/GPL-3.0 - GPLv3
* @link https://easyappointments.org
* @since v1.3.2
* ---------------------------------------------------------------------------- */
class Migration_Add_default_timezone_setting extends EA_Migration
{
/**
* Upgrade method.
*/
public function up()
{
if (!$this->db->get_where('settings', ['name' => 'default_timezone'])->num_rows()) {
$this->db->insert('settings', [
'name' => 'default_timezone',
'value' => date_default_timezone_get(),
]);
}
}
/**
* Downgrade method.
*/
public function down()
{
if ($this->db->get_where('settings', ['name' => 'default_timezone'])->num_rows()) {
$this->db->delete('settings', ['name' => 'default_timezone']);
}
}
}

View file

@ -191,6 +191,42 @@
</small>
</div>
</div>
<div class="mb-3">
<label class="form-label" for="default-language">
<?= lang('default_language') ?>
<span class="text-danger" hidden>*</span>
</label>
<select id="default-language" class="form-control required" data-field="default_language">
<?php foreach (vars('available_languages') as $available_language): ?>
<option value="<?= $available_language ?>">
<?= ucfirst($available_language) ?>
</option>
<?php endforeach; ?>
</select>
<div class="form-text text-muted">
<small>
<?= lang('default_language_hint') ?>
</small>
</div>
</div>
<div class="mb-3">
<label class="form-label" for="default-timezone">
<?= lang('default_timezone') ?>
<span class="text-danger" hidden>*</span>
</label>
<?php component('timezone_dropdown', [
'attributes' => 'id="default-timezone" data-field="default_timezone" class="form-control required"',
'grouped_timezones' => vars('grouped_timezones'),
]); ?>
</div>
<div class="form-text text-muted">
<small>
<?= lang('default_timezone_hint') ?>
</small>
</div>
</div>
</div>

View file

@ -424,8 +424,8 @@ App.Components.AppointmentsModal = (function () {
$address.val('');
$city.val('');
$zipCode.val('');
$language.val(vars('language') || 'english');
$timezone.val(moment.tz.guess() || 'UTC');
$language.val(vars('default_language'));
$timezone.val(vars('default_timezone'));
$customerNotes.val('');
$customField1.val('');
$customField2.val('');
@ -449,8 +449,8 @@ App.Components.AppointmentsModal = (function () {
const defaultStatusValue = $appointmentStatus.find('option:first').val();
$appointmentStatus.val(defaultStatusValue);
$language.val(vars('language') || 'english');
$timezone.val(moment.tz.guess() || 'UTC');
$language.val(vars('default_language'));
$timezone.val(vars('default_timezone'))
// Reset color.
$appointmentColor.find('.color-selection-option:first').trigger('click');

View file

@ -336,8 +336,8 @@ App.Pages.Admins = (function () {
$admins.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$admins.find('.record-details .form-label span').prop('hidden', true);
$admins.find('.record-details #calendar-view').val('default');
$admins.find('.record-details #language').val(vars('language') || 'english');
$admins.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$admins.find('.record-details #language').val(vars('default_language'));
$admins.find('.record-details #timezone').val(vars('default_timezone'));
$admins.find('.record-details #notifications').prop('checked', true);
$('#edit-admin, #delete-admin').prop('disabled', true);

View file

@ -254,8 +254,8 @@ App.Pages.Customers = (function () {
function resetForm() {
$customers.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$customers.find('.record-details .form-label span').prop('hidden', true);
$customers.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$customers.find('.record-details #language').val(vars('language') || 'english');
$customers.find('.record-details #timezone').val(vars('default_timezone'));
$customers.find('.record-details #language').val(vars('default_language'));
$customerAppointments.empty();

View file

@ -340,8 +340,8 @@ App.Pages.Providers = (function () {
$providers.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$providers.find('.record-details .form-label span').prop('hidden', true);
$providers.find('.record-details #calendar-view').val('default');
$providers.find('.record-details #language').val(vars('language') || 'english');
$providers.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$providers.find('.record-details #language').val(vars('default_language'));
$providers.find('.record-details #timezone').val(vars('default_timezone'));
$providers.find('.record-details #is-private').prop('checked', false);
$providers.find('.record-details #notifications').prop('checked', true);
$providers.find('.add-break, .add-working-plan-exception, #reset-working-plan').prop('disabled', true);

View file

@ -344,8 +344,8 @@ App.Pages.Secretaries = (function () {
$secretaries.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$secretaries.find('.record-details .form-label span').prop('hidden', true);
$secretaries.find('.record-details #calendar-view').val('default');
$secretaries.find('.record-details #language').val(vars('language') || 'english');
$secretaries.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$secretaries.find('.record-details #timezone').val(vars('default_timezone'));
$secretaries.find('.record-details #language').val(vars('default_language'));
$secretaries.find('.record-details #notifications').prop('checked', true);
$secretaries.find('.add-edit-delete-group').show();
$secretaries.find('.save-cancel-group').hide();