diff -Nru ubiquity-2.18.8.1/debian/changelog ubiquity-2.18.8.2/debian/changelog --- ubiquity-2.18.8.1/debian/changelog 2014-06-30 13:25:11.000000000 +0000 +++ ubiquity-2.18.8.2/debian/changelog 2014-09-02 11:21:12.000000000 +0000 @@ -1,3 +1,11 @@ +ubiquity (2.18.8.2) trusty-proposed; urgency=medium + + * In ubi-console-setup.py query for keyboard names in English + in KDE frontend, fixes crash with Swiss German + LP: #1182784 + + -- Jonathan Riddell Tue, 02 Sep 2014 10:58:19 +0000 + ubiquity (2.18.8.1) trusty-proposed; urgency=medium [ Aurelien Gateau ] diff -Nru ubiquity-2.18.8.1/ubiquity/plugins/ubi-console-setup.py ubiquity-2.18.8.2/ubiquity/plugins/ubi-console-setup.py --- ubiquity-2.18.8.1/ubiquity/plugins/ubi-console-setup.py 2014-04-22 11:29:58.000000000 +0000 +++ ubiquity-2.18.8.2/ubiquity/plugins/ubi-console-setup.py 2014-09-02 10:58:17.000000000 +0000 @@ -286,7 +286,7 @@ @plugin.only_this_page def on_keyboard_layout_selected(self, *args): layout = self.get_keyboard() - l = self.controller.dbfilter.get_locale() + l = 'C' if layout is not None: #skip updating keyboard if not using display if self.keyboardDisplay: @@ -307,7 +307,7 @@ if self.keyboardDisplay: var = None - l = self.controller.dbfilter.get_locale() + l = 'C' ly = keyboard_names.layout_id(l, layout) if variant: try: @@ -336,7 +336,7 @@ self.page.keyboard_layout_combobox.setCurrentIndex(index) if self.keyboardDisplay: - l = self.controller.dbfilter.get_locale() + l = 'C' ly = keyboard_names.layout_id(l, misc.utf8(layout)) self.keyboardDisplay.setLayout(ly) @@ -360,7 +360,7 @@ self.page.keyboard_variant_combobox.setCurrentIndex(index) if self.keyboardDisplay: - l = self.controller.dbfilter.get_locale() + l = 'C' layout = keyboard_names.layout_id(l, self.get_keyboard()) if variant: try: