From 84ae83fd7ab839d673770198248fc3063d3835a1 Mon Sep 17 00:00:00 2001 From: Alex Bradbury Date: Wed, 25 Sep 2013 18:16:19 +0100 Subject: [PATCH] fix issue where placeholder fr_FR.UTF-8 wasn't replaced with DEBLANGUAGE --- raspi-config | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/raspi-config b/raspi-config index 09d3129..890ee3d 100755 --- a/raspi-config +++ b/raspi-config @@ -623,15 +623,14 @@ do_apply_os_config() { if [ -n "$DEBLANGUAGE" ]; then printf "Setting language to %s based on os_config.json from NOOBS. May take a while\n" "$DEBLANGUAGE" - # TODO: map noobs language to Debian spec cat << EOF | debconf-set-selections -locales locales/locales_to_be_generated multiselect fr_FR.UTF-8 UTF-8 +locales locales/locales_to_be_generated multiselect $DEBLANGUAGE UTF-8 EOF rm /etc/locale.gen dpkg-reconfigure -f noninteractive locales - update-locale LANG=fr_FR.UTF-8 + update-locale LANG="$DEBLANGUAGE" cat << EOF | debconf-set-selections -locales locales/default_environment_locale select fr_FR.UTF-8 +locales locales/default_environment_locale select $DEBLANGUAGE EOF fi