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

Proposed by Mario Limonciello
Status: Needs review
Proposed branch: lp:~superm1/ubuntu/natty/grub2/chinese-support
Merge into: lp:~ubuntu-core-dev/ubuntu/natty/grub2/natty
Diff against target: 38 lines (+15/-0)
3 files modified
debian/changelog (+1/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu_chinese.patch (+13/-0)
To merge this branch: bzr merge lp:~superm1/ubuntu/natty/grub2/chinese-support
Reviewer Review Type Date Requested Status
Colin Watson Needs Fixing
Review via email: mp+43023@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

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
Revision history for this message
Colin Watson (cjwatson) wrote :

Unmerged revisions

2083. By Mario Limonciello

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-04 00:02:31 +0000
3+++ debian/changelog 2010-12-07 22:55:48 +0000
4@@ -3,6 +3,7 @@
5 * grub-mkrescue efi amd64 images:
6 When searching for .disk/info, set the 'root' parameter as the regular
7 search requires the variable being set as an argument.
8+ * Make sure that the language is set properly in grub.cfg. (LP: #686788)
9
10 -- Mario Limonciello <Mario_Limonciello@Dell.com> Fri, 03 Dec 2010 13:51:19 -0600
11
12
13=== modified file 'debian/patches/series'
14--- debian/patches/series 2010-11-26 13:05:58 +0000
15+++ debian/patches/series 2010-12-07 22:55:48 +0000
16@@ -34,3 +34,4 @@
17 ubuntu_debug_acpi_shutdown.patch
18 ubuntu_fix_usb_efi_boot.patch
19 ubuntu_linux_submenus.patch
20+ubuntu_chinese.patch
21
22=== added file 'debian/patches/ubuntu_chinese.patch'
23--- debian/patches/ubuntu_chinese.patch 1970-01-01 00:00:00 +0000
24+++ debian/patches/ubuntu_chinese.patch 2010-12-07 22:55:48 +0000
25@@ -0,0 +1,13 @@
26+Index: grub2/util/grub.d/00_header.in
27+===================================================================
28+--- grub2.orig/util/grub.d/00_header.in 2010-12-07 16:46:53.360590266 -0600
29++++ grub2/util/grub.d/00_header.in 2010-12-07 16:47:36.880121391 -0600
30+@@ -23,7 +23,7 @@
31+ exec_prefix=@exec_prefix@
32+ libdir=@libdir@
33+ locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
34+-grub_lang=`echo $LANG | cut -d _ -f 1`
35++grub_lang=`echo $LANG | cut -d . -f 1`
36+
37+ . ${libdir}/grub/grub-mkconfig_lib
38+

Subscribers

People subscribed via source and target branches