fix: timezone errors
This commit is contained in:
parent
a2813d235c
commit
890f265bb9
GPG key ID:
25C67A03B5666BC1
8 changed files with 40 additions and 14 deletions
|
|
@ -67,7 +67,7 @@ class Installation extends EA_Controller
|
|||
$this->instance->migrate();
|
||||
|
||||
// Insert admin
|
||||
$admin['timezone'] = 'Istanbul (+3:00)'; // REVIEW is it working properly ?!
|
||||
$admin['timezone'] = 'Europe/Istanbul'; // REVIEW is it working properly ?!
|
||||
$admin['settings']['username'] = $admin['username'];
|
||||
$admin['settings']['password'] = $admin['password'];
|
||||
$admin['settings']['notifications'] = true;
|
||||
|
|
|
|||
|
|
@ -362,8 +362,8 @@ $lang['private_hint'] = 'Private records will not be displayed or processed in p
|
|||
$lang['reset'] = 'Reset';
|
||||
$lang['all'] = 'All';
|
||||
$lang['booking_link'] = 'Booking Link';
|
||||
$lang['add_new_event'] = 'Add New Event';
|
||||
$lang['what_kind_of_event'] = 'What kind of event would you like to add?';
|
||||
$lang['add_new_event'] = 'Yeni Etkinlik Ekle';
|
||||
$lang['what_kind_of_event'] = 'Ne tarz bir etkinlik eklemek istersiniz?';
|
||||
$lang['theme'] = 'Theme';
|
||||
$lang['limit_customer_access'] = 'Limit Customer Access';
|
||||
$lang['limit_customer_access_hint'] = 'If enabled, providers and secretaries will only be able to access customers they have an appointment with.';
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ class Timezones
|
|||
*/
|
||||
protected array $timezones = [
|
||||
'General' => [
|
||||
'General/UTC' => 'UTC',
|
||||
'General/Istanbul' => 'Istanbul (+3:00)', // REVIEW is this line proper and working correctly???
|
||||
'UTC' => 'UTC',
|
||||
'Europe/Istanbul' => 'Istanbul (+3:00)', // REVIEW is this line proper and working correctly???
|
||||
],
|
||||
'America' => [
|
||||
'America/Adak' => 'Adak (-10:00)',
|
||||
|
|
@ -531,7 +531,7 @@ class Timezones
|
|||
*/
|
||||
public function get_default_timezone(): string
|
||||
{
|
||||
return 'Istanbul (+3:00)'; // REVIEW is it working in proper way?
|
||||
return 'Europe/Istanbul'; // REVIEW is it working in proper way?
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class Migration_Add_timezone_to_users extends EA_Migration
|
|||
'timezone' => [
|
||||
'type' => 'VARCHAR',
|
||||
'constraint' => '256',
|
||||
'default' => 'Istanbul (+3:00)', // REVIEW Works under migration ?
|
||||
'default' => 'Europe/Istanbul', // REVIEW Works under migration ?
|
||||
'after' => 'notes',
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<small>
|
||||
<?= lang('current_user') ?>:
|
||||
<span>
|
||||
<?= $timezones[session('timezone', 'Istanbul (+3:00)')] ?>
|
||||
<?= $timezones[session('timezone', 'Europe/Istanbul')] ?>
|
||||
</span>
|
||||
</small>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<?= lang('timezone') ?>
|
||||
</label>
|
||||
<?php component('timezone_dropdown', [
|
||||
'attributes' => 'id="select-timezone" class="form-control" value="Istanbul (+3:00)"',
|
||||
'attributes' => 'id="select-timezone" class="form-control" value="Europe/Istanbul"',
|
||||
'grouped_timezones' => $grouped_timezones,
|
||||
]); ?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<small>
|
||||
<?= lang('current_user') ?>:
|
||||
<span>
|
||||
<?= $timezones[session('timezone', 'Istanbul (+3:00)')] ?>
|
||||
<?= $timezones[session('timezone', 'Europe/Istanbul')] ?>
|
||||
</span>
|
||||
</small>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
# Nginx Docker Localtest
|
||||
|
||||
CONT_NAME="MAKETRANDEVU_NGINX_LOCALTEST" # nginx docker name
|
||||
MOUNT_PATH="/source" # binded mount path in nginx docker
|
||||
SCRIPT_NAME="nginx_docker_localtest.sh" # name of the *this* file
|
||||
CONT_NAME="MAKETRANDEVU_NGINX_LOCALTEST" # nginx docker name
|
||||
MOUNT_PATH="/source" # binded mount path in nginx docker
|
||||
SCRIPT_NAME="nginx_docker_localtest.sh" # name of the *this* file
|
||||
DEBUG="FALSE"
|
||||
|
||||
### REMOTE RELEASE ###
|
||||
|
|
@ -34,9 +34,14 @@ COMMANDS:
|
|||
restart: restart services (nginx, mariadb, php-fpm)
|
||||
update: update source files with new build on /source/
|
||||
status: see current webserver status
|
||||
root: move to root web folder
|
||||
help : see this help text
|
||||
|
||||
BUNDLE COMMANDS:
|
||||
complete-restart: update + reconf + restart + reconf
|
||||
|
||||
EXTERNAL COMMANDS: (without dock keyword)
|
||||
root: move to root web folder
|
||||
|
||||
|
||||
"""
|
||||
|
||||
|
|
@ -235,6 +240,27 @@ elif [[ $1 == "docker" ]]; then
|
|||
echo RECONFIGURED
|
||||
echo
|
||||
_exit
|
||||
elif [[ $2 == "complete-restart" ]]; then
|
||||
echo "updating sources!"
|
||||
rsync -a --progress /source/build/ $WEB_ROOT_FOLDER --exclude config.php --exclude storage
|
||||
|
||||
sleep 1
|
||||
|
||||
echo -e "$CONFIG_FILE_CONTENT" >"$WEB_ROOT_FOLDER/config.php"
|
||||
echo -e "$NGINX_CONFIG_FILE" >"/etc/nginx/conf.d/default.conf"
|
||||
echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/maketrandevu.conf"
|
||||
echo RECONFIGURED
|
||||
echo
|
||||
|
||||
service mariadb restart
|
||||
sleep 3
|
||||
service php8.2-fpm restart
|
||||
sleep 3
|
||||
service nginx restart
|
||||
|
||||
_status
|
||||
|
||||
|
||||
elif [[ $2 == "update" ]]; then
|
||||
echo "updating sources!"
|
||||
rsync -a --progress /source/build/ $WEB_ROOT_FOLDER --exclude config.php --exclude storage
|
||||
|
|
|
|||
Loading…
Reference in a new issue