From 7d3a07429738cd60e2d1793ddb197453797b5d92 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 19 Dec 2023 11:34:46 +0300 Subject: [PATCH 05/11] Set default timezone to Europe/Moscow --- pyanaconda/modules/timezone/installation.py | 4 ++-- pyanaconda/modules/timezone/timezone.py | 2 +- pyanaconda/ui/gui/spokes/datetime_spoke.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyanaconda/modules/timezone/installation.py b/pyanaconda/modules/timezone/installation.py index 829748c..83c5927 100644 --- a/pyanaconda/modules/timezone/installation.py +++ b/pyanaconda/modules/timezone/installation.py @@ -63,8 +63,8 @@ class ConfigureTimezoneTask(Task): if not is_valid_timezone(self._timezone): # this should never happen, but for pity's sake log.warning("Timezone %s set in kickstart is not valid, " - "falling back to default (America/New_York).", self._timezone) - self._timezone = "America/New_York" + "falling back to default (Europe/Moscow).", self._timezone) + self._timezone = "Europe/Moscow" def _make_timezone_symlink(self): """Create the symlink that actually defines timezone.""" diff --git a/pyanaconda/modules/timezone/timezone.py b/pyanaconda/modules/timezone/timezone.py index b0fedc4..9782ee7 100644 --- a/pyanaconda/modules/timezone/timezone.py +++ b/pyanaconda/modules/timezone/timezone.py @@ -39,7 +39,7 @@ class TimezoneService(KickstartService): def __init__(self): super().__init__() self.timezone_changed = Signal() - self._timezone = "America/New_York" + self._timezone = "Europe/Moscow" self.is_utc_changed = Signal() self._is_utc = False diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index 50ae156..b50f75b 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -66,7 +66,7 @@ SERVER_POOL = 1 SERVER_WORKING = 2 SERVER_USE = 3 -DEFAULT_TZ = "America/New_York" +DEFAULT_TZ = "Europe/Moscow" SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)') -- 2.43.0