From 3b35eed05f99d2728f85929a34fe376dab27f4f0 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Fri, 24 Mar 2017 18:41:41 +0100 Subject: [PATCH] reintroduce keymap settings in prep_menu --- data/translations/danish.trans | 3 ++- data/translations/dutch.trans | 3 ++- data/translations/english.trans | 6 ++--- data/translations/french.trans | 3 ++- data/translations/german.trans | 3 ++- data/translations/hungarian.trans | 3 ++- data/translations/italian.trans | 3 ++- data/translations/portuguese.trans | 3 ++- data/translations/portuguese_brasil.trans | 3 ++- data/translations/russian.trans | 3 ++- data/translations/spanish.trans | 3 ++- lib/util-menu.sh | 29 +++++++++++++---------- lib/util.sh | 8 +++---- 13 files changed, 43 insertions(+), 30 deletions(-) diff --git a/data/translations/danish.trans b/data/translations/danish.trans index c1b1129..bf80d81 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -22,7 +22,8 @@ _PassErrBody="Adgangskoderne er ikke ens. Prøv igen." # Basics _SelLang="Sprogvalg" _Lang="Sprog" -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="Internet forbindelse er ikke aktiv" _EstCon="Opret forbindelse?" diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index 6a96653..12e1625 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -21,7 +21,8 @@ _PassErrBody="De ingegeven wachtwoorden zijn niet identiek. Probeer opnieuw aub. # Basics _SelLang="Select Language" # translate me ! _Lang="Language" # translate me ! -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="No Internet Detected." # translate me ! _EstCon="Establish connection?" # translate me ! diff --git a/data/translations/english.trans b/data/translations/english.trans index d40542f..83b48dd 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -21,8 +21,8 @@ _PassErrBody="The passwords entered do not match. Please try again." # Basics _SelLang="Select Language" _Lang="Language" -_Keymap="Keymap" -_Change="Would you like to change the settings?" +_Keep="Keep" +_Change="Change" _NoCon="No Internet Detected." _EstCon="Establish connection?" _Config="Configure" @@ -154,7 +154,7 @@ _MIrrorPacQ="Use edited pacman configuration for installed system? If Yes, the f # Set Keymap (vconsole) _VCKeymapTitle="Set Virtual Console" -_DefKeymap="The default keymap for your selected language is" +_DefKeymap="Currently configured keymap setting is:" _VCKeymapBody="A virtual console is a shell prompt in a non-graphical environment. Its keymap is independent of a desktop environment / terminal." # Set Xkbmap (environment) diff --git a/data/translations/french.trans b/data/translations/french.trans index e902719..cb7d366 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -22,7 +22,8 @@ _PassErrBody="Les mots de passe entrés ne correspondent pas. Veuillez réessaye # Basics _SelLang="Choisir la langue" _Lang="Langue" -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="Pas de connexion Internet détectée." _EstCon="Établir la connexion ?" diff --git a/data/translations/german.trans b/data/translations/german.trans index 0b42f24..bb84d7d 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -20,7 +20,8 @@ _PassErrBody="Die eingegebenen Passwörter sind nicht gleich. Bitte erneut versu # Basics _SelLang="Sprachauswahl" _Lang="Sprache" -_Keymap="Tastaturbelegung" +_Keep="Behalten" +_Change="Ändern" _Change="Möchten Sie die Einstellungen ändern?" _NoCon="Keine Internetverbindung." _EstCon="Verbindung herstellen?" diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index 12ef9ce..b568e93 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -20,7 +20,8 @@ _PassErrBody="A megadott jelszavak nem egyeznek. Kérlek próbáld újra." # Alap beállítások _SelLang="Válassz nyelvet" _Lang="Nyelv" -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="Nincs internetkapcsolat." _EstCon="Kapcsolódni akarsz az internethez?" diff --git a/data/translations/italian.trans b/data/translations/italian.trans index df0723b..4088bc3 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -21,7 +21,8 @@ _PassErrBody="Le password digitate non corrispondono. Provare nuovamente." # Basics _SelLang="Select Language" # translate me ! _Lang="Language" # translate me ! -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="No Internet Detected." # translate me ! _EstCon="Establish connection?" # translate me ! diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index cd14922..ea03bdd 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -21,7 +21,8 @@ _PassErrBody="As senhas digitadas não coincidem. Por favor, tente novamente." # Basics _SelLang="Select Language" # translate me ! _Lang="Language" # translate me ! -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="No Internet Detected." # translate me ! _EstCon="Establish connection?" # translate me ! diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 0d9d0f2..4574592 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -21,7 +21,8 @@ _PassErrBody="As senhas digitadas não coincidem. Por favor, tente novamente." # Basics _SelLang="Select Language" # translate me ! _Lang="Language" # translate me ! -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="No Internet Detected." # translate me ! _EstCon="Establish connection?" # translate me ! diff --git a/data/translations/russian.trans b/data/translations/russian.trans index 3c09376..4b850be 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -21,7 +21,8 @@ _PassErrBody="Введеные пароли не совпадают. Пожал # Basics _SelLang="Выбрать язык" _Lang="Язык" -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="Интернет не найден." _EstCon="Установить соединение?" diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index a8138f3..9e294c4 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -21,7 +21,8 @@ _PassErrBody="Las contraseñas introducidas no coinciden. Vuelva a intentarlo." # Basics _SelLang="Select Language" # translate me ! _Lang="Language" # translate me ! -_Keymap="Keymap" # translate me ! +_Keep="Keep" # translate me ! +_Change="Change" # translate me ! _Change="Would you like to change the settings?" # translate me ! _NoCon="No Internet Detected." # translate me ! _EstCon="Establish connection?" # translate me ! diff --git a/lib/util-menu.sh b/lib/util-menu.sh index 23bd674..7e7dc59 100644 --- a/lib/util-menu.sh +++ b/lib/util-menu.sh @@ -56,27 +56,30 @@ prep_menu() { local PARENT="$FUNCNAME" declare -i loopmenu=1 while ((loopmenu)); do - submenu 6 - DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 0 0 6 \ - "1" "$_DevShowOpt" \ - "2" "$_PrepPartDisk" \ - "3" "$_PrepLUKS" \ - "4" "$_PrepLVM $_PrepLVM2" \ - "5" "$_PrepMntPart" \ - "6" "$_Back" 2>${ANSWER} + submenu 7 + DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 0 0 7 \ + "1" "$_VCKeymapTitle" \ + "2" "$_DevShowOpt" \ + "3" "$_PrepPartDisk" \ + "4" "$_PrepLUKS" \ + "5" "$_PrepLVM $_PrepLVM2" \ + "6" "$_PrepMntPart" \ + "7" "$_Back" 2>${ANSWER} HIGHLIGHT_SUB=$(cat ${ANSWER}) case $(cat ${ANSWER}) in - "1") show_devices + "1") select_keymap + ;; + "2") show_devices ;; - "2") umount_partitions + "3") umount_partitions select_device && create_partitions ;; - "3") luks_menu + "4") luks_menu ;; - "4") lvm_menu + "5") lvm_menu ;; - "5") mount_partitions + "6") mount_partitions ;; *) loopmenu=0 return 0 diff --git a/lib/util.sh b/lib/util.sh index 4c332b1..117eddb 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -218,7 +218,7 @@ set_language() { ini translation "$TRANS" # does user want to change the old settings? - DIALOG " $_SelLang " --yesno "\n${_Lang}: [ ${TRANS^} ]\n${_Keymap}: [ ${KEYMAP} ]\n\n${_Change}\n " 0 0 && select_language + DIALOG " $_SelLang " --yes-label "$_Keep" --no-label "$_Change" --yesno "\n${_Lang}: ${TRANS^}\n " 0 0 || select_language fi # Generate locale and set language @@ -321,12 +321,12 @@ select_language() { FONT="ter-${fl}${fs}n" ini linux.font "$FONT" - - # does user want to change the default keymap? - DIALOG " $_VCKeymapTitle " --yesno "\n${_DefKeymap}:\n\n[ ${KEYMAP} ]\n\n${_Change}\n " --defaultno 0 0 && select_keymap } select_keymap() { + # does user want to change the default settings? + DIALOG " $_VCKeymapTitle " --yes-label "$_Keep" --no-label "$_Change" --yesno "\n${_DefKeymap}\n\n[ ${KEYMAP} ]\n " 0 0 && return 0 + KEYMAPS="" for i in $(ls -R /usr/share/kbd/keymaps | grep "map.gz" | sed 's/\.map\.gz//g' | sort); do KEYMAPS="${KEYMAPS} ${i} -"