final check translatable (video driver check added)

7 years ago · ae6311a6cf
parent a4e74218bb
commit ae6311a6cf
14 changed files with 110 additions and 10 deletions
--- a/data/translations/danish.trans
+++ b/data/translations/danish.trans
@ -414,6 +414,15 @@ _InstMulCustBody="\nIndtast navne for installations-pakker fra Manjaro repo, nav
 _MMTitle="Hovedmenu"
 _MMBody="\nHvert trin skal udføres i den angivne rækkefølge. Trin 4-6 er alle ekstra muligheder. Når trin 1-3 og eventuelle valgfri trin er gennemført vælges 'Færdig' så installationen færdiggøres korrekt.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Close Installer
 _CloseInstBody="Afslut installation?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/dutch.trans
+++ b/data/translations/dutch.trans
@ -413,6 +413,15 @@ _InstMulCustBody="\nGeef de pakketnamen op, met tussenspaties, die je wil instal
 _MMTitle="Hoofd Menu"
 _MMBody="\nElke stap moet IN VOLGORDE uitgevoerd worden. Eenmaal alles is afgewerkt, selecteer 'Klaar' om zo de installatie correct af te ronden.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Sluit Installer
 _CloseInstBody="Installatieprogramma Afsluiten?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/english.trans
+++ b/data/translations/english.trans
@ -412,6 +412,15 @@ _InstMulCustBody="\nEnter the names of packages to install from the Manjaro repo
 _MMTitle="Main Menu"
 _MMBody="\nEach step must be followed IN ORDER. Steps 4-6 are all optional. Once complete, select 'Done' to properly finalise the installation.\n"

+# Final Check
+_BaseCheck="Base is not installed"
+_BootlCheck="Bootloader is not installed"
+_FstabCheck="Fstab has not been generated"
+_GCCheck="No graphics driver has been installed"
+_LocaleCheck="Locales have not been generated"
+_RootCheck="Root password is not set"
+_UserCheck="No user accounts have been generated"
+
 # Close Installer
 _CloseInstBody="Close installer?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"
--- a/data/translations/french.trans
+++ b/data/translations/french.trans
@ -414,6 +414,15 @@ _InstMulCustBody="\nEntrer le nom des paquets à installer depuis les dépôts M
 _MMTitle="Menu principal"
 _MMBody="\nChaque étape doit être suivie DANS L'ORDRE. Les étapes 4-6 sont toutes optionnelles. Une fois effectué, sélectionner « Terminé » pour finaliser correctement l'installation.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Fermer l'installateur
 _CloseInstBody="Fermer l'installateur ?"
 _LogInfo="Désirez-vous copier le journal d'installation sur le système installé ?\nIl sera copié dans" 
--- a/data/translations/german.trans
+++ b/data/translations/german.trans
@ -412,6 +412,15 @@ _InstMulCustBody="\nEnter the names of packages to install from the Manjaro repo
 _MMTitle="Main Menu"
 _MMBody="\nEach step must be followed IN ORDER. Steps 4-6 are all optional. Once complete, select 'Done' to properly finalise the installation.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Close Installer
 _CloseInstBody="Close installer?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/hungarian.trans
+++ b/data/translations/hungarian.trans
@ -407,6 +407,15 @@ _InstMulCustBody="\nSzóközzel elválasztva add meg a telepítendő csomag(ok)
 _MMTitle="Főmenü"
 _MMBody="\nMinden lépést SORRENDBEN kell követned. A nem kötelező lépések opciónálisnak vannak jelölve. Miután elkészültél, válaszd a 'Kész' gombot a telepítés befejezéséhez.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Telepítő bezárása
 _CloseInstBody="Bezárod a telepítőt?"
 _LogInfo="Szeretnéd megtartani a telepítő logfile-ját?\nHa igen, ‘/.m-a.log’-néven lesz elmentve a telepített rendszerben."
--- a/data/translations/italian.trans
+++ b/data/translations/italian.trans
@ -413,6 +413,15 @@ _InstMulCustBody="\nIndicare i nomi dei pacchetti da installare dai repositories
 _MMTitle="Menu Principale"
 _MMBody="\nOgni passaggio deve essere eseguito IN ORDINE. I passaggi 4-6 sono opzionali. Una volta completati, selezionare 'Fatto' per finalizzare correttamente l'installazione.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Chiudere il programma di istallazione
 _CloseInstBody="Chiudere il programma di installazione?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/portuguese.trans
+++ b/data/translations/portuguese.trans
@ -412,6 +412,15 @@ _InstMulCustBody="\nDigite os nomes dos pacotes a serem instalados dos repositó
 _MMTitle="Menu Principal"
 _MMBody="\nCada passo deve ser seguido NA ORDEM. Os passos 4-6 são todos opcionais. Uma vez completado, seleccione 'Pronto' para finalizar correctamente a instalação.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Fechar o instalador
 _CloseInstBody="Fechar o instalador?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/portuguese_brasil.trans
+++ b/data/translations/portuguese_brasil.trans
@ -413,6 +413,15 @@ _InstMulCustBody="\nDigite os nomes dos pacotes a serem instalados dos repositó
 _MMTitle="Menu principal"
 _MMBody="\nCada passo deve ser seguido NA ORDEM. Os passos 4-6 são todos opcionais. Uma vez completado, selecione 'Pronto' para finalizar corretamente a instalação.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Fechar o instalador
 _CloseInstBody="Fechar o instalador?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/russian.trans
+++ b/data/translations/russian.trans
@ -413,6 +413,15 @@ _InstMulCustBody="\nВведите названия пакетов для уст
 _MMTitle="Главное меню"
 _MMBody="\nКаждый шаг должен идти ПО ПОРЯДКУ. Шаги 4-6 опциональны. После завершения, выберите 'Готово' для правильного завершения процесса установки.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Close Installer
 _CloseInstBody="Закрыть установщик?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/data/translations/spanish.trans
+++ b/data/translations/spanish.trans
@ -413,6 +413,15 @@ _InstMulCustBody="\nIntroduzca los nombres de los paquetes a instalar de los rep
 _MMTitle="Menú principal"
 _MMBody="\nCada paso se ha de seguir en ESTRICTO ORDEN. Los pasos 4 a 6 son opcionales. Una vez que haya terminado, seleccione 'Finalizar' para terminar la instalación correctamente.\n"

+# Final Check
+_BaseCheck="Base is not installed"                   # translate me !
+_BootlCheck="Bootloader is not installed"            # translate me !
+_FstabCheck="Fstab has not been generated"           # translate me !
+_GCCheck="No graphics driver has been installed"     # translate me !
+_LocaleCheck="Locales have not been generated"       # translate me !
+_RootCheck="Root password is not set"                # translate me !
+_UserCheck="No user accounts have been generated"    # translate me !
+
 # Cerrar instalador
 _CloseInstBody="¿Desea cerrar el instalador?"
 _LogInfo="Would you like to copy the installation-log to the installed system?\nIt will be copied to"   # translate me !
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@ -94,7 +94,6 @@ enable_services() {
 }

 install_extra() {
-
    # Offer to install various "common" packages.
    DIALOG " $_InstComTitle " --checklist "\n$_InstComBody\n\n$_UseSpaceBar" 0 50 20 \
      "manjaro-settings-manager" "-" off \
--- a/lib/util-menu.sh
+++ b/lib/util-menu.sh
@ -172,9 +172,9 @@ config_base_menu() {
 }

 install_drivers_menu() {
+    HIGHLIGHT_SUB=1
    declare -i loopmenu=1
    while ((loopmenu)); do
-        submenu 3
        DIALOG " $_InstDrvTitle " --default-item ${HIGHLIGHT_SUB} --menu "$_InstDrvBody" 0 0 3 \
          "1" "$_InstGrMenuTitle|>" \
          "2" "$_InstNWDrv" \
@ -182,8 +182,10 @@ install_drivers_menu() {

        case $(cat ${ANSWER}) in
            "1") install_graphics_menu
+                HIGHLIGHT_SUB=2
                ;;
            "2") setup_network_drivers
+                HIGHLIGHT_SUB=3
                ;;
            *) HIGHLIGHT_SUB=5
                loopmenu=0
--- a/lib/util.sh
+++ b/lib/util.sh
@ -442,29 +442,29 @@ final_check() {

    # Check if base is installed
    if [[ ! -e /mnt/.base_installed ]]; then
-        echo "- Base is not installed" >> ${CHECKLIST}
+        echo "- $_BaseCheck" >> ${CHECKLIST}
    else
        # Check if bootloader is installed
        if [[ $SYSTEM == "BIOS" ]]; then
-            arch_chroot "pacman -Qq grub" &> /dev/null || echo "- Bootloader is not installed" >> ${CHECKLIST}
+            arch_chroot "pacman -Qq grub" &> /dev/null || echo "- $_BootlCheck" >> ${CHECKLIST}
        else
-            [[ -e /mnt/boot/efi/EFI/manjaro_grub/grubx64.efi ]] || [[ -e /mnt/boot/EFI/manjaro_grub/grubx64.efi ]] || echo "- Bootloader is not installed" >> ${CHECKLIST}
+            [[ -e /mnt/boot/efi/EFI/manjaro_grub/grubx64.efi ]] || [[ -e /mnt/boot/EFI/manjaro_grub/grubx64.efi ]] || echo "- $_BootlCheck" >> ${CHECKLIST}
        fi

        # Check if fstab is generated
-        $(grep -qv '^#' /mnt/etc/fstab 2>/dev/null) || echo "- Fstab has not been generated" >> ${CHECKLIST}
+        $(grep -qv '^#' /mnt/etc/fstab 2>/dev/null) || echo "- $_FstabCheck" >> ${CHECKLIST}

        # Check if video-driver has been installed
-        [[ ! -e /mnt/.video_installed ]] && echo "- No graphics driver has been installed" >> ${CHECKLIST}
+        [[ ! -e /mnt/.video_installed ]] && echo "- $_GCCheck" >> ${CHECKLIST}

        # Check if locales have been generated
-        [[ $(manjaro-chroot /mnt 'locale -a' | wc -l) -ge '3' ]] || echo "- Locales have not been generated" >> ${CHECKLIST}
+        [[ $(manjaro-chroot /mnt 'locale -a' | wc -l) -ge '3' ]] || echo "- $_LocaleCheck" >> ${CHECKLIST}

        # Check if root password has been set
-        manjaro-chroot /mnt 'passwd --status root' | cut -d' ' -f2 | grep -q 'NP' && echo "- Root password is not set" >> ${CHECKLIST}
+        manjaro-chroot /mnt 'passwd --status root' | cut -d' ' -f2 | grep -q 'NP' && echo "- $_RootCheck" >> ${CHECKLIST}

        # check if user account has been generated
-        [[ $(ls /mnt/home 2>/dev/null) == "" ]] && echo "- No user accounts have been generated" >> ${CHECKLIST}
+        [[ $(ls /mnt/home 2>/dev/null) == "" ]] && echo "- $_UserCheck" >> ${CHECKLIST}
    fi
 }