From 0ae6660527155297a643127adbda8ebf5b80c491 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 8 Oct 2025 17:17:40 +0600 Subject: [PATCH] Fixes --- locale/ubl-settings-datetime_ru.po | 12 ++++++++++++ source/ubl-settings-datetime.c | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/locale/ubl-settings-datetime_ru.po b/locale/ubl-settings-datetime_ru.po index c2997c6..8663fbd 100644 --- a/locale/ubl-settings-datetime_ru.po +++ b/locale/ubl-settings-datetime_ru.po @@ -160,6 +160,18 @@ msgstr "ММ-ДД-ГГГГ" msgid "Stopped" msgstr "Остановлен" +msgid "Argentina" +msgstr "Аргентина" + +msgid "Kentucky" +msgstr "Кентукки" + +msgid "Currie" +msgstr "Карри" + +msgid "Kosrae" +msgstr "Косраэ" + msgid "Abidjan" msgstr "Абиджан" diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 85ea033..8b1fce3 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -327,10 +327,8 @@ void on_region_changed(GtkComboBox *self, main_window *widgets){ time_t curtime = time(NULL); struct tm *local = localtime(&curtime); char *hour_str = yon_char_from_long(local->tm_gmtoff/3600); - char *minute = yon_char_from_long((local->tm_gmtoff%3600)/60); - name_string = yon_char_unite("(UTC ",local->tm_gmtoff>0?"+":"-",hour_str,":",minute,") ",_(parsed_sorted[i]),NULL); + name_string = yon_char_unite("(UTC ",local->tm_gmtoff>0?"+":"",strlen(hour_str)<2&&local->tm_gmtoff!=0?"0":"",hour_str,") ",_(parsed_sorted[i]),NULL); free(hour_str); - free(minute); free(zonereg); } } @@ -544,7 +542,10 @@ void config_init(){ if (size>0){ if (strcmp(parsed[0],"(null)\n")){ yon_char_remove_last_symbol(parsed[0],'\n'); - main_config.ntp_default = parsed[0]; + if (strstr(parsed[0],"[")&&strstr(parsed[0],"]")) + main_config.ntp_default = strstr(parsed[0],"] ")+2; + else + main_config.ntp_default = parsed[0]; } } }