Commit 3b35eed0 authored by Bernhard Landauer's avatar Bernhard Landauer
Browse files

reintroduce keymap settings in prep_menu

parent 0d149156
......@@ -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?"
......
......@@ -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 !
......
......@@ -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)
......
......@@ -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 ?"
......
......@@ -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?"
......
......@@ -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?"
......
......@@ -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 !
......
......@@ -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 !
......
......@@ -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 !
......
......@@ -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="Установить соединение?"
......
......@@ -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 !
......
......@@ -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
......
......@@ -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} -"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment