[packages/grub2] setup i18n in update-grub

glen glen at pld-linux.org
Fri Nov 2 23:46:06 CET 2012


commit 3c36d44102e07d381eb2b04bc644540ef1013350
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Nov 3 00:41:48 2012 +0200

    setup i18n in update-grub

 grub.sysconfig |  3 ---
 grub2.spec     |  2 +-
 update-grub    | 24 ++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index 8b1c513..f099e45 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -44,7 +44,7 @@ Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
 Version:	2.00
-Release:	0.4
+Release:	0.5
 License:	GPL v2
 Group:		Base
 Source0:	http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
diff --git a/grub.sysconfig b/grub.sysconfig
index ee89b61..8ae22f3 100644
--- a/grub.sysconfig
+++ b/grub.sysconfig
@@ -43,6 +43,3 @@ GRUB_DISABLE_RECOVERY="true"
 
 # Uncomment to get a beep at grub start
 #GRUB_INIT_TUNE="480 440 1"
-
-# Setup lang, otherwise it would be inherited from running terminal
-#LANG=C
diff --git a/update-grub b/update-grub
index c808b21..87c23b2 100644
--- a/update-grub
+++ b/update-grub
@@ -1,2 +1,26 @@
 #!/bin/sh
+# Setup locale from system config,
+# otherwise it would be inherited from running terminal
+
+if [ -f /etc/sysconfig/i18n ]; then
+	. /etc/sysconfig/i18n
+
+	[ "$LANG" ] && export LANG || unset LANG
+	[ "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
+	[ "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
+	[ "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
+	[ "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION
+	[ "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT
+	[ "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
+	[ "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
+	[ "$LC_NAME" ] && export LC_NAME || unset LC_NAME
+	[ "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
+	[ "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER
+	[ "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
+	[ "$LC_TIME" ] && export LC_TIME || unset LC_TIME
+	[ "$LC_ALL" ] && export LC_ALL || unset LC_ALL
+	[ "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
+	[ "$LINGUAS" ] && export LINGUAS || unset LINGUAS
+fi
+
 exec grub-mkconfig -o /boot/grub/grub.cfg "$@"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/9113bca01115f31e4767ddfec2ccf6b0dac8deb8



More information about the pld-cvs-commit mailing list