Merge lp:~ev/ubiquity/translated_layouts into lp:ubiquity

[Evan]

[Evan (ev)]

I know you guys are busy, but I wanted to give everyone an opportunity to review this before I landed it on trunk. This and the accompanying console-setup branch add translated keyboard names to ubiquity, per the foundations-lucid-oem-config-localized-keyboard-layout specification.

I'm not entirely sold on shoving 1.5M of text into Python data structures. If it's an issue for the rest of you, I'll do away with keyboard_names.py and modify ubiquity to directly scan the kbdnames.gz file.

Please also see lp:~ev/console-setup/translated_layouts (merged from Debian), which is a prerequisite for this branch.

Thanks

[lp:~ev/ubiquity/translated_layouts]

3658. By Evan on 2010-01-20

Unbreak KDE keyboard layout handling.

=== modified file '.bzrignore'
--- .bzrignore	2010-01-20 12:15:00 +0000
+++ .bzrignore	2010-01-20 23:36:15 +0000
@@ -5,6 +5,7 @@
 ./build-stamp
 debian/build
 debian/files
+debian/kbdnames.gz
 debian/oem-config
 debian/oem-config-check
 debian/oem-config-debconf
 
=== modified file 'd-i/make-keyboard-names'
--- d-i/make-keyboard-names	2006-10-02 18:34:01 +0000
+++ d-i/make-keyboard-names	2010-01-20 23:36:15 +0000
@@ -3,8 +3,12 @@
 # Derived from console-setup/Keyboard/kbdnames-maker, by Anton Zinoviev.
 # Mangled to produce a Python module by Colin Watson.
 
+# This needs to die in a big chemical fire.
+
 use warnings 'all';
 use strict;
+use Locale::gettext;
+use POSIX;
 
 my $file;
 
@@ -23,43 +27,101 @@
 print "# Instead of editing this file, it is better to edit the original and\n";
 print "# regenerate this.\n\n";
 
-print "models = {\n";
+print "lang = {\n";
+print "    'C': {\n";
+print "        'models' : {\n";
 for my $model (sort keys %KeyboardNames::models) {
     my $name = $KeyboardNames::models{$model};
     (my $modelesc = $model) =~ s/'/\\'/;
-    print "    '$modelesc': '$name',\n";
+    print "            '$modelesc': '$name',\n";
 }
-print "}\n\n";
-print "models_rev = {}\n";
-print "models_rev.update(((v, k) for (k, v) in models.iteritems()))\n\n";
+print "        },\n";
+print "        'models_rev' : {},\n";
 
 my %layouts_rev;
-print "layouts = {\n";
+print "        'layouts' : {\n";
 for my $layout (sort keys %KeyboardNames::layouts) {
     my $name = $KeyboardNames::layouts{$layout};
     $layouts_rev{$name} = $layout;
     (my $layoutesc = $layout) =~ s/'/\\'/g;
-    print "    '$layoutesc': '$name',\n";
+    print "            '$layoutesc': '$name',\n";
 }
-print "}\n\n";
-print "layouts_rev = {}\n";
-print "layouts_rev.update(((v, k) for (k, v) in layouts.iteritems()))\n\n";
+print "        },\n";
+print "        'layouts_rev' : {},\n";
 
-print "variants = {\n";
+print "        'variants' : {\n";
 for my $layout (sort keys %KeyboardNames::variants) {
     my $desc = $layouts_rev{$layout};
-    print "    '$layout': {\n";
+    print "            '$layout': {\n";
     (my $layoutesc = $desc) =~ s/'/\\'/g;
-    print "        '$layoutesc': '',\n";
+    print "                '$layoutesc': '',\n";
     for my $variant (sort keys %{$KeyboardNames::variants{$layout}}) {
 	my $variantname = $KeyboardNames::variants{$layout}{$variant};
 	(my $variantesc = "$desc - $variant") =~ s/'/\\'/g;
-	print "        '$variantesc': '$variantname',\n";
-    }
+	print "                '$variantesc': '$variantname',\n";
+    }
+    print "            },\n";
+}
+print "        },\n";
+print "        'variants_rev' : {},\n";
+print "    },\n";
+
+# Make sure we output UTF-8
+$ENV{'LC_ALL'} = "en_US.UTF-8";
+binmode STDOUT, ":utf8";
+
+for my $mo (</usr/share/locale/*/LC_MESSAGES/xkeyboard-config.mo>) {
+    my $lang = $mo;
+    $lang =~ s:/usr/share/locale/(.*)/LC_MESSAGES/xkeyboard-config.mo:$1:;
+    $ENV{'LANGUAGE'} = $lang;
+    setlocale(LC_ALL,"");
+
+    $lang =~ s:\@:__:;
+    $lang =~ s:__Latn:__latin:; # special fixup for sr
+
+    my $d = Locale::gettext->domain("xkeyboard-config");
+    
+    print "    '$lang': {\n";
+    print "        'models': {\n";
+    for my $model (sort keys %KeyboardNames::models) {
+        my $name = $KeyboardNames::models{$model};
+        (my $local_model = $d->get($model)) =~ s/'/\\'/g;
+        print "            u'$local_model': '$name',\n"
+    }
+    print "        },\n";
+    print "        'models_rev' : {},\n";
+    print "        'layouts' : {\n";
+    for my $layout (sort keys %KeyboardNames::layouts) {
+        my $name = $KeyboardNames::layouts{$layout};
+        my $local_layout = $d->get($layout);
+        (my $layoutesc = $local_layout) =~ s/'/\\'/g;
+        print "            u'$layoutesc': '$name',\n";
+    }
+    print "        },\n";
+    print "        'layouts_rev' : {},\n";
+    print "        'variants' : {\n";
+    for my $layout (sort keys %KeyboardNames::variants) {
+        my $local_desc = $d->get($layouts_rev{$layout});
+        print "            '$layout': {\n";
+        (my $layoutesc = $local_desc) =~ s/'/\\'/g;
+        print "                u'$layoutesc': '',\n";
+        for my $variant (sort keys %{$KeyboardNames::variants{$layout}}) {
+            my $local_variant = $d->get($variant);
+            my $variantname = $KeyboardNames::variants{$layout}{$variant};
+            (my $variantesc = "$local_desc - $local_variant") =~ s/'/\\'/g;
+            print "                u'$variantesc': '$variantname',\n";
+        }
+        print "            },\n";
+    }
+    print "        },\n";
+    print "        'variants_rev' : {},\n";
     print "    },\n";
 }
-print "}\n\n";
-print "variants_rev = {}\n";
-print "for layoutname in variants.keys():\n";
-print "    variants_rev[layoutname] = {}\n";
-print "    variants_rev[layoutname].update(((v, k) for (k, v) in variants_rev[layoutname].iteritems()))\n";
+
+print "}\n";
+print "for l in lang:\n";
+print "    lang[l]['models_rev'].update(((v, k) for (k, v) in lang[l]['models'].iteritems()))\n";
+print "    lang[l]['layouts_rev'].update(((v, k) for (k, v) in lang[l]['layouts'].iteritems()))\n";
+print "    for layoutname in lang[l]['variants'].keys():\n";
+print "        lang[l]['variants_rev'][layoutname] = {}\n";
+print "        lang[l]['variants_rev'][layoutname].update(((v, k) for (k, v) in lang[l]['variants_rev'][layoutname].iteritems()))\n";
 
=== modified file 'debian/rules'
--- debian/rules	2009-11-27 20:38:59 +0000
+++ debian/rules	2010-01-20 23:36:15 +0000
@@ -57,6 +57,7 @@
 	$(MAKE) -C d-i clean
 	dh_auto_clean
 	dh_clean
+	rm -f debian/kbdnames.gz
 
 	$(MAKE) -C d-i check
 
@@ -64,11 +65,16 @@
 	$(MAKE) -C d-i/source/console-setup/Keyboard MyKeyboardNames.pl \
 		xkbdir=/usr/share/X11/xkb
 
+debian/kbdnames.gz: d-i/source/console-setup/Keyboard/MyKeyboardNames.pl
+	( cd d-i/source/console-setup/Keyboard \
+	&& ./kbdnames-maker MyKeyboardNames.pl \
+	| grep -v '^C[*]' | grep -v '[*]model[*]' | sort | gzip -9 ) >$@
+
 ubiquity/keyboard_names.py: d-i/source/console-setup/Keyboard/MyKeyboardNames.pl
 	d-i/make-keyboard-names $< > $@
 
 install: DH_OPTIONS=
-install: build ubiquity/keyboard_names.py
+install: build ubiquity/keyboard_names.py debian/kbdnames.gz
 	dh_testdir
 	dh_testroot
 	dh_prep
 
=== modified file 'debian/ubiquity.install-any'
--- debian/ubiquity.install-any	2009-11-27 20:38:59 +0000
+++ debian/ubiquity.install-any	2010-01-20 23:36:16 +0000
@@ -42,6 +42,7 @@
 compat/locale usr/lib/ubiquity/console-setup
 scripts/console-setup-apply usr/lib/ubiquity
 ubiquity/components/ubi-console-setup.py usr/lib/ubiquity/plugins
+debian/kbdnames.gz usr/share/console-setup-mini
 
 # debian-installer-utils
 d-i/source/debian-installer-utils/block-attr bin
 
=== modified file 'ubiquity/components/ubi-console-setup.py'
--- ubiquity/components/ubi-console-setup.py	2010-01-19 16:21:02 +0000
+++ ubiquity/components/ubi-console-setup.py	2010-01-20 23:36:16 +0000
@@ -208,10 +208,11 @@
 
     def on_keyboard_layout_selected(self):
         layout = self.get_keyboard()
+        l = self.controller.dbfilter.get_locale()
         if layout is not None:
             #skip updating keyboard if not using display
             if self.keyboardDisplay:
-                ly = keyboard_names.layouts[unicode(layout)]
+                ly = keyboard_names.lang[l]['layouts'][unicode(layout)]
                 self.keyboardDisplay.setLayout(ly)
             
                 #no variants, force update by setting none
@@ -227,9 +228,10 @@
         
         if self.keyboardDisplay:
             var = None
-            ly = keyboard_names.layouts[layout]
+            l = self.controller.dbfilter.get_locale()
+            ly = keyboard_names.lang[l]['layouts'][layout]
             if variant and keyboard_names.variants.has_key(ly):
-                variantMap = keyboard_names.variants[ly]
+                variantMap = keyboard_names.lang[l]['variants'][ly]
                 var = variantMap[unicode(variant)]
             
             self.keyboardDisplay.setVariant(var)
@@ -254,7 +256,8 @@
             self.page.keyboard_layout_combobox.setCurrentIndex(index)
         
         if self.keyboardDisplay:
-            ly = keyboard_names.layouts[unicode(layout)]
+            l = self.controller.dbfilter.get_locale()
+            ly = keyboard_names.lang[l]['layouts'][unicode(layout)]
             self.keyboardDisplay.setLayout(ly)
 
     def get_keyboard(self):
@@ -278,9 +281,10 @@
         
         if self.keyboardDisplay:
             var = None
-            layout = keyboard_names.layouts[self.get_keyboard()]
-            if variant and keyboard_names.variants.has_key(layout):
-                variantMap = keyboard_names.variants[layout]
+            l = self.controller.dbfilter.get_locale()
+            layout = keyboard_names.lang[l]['layouts'][self.get_keyboard()]
+            if variant and keyboard_names.lang[l]['variants'].has_key(layout):
+                variantMap = keyboard_names.lang[l]['variants'][layout]
                 var = variantMap[unicode(variant)]
             
             self.keyboardDisplay.setVariant(var)
@@ -342,6 +346,16 @@
         self.db.fset('console-setup/model', 'seen', 'false')
         self.db.fset('console-setup/codeset', 'seen', 'false')
 
+        # Roughly taken from console-setup's config.proto:
+        l = self.db.get('debian-installer/locale').rsplit('.', 1)[0]
+        if l not in keyboard_names.lang:
+            self.debug("Untranslated layout '%s'" % l)
+            l = l.rsplit('_', 1)[0]
+        if l not in keyboard_names.lang:
+            self.debug("Untranslated layout '%s'" % l)
+            l = 'C'
+        self._locale = l
+
         # Technically we should provide a version as the second argument,
         # but that isn't currently needed and it would require querying
         # apt/dpkg for the current version, which would be slow, so we don't
@@ -498,19 +512,23 @@
 
         return (real_model, real_layout, real_variant, real_options)
 
+    def get_locale(self):
+        return self._locale
+
     def apply_keyboard(self, layout, variant):
         model = self.db.get('console-setup/modelcode')
 
-        if layout not in keyboard_names.layouts:
+        l = self.get_locale()
+        if layout not in keyboard_names.lang[l]['layouts']:
             self.debug("Unknown keyboard layout '%s'" % layout)
             return
-        layout = keyboard_names.layouts[layout]
+        layout = keyboard_names.lang[l]['layouts'][layout]
 
-        if layout not in keyboard_names.variants:
+        if layout not in keyboard_names.lang[l]['variants']:
             self.debug("No known variants for layout '%s'" % layout)
             variant = ''
-        elif variant in keyboard_names.variants[layout]:
-            variant = keyboard_names.variants[layout][variant]
+        elif variant in keyboard_names.lang[l]['variants'][layout]:
+            variant = keyboard_names.lang[l]['variants'][layout][variant]
         else:
             self.debug("Unknown keyboard variant '%s' for layout '%s'" %
                        (variant, layout))