From 890f265bb9551c7fd326eea205e78db6192f1099 Mon Sep 17 00:00:00 2001 From: asandikci Date: Mon, 1 Jan 2024 22:27:04 +0300 Subject: [PATCH] fix: timezone errors --- application/controllers/Installation.php | 2 +- .../language/turkish/translations_lang.php | 4 +-- application/libraries/Timezones.php | 6 ++-- .../migrations/018_add_timezone_to_users.php | 2 +- .../views/components/appointments_modal.php | 2 +- .../views/components/booking_time_step.php | 2 +- .../components/unavailabilities_modal.php | 2 +- nginx_docker_localtest.sh | 34 ++++++++++++++++--- 8 files changed, 40 insertions(+), 14 deletions(-) diff --git a/application/controllers/Installation.php b/application/controllers/Installation.php index b5cbd755..96b3e036 100644 --- a/application/controllers/Installation.php +++ b/application/controllers/Installation.php @@ -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; diff --git a/application/language/turkish/translations_lang.php b/application/language/turkish/translations_lang.php index 572673c4..419489e3 100755 --- a/application/language/turkish/translations_lang.php +++ b/application/language/turkish/translations_lang.php @@ -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.'; diff --git a/application/libraries/Timezones.php b/application/libraries/Timezones.php index 4d5d5b14..8228496c 100644 --- a/application/libraries/Timezones.php +++ b/application/libraries/Timezones.php @@ -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? } /** diff --git a/application/migrations/018_add_timezone_to_users.php b/application/migrations/018_add_timezone_to_users.php index 418985df..2168d5eb 100644 --- a/application/migrations/018_add_timezone_to_users.php +++ b/application/migrations/018_add_timezone_to_users.php @@ -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', ], ]; diff --git a/application/views/components/appointments_modal.php b/application/views/components/appointments_modal.php index 6f228af7..47f02bd4 100644 --- a/application/views/components/appointments_modal.php +++ b/application/views/components/appointments_modal.php @@ -172,7 +172,7 @@ : - + diff --git a/application/views/components/booking_time_step.php b/application/views/components/booking_time_step.php index 7e23ff5d..235c1875 100644 --- a/application/views/components/booking_time_step.php +++ b/application/views/components/booking_time_step.php @@ -23,7 +23,7 @@ 'id="select-timezone" class="form-control" value="Istanbul (+3:00)"', + 'attributes' => 'id="select-timezone" class="form-control" value="Europe/Istanbul"', 'grouped_timezones' => $grouped_timezones, ]); ?> diff --git a/application/views/components/unavailabilities_modal.php b/application/views/components/unavailabilities_modal.php index d8670ed8..b8950752 100644 --- a/application/views/components/unavailabilities_modal.php +++ b/application/views/components/unavailabilities_modal.php @@ -63,7 +63,7 @@ : - + diff --git a/nginx_docker_localtest.sh b/nginx_docker_localtest.sh index 2ec80534..e30d30f5 100755 --- a/nginx_docker_localtest.sh +++ b/nginx_docker_localtest.sh @@ -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