diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index dba21a2..23a699e 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -367,22 +367,19 @@ void yon_interface_update(main_window *widgets){ if (!yon_char_is_empty(region)){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),region); } else { - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0); + gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),"Europe"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0); } if (!yon_char_is_empty(zone)){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),zone); } else { - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0); + gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),"Moscow"); } char *language = config(lang_parameter); if (!yon_char_is_empty(language)){ - int feasf = gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguageCombo),language); - if (feasf){ - printf("fsa\n"); - }; + gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguageCombo),language); } else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->MainLanguageSensitiveCheck),0); @@ -421,7 +418,13 @@ void yon_interface_update(main_window *widgets){ } } else { for_iter(widgets->LayoutList,&iter){ + char *id; + gtk_tree_model_get(GTK_TREE_MODEL(widgets->LayoutList),&iter,0,&id,-1); + if (!strcmp(id,"ru")||!strcmp(id,"us")){ + gtk_tree_store_set(widgets->LayoutList,&iter,3,1,-1); + } else { gtk_tree_store_set((widgets->LayoutList),&iter,3,0,-1); + } } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck),0); } @@ -746,7 +749,7 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){ if (status) yon_char_parsed_add_or_create_if_exists(parsed,&size,current); } - char *final = yon_char_parsed_to_string(parsed,size,", "); + char *final = yon_char_parsed_to_string(parsed,size,"; "); gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),final); free(final); yon_char_parsed_free(parsed,size); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index af88e3f..d38a92d 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -164,4 +164,5 @@ #define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.") #define SCROLL_TO_END_LABEL _("Scroll to the end") -#define ADMINISTRATOR_LABEL _("Administrator") \ No newline at end of file +#define ADMINISTRATOR_LABEL _("Administrator") +#define DEFAULT_LOCALES_LABEL _("English, U.S.A.; Russian, Russia") \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 84844c9..f520ce8 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1630,7 +1630,6 @@ and help you install UBLinux on your computer True False False - False @@ -1668,7 +1667,6 @@ and help you install UBLinux on your computer True False False - False @@ -1740,6 +1738,7 @@ and help you install UBLinux on your computer True False False + English, U.S.A.; Russian, Russia diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index 2613fe9..eb83854 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -604,6 +604,9 @@ msgstr "" msgid "Administrator" msgstr "" +msgid "English, U.S.A.; Russian, Russia" +msgstr "" + msgid "Afrikaans" msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 7868c70..9148dd4 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -629,6 +629,9 @@ msgstr "Настройки" msgid "Administrator" msgstr "Администратор" +msgid "English, U.S.A.; Russian, Russia" +msgstr "Английский, США; Русский, Россия" + msgid "Afrikaans" msgstr "Африканский"