Gunnar Hjalmarsson has proposed merging ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1823778 in gnome-control-center (Ubuntu): "Unable to set Serbian as Language" https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1823778 For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365984 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog index c124bf3..34b8d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +gnome-control-center (1:3.28.2-0ubuntu0.18.04.4) bionic; urgency=medium + + * debian/patches/ubuntu-region-langpack-install.patch: + - Dropped, which makes Serbian language items show up as selectable + in Region & Language (LP: #1823778). + * debian/patches/52_region_language.patch: + - Prevent that the modifier part is dropped when a language + represented by a locale with modifier is set (LP: #1823778). + + -- Gunnar Hjalmarsson <[email protected]> Sat, 13 Apr 2019 03:05:00 +0200 + gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) bionic; urgency=medium * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch: diff --git a/debian/patches/52_region_language.patch b/debian/patches/52_region_language.patch index b6cc0ba..ab78f7f 100644 --- a/debian/patches/52_region_language.patch +++ b/debian/patches/52_region_language.patch @@ -285,26 +285,7 @@ Index: b/panels/region/cc-region-panel.c =================================================================== --- a/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c -@@ -377,11 +377,15 @@ - gint response_id, - CcRegionPanel *self) - { -- const gchar *language; -+ const gchar *locale, *language, *country; -+ gchar *name = NULL; - - if (response_id == GTK_RESPONSE_OK) { -- language = cc_language_chooser_get_language (GTK_WIDGET (chooser)); -- update_language (self, language); -+ locale = cc_language_chooser_get_language (GTK_WIDGET (chooser)); -+ gnome_parse_locale (locale, &language, &country, NULL, NULL); -+ name = g_strdup_printf ("%s_%s", language, country); -+ update_language (self, name); -+ g_free (name); - } - - gtk_widget_destroy (GTK_WIDGET (chooser)); -@@ -403,6 +407,47 @@ +@@ -403,6 +403,47 @@ } static void @@ -352,7 +333,7 @@ Index: b/panels/region/cc-region-panel.c update_region (CcRegionPanel *self, const gchar *region) { -@@ -413,6 +458,7 @@ +@@ -413,6 +454,7 @@ } else { if (g_strcmp0 (region, priv->region) == 0) return; @@ -360,7 +341,7 @@ Index: b/panels/region/cc-region-panel.c g_settings_set_string (priv->locale_settings, KEY_REGION, region); if (priv->login_auto_apply) set_system_region (self, region); -@@ -593,7 +639,7 @@ +@@ -593,7 +635,7 @@ CcRegionPanelPrivate *priv = self->priv; g_free (priv->region); @@ -369,7 +350,7 @@ Index: b/panels/region/cc-region-panel.c update_region_label (self); } -@@ -622,15 +668,19 @@ +@@ -622,15 +664,19 @@ { CcRegionPanelPrivate *priv = self->priv; const gchar *language = NULL; @@ -393,7 +374,7 @@ Index: b/panels/region/cc-region-panel.c update_language_label (self); } -@@ -1485,6 +1535,16 @@ +@@ -1485,6 +1531,16 @@ update_buttons (self); } @@ -410,7 +391,7 @@ Index: b/panels/region/cc-region-panel.c static void on_localed_properties_changed (GDBusProxy *proxy, GVariant *changed_properties, -@@ -1499,32 +1559,46 @@ +@@ -1499,32 +1555,46 @@ const gchar **strv; gsize len; gint i; @@ -466,7 +447,7 @@ Index: b/panels/region/cc-region-panel.c update_language_label (self); } -@@ -1594,27 +1668,24 @@ +@@ -1594,27 +1664,24 @@ CcRegionPanelPrivate *priv = self->priv; GVariantBuilder *b; gchar *s; diff --git a/debian/patches/series b/debian/patches/series index 6357c3a..6d1a542 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,6 @@ 99_add_lock-on-suspend.patch ubuntu-gnome-version.patch ubuntu-region-packagekit.patch -ubuntu-region-langpack-install.patch ubuntu-language-support.patch ubuntu-printer-support.patch ubuntu-legacy-notifications.patch diff --git a/debian/patches/ubuntu-region-langpack-install.patch b/debian/patches/ubuntu-region-langpack-install.patch deleted file mode 100644 index f69fe6f..0000000 --- a/debian/patches/ubuntu-region-langpack-install.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Tim Lunn <[email protected]> -Date: Fri, 11 Sep 2015 13:51:59 +1000 -Subject: [PATCH 3/3] Modify the input-chooser dialog to allow for the - installation of lang packs - ---- - panels/common/cc-language-chooser.c | 6 ++++-- - panels/region/cc-region-panel.c | 3 +++ - 2 files changed, 7 insertions(+), 2 deletions(-) - -Index: gnome-control-center/panels/common/cc-language-chooser.c -=================================================================== ---- gnome-control-center.orig/panels/common/cc-language-chooser.c -+++ gnome-control-center/panels/common/cc-language-chooser.c -@@ -121,7 +121,7 @@ more_widget_new (void) - row = gtk_list_box_row_new (); - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_container_add (GTK_CONTAINER (row), box); -- gtk_widget_set_tooltip_text (box, _("More…")); -+ gtk_widget_set_tooltip_text (box, _("Install More…")); - - arrow = gtk_image_new_from_icon_name ("view-more-symbolic", GTK_ICON_SIZE_MENU); - gtk_style_context_add_class (gtk_widget_get_style_context (arrow), "dim-label"); -@@ -176,7 +176,7 @@ add_all_languages (GtkDialog *chooser) - gchar **locale_ids; - GHashTable *initial; - -- locale_ids = gnome_get_all_locales (); -+ locale_ids = gnome_get_all_languages (); - initial = cc_common_language_get_initial_languages (); - add_languages (chooser, locale_ids, initial); - g_hash_table_destroy (initial); -@@ -306,6 +306,8 @@ show_more (GtkDialog *chooser, gboolean - priv->showing_extra = visible; - - gtk_list_box_invalidate_filter (GTK_LIST_BOX (priv->language_list)); -+ -+ gtk_window_set_title (GTK_WINDOW(chooser), _("Install Language")); - } - static void - set_locale_id (GtkDialog *chooser, -Index: gnome-control-center/panels/region/cc-region-panel.c -=================================================================== ---- gnome-control-center.orig/panels/region/cc-region-panel.c -+++ gnome-control-center/panels/region/cc-region-panel.c -@@ -371,6 +371,9 @@ update_language (CcRegionPanel *self, - { - CcRegionPanelPrivate *priv = self->priv; - -+ if (!cc_common_language_maybe_install (0, language, FALSE)) -+ return; -+ - if (priv->login) { - set_system_language (self, language); - } else { -@@ -720,6 +723,11 @@ setup_language_section (CcRegionPanel *s - - update_language_from_user (self); - update_region_from_setting (self); -+ -+ /* check if there are missing lang packs */ -+ cc_common_language_maybe_install (0, priv->language, TRUE); -+ -+ - } - - #ifdef HAVE_IBUS
-- ubuntu-desktop mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
