From 72fbb12a8626eea0ef6d9655a144adadec52dfdd Mon Sep 17 00:00:00 2001
From: Joerg Schirottke <master@kanotix.com>
Date: Sat, 2 Mar 2013 22:32:06 +0100
Subject: use long locale settings and add us locale for german setting

---
 config/binary_burg/burg.cfg     | 4 ++--
 config/binary_grub/grub.cfg     | 2 +-
 config/binary_syslinux/live.cfg | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/binary_burg/burg.cfg b/config/binary_burg/burg.cfg
index 3796872..ed49810 100644
--- a/config/binary_burg/burg.cfg
+++ b/config/binary_burg/burg.cfg
@@ -4,10 +4,10 @@ set default="0"
 set timeout=5
 
 function lang_en {
-  set lang_opt='utc=yes locales=us'
+  set lang_opt='utc=yes locales=en_US.UTF-8'
 }
 function lang_de {
-  set lang_opt='utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys'
+  set lang_opt='utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8 keyboard-layouts=de keyboard-variants=nodeadkeys'
 }
 lang_de # default language
 
diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 49e1045..e9b2d69 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -3,7 +3,7 @@ set default=0
 set timeout=8
 
 set boot_en='boot=live config utc=yes locales=us'
-set boot_de='boot=live config utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys'
+set boot_de='boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8 keyboard-layouts=de keyboard-variants=nodeadkeys'
 
 if loadfont /boot/grub/unicode.pf2 ; then
   set gfxmode=800x600
diff --git a/config/binary_syslinux/live.cfg b/config/binary_syslinux/live.cfg
index 8de0c76..4ba71c7 100644
--- a/config/binary_syslinux/live.cfg
+++ b/config/binary_syslinux/live.cfg
@@ -5,4 +5,4 @@ label kanotix
 	menu label Kanotix-DE
 	menu default
 	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash
+	append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys splash
-- 
cgit v1.0