Merge lp:~superm1/ubuntu/natty/grub2/chinese-support into lp:~ubuntu-core-dev/ubuntu/natty/grub2/natty

[Mario Limonciello]

[Colin Watson (cjwatson)]

Applying this patch directly would break most other languages. For example, the French locale file is /boot/grub/locale/fr.mo, but LANG is typically something like fr_FR.UTF-8.

I think the best approach is probably, in addition to this, to modify GRUB's gettext module to try stripping off the _CC part itself if ll_CC.mo and ll_CC.mo.gz don't exist. I'm happy to look into this upstream.

review: Needs Fixing

[Colin Watson (cjwatson)]

I've sent a patch to http://lists.gnu.org/archive/html/grub-devel/2010-12/msg00041.html.

Unmerged revisions

2083. By Mario Limonciello on 2010-12-07

Make sure that the language is set properly in grub.cfg. (LP: #686788)

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-04 00:02:31 +0000
+++ debian/changelog	2010-12-07 22:55:48 +0000
@@ -3,6 +3,7 @@
   * grub-mkrescue efi amd64 images:
     When searching for .disk/info, set the 'root' parameter as the regular
     search requires the variable being set as an argument.
+  * Make sure that the language is set properly in grub.cfg. (LP: #686788)
 
  -- Mario Limonciello <[e-mail]>  Fri, 03 Dec 2010 13:51:19 -0600
 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-26 13:05:58 +0000
+++ debian/patches/series	2010-12-07 22:55:48 +0000
@@ -34,3 +34,4 @@
 ubuntu_debug_acpi_shutdown.patch
 ubuntu_fix_usb_efi_boot.patch
 ubuntu_linux_submenus.patch
+ubuntu_chinese.patch
 
=== added file 'debian/patches/ubuntu_chinese.patch'
--- debian/patches/ubuntu_chinese.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_chinese.patch	2010-12-07 22:55:48 +0000
@@ -0,0 +1,13 @@
+Index: grub2/util/grub.d/00_header.in
+===================================================================
+--- grub2.orig/util/grub.d/00_header.in	2010-12-07 16:46:53.360590266 -0600
++++ grub2/util/grub.d/00_header.in	2010-12-07 16:47:36.880121391 -0600
+@@ -23,7 +23,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
+-grub_lang=`echo $LANG | cut -d _ -f 1`
++grub_lang=`echo $LANG | cut -d . -f 1`
+ 
+ . ${libdir}/grub/grub-mkconfig_lib
+