source: ubiquity/trunk/fuentes/debian/patches/localechooser2.patch

Last change on this file was 2086, checked in by mabarracus, 5 years ago

new localechooser patch to fix wrong selection of locale into /etc/default/locale

File size: 1.1 KB
  • d-i/source/localechooser/localechooser

    diff -Nuar fuentes.orig/d-i/source/localechooser/localechooser fuentes/d-i/source/localechooser/localechooser
    old new  
    428428                fi
    429429        done
    430430        choices="$(echo "$choices" | sed 's/#%#/\\,/g')"
     431        if [ "$lang" = "ca" ]; then
     432            choices_c="ca_ES.UTF-8@valencia, ${choices_c}"
     433            choices="Valencia\${!TAB}-\${!TAB}ca_ES.UTF-8@valencia, ${choices}"
     434        fi
    431435        db_subst $tpl_preferredlocale CHOICES-C "$choices_c"
    432436        db_subst $tpl_preferredlocale CHOICES "$choices"
    433437}
     
    838842
    839843                askedpreflocale=
    840844                if [ -z "$locale_preseeded" ] && [ "$use_lang" ]; then
     845                        if [ "$LANGUAGE" = "ca_ES@valencia" ]; then
     846                            LOCALE="ca_ES.UTF-8@valencia"
     847                            db_set $tpl_di_locale $LOCALE
     848                            db_set $tpl_preferredlocale $LOCALE
     849                        fi
     850                        log "Llamando a buildpreferred con $LANGUAGE $LOCALE"
    841851                        build_preferredlocale_choices $LANGUAGE $LOCALE
    842852
    843853                        if has_choice $tpl_shortlist $COUNTRYCODE; then
Note: See TracBrowser for help on using the repository browser.