From 4b37154a073108ca551c728887c894695b05c680 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Wed, 5 Jun 2019 12:06:26 +0300 Subject: [PATCH] Set locales more completely --- data/translations/danish.trans | 2 ++ data/translations/dutch.trans | 2 ++ data/translations/english.trans | 7 +++++-- data/translations/french.trans | 2 ++ data/translations/german.trans | 4 +++- data/translations/hungarian.trans | 2 ++ data/translations/italian.trans | 2 ++ data/translations/polish.trans | 2 ++ data/translations/portuguese.trans | 4 +++- data/translations/portuguese_brasil.trans | 2 ++ data/translations/russian.trans | 2 ++ data/translations/spanish.trans | 2 ++ data/translations/turkish.trans | 2 ++ data/translations/ukrainian.trans | 4 +++- lib/util-base.sh | 18 ++++++++++++++++-- 15 files changed, 50 insertions(+), 7 deletions(-) diff --git a/data/translations/danish.trans b/data/translations/danish.trans index 58feb75..59a6525 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -215,6 +215,7 @@ _XkbmapBody="Vælg Skrivebord Tastatur Layout" # Set Locale _localeBody="Region bruges til afgøre hvilket sprog der bruges, tid og dato formater mm.\n\nFormatet er sprog_LAND (f.eks. da_DK er dansk, Danmark; en_DK engelsk, Danmark)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Set Timezone _TimeZBody="Tidszone bruges til at vise dit systems ur" @@ -421,6 +422,7 @@ _ConfBseFstab="Opret FSTAB" _ConfBseHost="Opsæt Computernavn" _ConfBseTimeHC="Opsæt Tidszone og Ur" _ConfBseSysLoc="Opsæt Systemsprog" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Kør Mkinitcpio" _RunUpGrub="Opdater GRUB" diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index bb502ce..93c135a 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -213,6 +213,7 @@ _XkbmapBody="Selecteer de toetsenbordindeling voor Desktop Suite." # Stel de systeemtaal in _localeBody="Landinstellingen bepalen welke talen en hoe tijd en datum enz... worden weergegeven.\n\nHet formaat is taal_LAND (bijvoorbeeld nl_BE is nederlands, België; en_GB is engels, Groot-Brittannië)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Stel de tijdzone in _TimeZBody="Aan de hand van de tijdzone wordt uw systeemklok correct ingesteld." @@ -419,6 +420,7 @@ _ConfBseFstab="Genereer FSTAB" _ConfBseHost="Stel Host-naam in" _ConfBseTimeHC="Stel Tijdzone en klok in" _ConfBseSysLoc="Stel de Systeemtaal in" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Voer Mkinitcpio uit" _RunUpGrub="Update GRUB" diff --git a/data/translations/english.trans b/data/translations/english.trans index 87f6329..924b996 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -26,7 +26,8 @@ _Change="Change" _NoCon="No Internet Detected." _EstCon="Establish connection?" _Config="Configure" -_ApplySet="Apply language settings ..." +_ApplySet="Apply +uage settings ..." _ChMenu="Select Menu" _ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." @@ -211,7 +212,8 @@ _VCKeymapBody="A virtual console is a shell prompt in a non-graphical environmen _XkbmapBody="Select Desktop Environment Keymap." # Set Locale -_localeBody="Locales determine the languages displayed, time and date formats, etc.\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." +_localeBody="Locales determine the time and date formats, etc.\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." # Set Timezone _TimeZBody="The time zone is used to correctly set your system clock." @@ -419,6 +421,7 @@ _ConfBseFstab="Generate FSTAB" _ConfBseHost="Set Hostname" _ConfBseTimeHC="Set Timezone and Clock" _ConfBseSysLoc="Set System Locale" +_ConfBseSysLang="Set System Language" _RunMkinit="Run Mkinitcpio" _RunUpGrub="Update GRUB" diff --git a/data/translations/french.trans b/data/translations/french.trans index 91e435a..569d70c 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -216,6 +216,7 @@ _XkbmapBody="Sélectionner l'agencement de l'environnement de bureau." # Définir les paramètres régionaux _localeBody="Les locales déterminent les langages affichées, les formats de date et heure, etc....\n\nLe format de langue se présente ainsi : langage_PAYS (ex : fr_FR pour la France ; fr_BE pour la Belgique ; fr_CA pour le Canada ; fr_LU pour le Luxembourg, etc...)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Définir le fuseau horaire _TimeZBody="Le fuseau horaire est utilisé pour configurer correctement votre horloge système." @@ -423,6 +424,7 @@ _ConfBseFstab="Générer FSTAB" _ConfBseHost="Définir le nom d'hôte" _ConfBseTimeHC="Définir l'heure et le fuseau horaire" _ConfBseSysLoc="Définir les paramètres régionaux" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Exécuter Mkinitcpio" _RunUpGrub="Mettre à jour GRUB" diff --git a/data/translations/german.trans b/data/translations/german.trans index a63be34..dc5ba1b 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -212,6 +212,7 @@ _XkbmapBody="Wählen Sie das Tastaturlayout für die Desktop-Umgebung." # Set Locale _localeBody="Die Locale bestimmt die angezeigte Sprache, Zeit-, Datum-, Zahlen-Format etc.\n\nDas Format ist nach dem Schema sprache_LAND (z.B. de_DE ist Deutsch, Deutschland; de_AT ist Deutsch, Österreich)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Set Timezone _TimeZBody="Die Zeitzone wird genutzt, um die System-Uhr korrekt einzustellen." @@ -418,6 +419,7 @@ _ConfBseFstab="Generate FSTAB" # translate me ! _ConfBseHost="Set Hostname" # translate me ! _ConfBseTimeHC="Set Timezone and Clock" # translate me ! _ConfBseSysLoc="Set System Locale" # translate me ! +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Run Mkinitcpio" # translate me ! _RunUpGrub="GRUB aktualisieren" @@ -543,4 +545,4 @@ _DataRecMenu="Data recovery" # translate me ! _DataRecBody="Various tools for data backup and recovery" # translate me ! _HostCache="Choose pacman cache" # translate me ! -_HostCacheBody="Do you want to use the pacman cache of the running system instead of the installation target? This can reduce the size of the required downloads in the installation." # translate me ! \ No newline at end of file +_HostCacheBody="Do you want to use the pacman cache of the running system instead of the installation target? This can reduce the size of the required downloads in the installation." # translate me ! diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index b92dd98..94413a0 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -213,6 +213,7 @@ _XkbmapBody="Válaszd ki az asztali környezet billentyűzetkiosztását." # Helyi nyelv beállítása _localeBody="A helyi nyelv határozza meg többek között a megjelenítendő nyelvet és az idő/dátum formátumot.\n\nA formátum a következő: nyelv_ORSZÁG (pl. en_US az amerikai angol, hu_HU a magyar)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Időzóna beállítása _TimeZBody="Az időzóna beállítása lehetővé teszi a rendszeróra helyes beállítását." @@ -420,6 +421,7 @@ _ConfBseFstab="FSTAB generálása" _ConfBseHost="Gépnév beállítása" _ConfBseTimeHC="Időzóna és óra beállítása" _ConfBseSysLoc="Helyi nyelv beállítása" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Mkinitcpio futtatása" _RunUpGrub="A Grub (rendszertöltő) frissítése" diff --git a/data/translations/italian.trans b/data/translations/italian.trans index fd00018..6743f69 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -214,6 +214,7 @@ _XkbmapBody="Seleziona la disposizione della testiera." # Impostazione Localizzazione _localeBody="I Locales determinano la lingua mostrata, i formati di data e ora, ecc.\n\nIl formato è lingua_NAZIONE (en_US per l'inglese, Sati Uniti; en_GB per inglese, Gran Bretagna)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Impostazione fuso orario _TimeZBody="Il fuso orario è utilizzato per impostare correttamente l'ora del sistema." @@ -420,6 +421,7 @@ _ConfBseFstab="Genera FSTAB" _ConfBseHost="Imposta Hostname" _ConfBseTimeHC="Imposta Timezone e Data/Ora" _ConfBseSysLoc="Imposta il linguaggio del sistema" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Eseguire Mkinitcpio" _RunUpGrub="Update GRUB" diff --git a/data/translations/polish.trans b/data/translations/polish.trans index 13f319c..447251b 100644 --- a/data/translations/polish.trans +++ b/data/translations/polish.trans @@ -212,6 +212,7 @@ _XkbmapBody="Wybierz mapowanie klawiszy dla środowiska graficznego." # Set Locale _localeBody="Lokalizacje określają wyświetlane języki, godziny, daty, itd.\n\nStosowany format to język_KRAJ (na przykład en_US to angielski, Stany Zjednoczone; en_GB to angielski, Wielka Brytania)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Set Timezone _TimeZBody="Strefa czasowa służy do prawidłowego ustawienia zegara systemowego." @@ -419,6 +420,7 @@ _ConfBseFstab="Generuj FSTAB" _ConfBseHost="Ustaw nazwę hosta" _ConfBseTimeHC="Ustaw datę i czas" _ConfBseSysLoc="Ustal lokalizację systemu" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Uruchom Mkinitcpio" _RunUpGrub="Zaktualizuj GRUB" diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index 3ad0687..d0d0335 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -212,6 +212,7 @@ _XkbmapBody="Seleccionar layout de teclado do ambiente de desktop." # Definir Local _localeBody="A localização (locale) determina o idioma a ser exibido, os formatos de data e hora, etc...\n\nO formato é idioma_PAÍS (ex.: en_US é inglês, Estados Unidos; pt_PT é português, Portugal)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Definir Fuso horário _TimeZBody="O fuso horário é usado para definir correctamente o relógio do sistema." @@ -418,6 +419,7 @@ _ConfBseFstab="Gerar FSTAB" _ConfBseHost="Definir Nome da Máquina" _ConfBseTimeHC="Definir Fuso horário e Relógio" _ConfBseSysLoc="Definir a Localização do Sistema" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Executar Mkinitcpio" _RunUpGrub="Update GRUB" # translate me ! @@ -545,4 +547,4 @@ _DataRecMenu="Data recovery" # translate me ! _DataRecBody="Various tools for data backup and recovery" # translate me ! _HostCache="Choose pacman cache" # translate me ! -_HostCacheBody="Do you want to use the pacman cache of the running system instead of the installation target? This can reduce the size of the required downloads in the installation." # translate me ! \ No newline at end of file +_HostCacheBody="Do you want to use the pacman cache of the running system instead of the installation target? This can reduce the size of the required downloads in the installation." # translate me ! diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 06b0c7e..5ae7956 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -214,6 +214,7 @@ _XkbmapBody="Selecionar layout de teclado do ambiente de desktop." # Definir Local _localeBody="A localização (locale) determina o idioma a ser exibido, os formatos de data e hora, etc...\n\nO formato é idioma_PAÍS (ex.: en_US é inglês, Estados Unidos; pt_BR é português, Brasil)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Definir fuso horário _TimeZBody="O fuso horário é usado para definir corretamente o relógio do sistema." @@ -421,6 +422,7 @@ _ConfBseFstab="Gerar FSTAB" _ConfBseHost="Definir nome da máquina" _ConfBseTimeHC="Definir fuso horário e Relógio" _ConfBseSysLoc="Definir a localização do sistema" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Executar mkinitcpio" _RunUpGrub="Atualizar GRUB" diff --git a/data/translations/russian.trans b/data/translations/russian.trans index 2494731..746c9be 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -217,6 +217,7 @@ _XkbmapBody="Настроить раскладку среды рабочего # Set Locale _localeBody="Локаль определяет отображаемый язык, форматы даты и времени, и т.д.\n\nИмеет следующий формат: язык_СТРАНА (напр. en_US - английский, Соединенные Штаты; en_GB - английский, Великобритания)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Set Timezone _TimeZBody="Часовой пояс используется для корректной установки системного времени." @@ -423,6 +424,7 @@ _ConfBseFstab="Сгенерировать FSTAB" _ConfBseHost="Установить имя хоста" _ConfBseTimeHC="Настроить часовой пояс и время" _ConfBseSysLoc="Установить язык системы" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Запустить Mkinitcpio" _RunUpGrub="Обновление GRUB" diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index 2aca938..5fb5d0d 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -213,6 +213,7 @@ _XkbmapBody="Seleccionar distribución de teclado del entorno de escritorio." # Seleccionar localización _localeBody="La localización (locale) determina los idiomas para mostrar, los formatos de fecha y hora, etc.\n\nEl formato es idioma_PAÍS (e.g es_ES significa español, España; es_MX significa español, México)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Establecer zona horaria _TimeZBody="La zona horaria es usada para ajustar el reloj del sistema correctamente." @@ -419,6 +420,7 @@ _ConfBseFstab="Generar FSTAB" _ConfBseHost="Establecer nombre del equipo" _ConfBseTimeHC="Establecer zona horaria y reloj" _ConfBseSysLoc="Establecer idioma del sistema" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Ejecutar Mkinitcpio" _RunUpGrub="Actualizar GRUB" diff --git a/data/translations/turkish.trans b/data/translations/turkish.trans index ebbaf57..478ad1d 100755 --- a/data/translations/turkish.trans +++ b/data/translations/turkish.trans @@ -164,6 +164,7 @@ _XkbmapBody="Masaüstü Ortamı için klavye düzeni seçin." # Set Locale _localeBody="Yerel ayarlar, görüntülenen dilleri, saat ve tarih biçimlerini vb. belirler.\n\nFormatı şu şekildedir dil_ÜLKE (örn. tr_TR, en_US, en_GB)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Set Timezone _TimeZBody="Saat dilimi, sistem saatinizi doğru ayarlamak için kullanılır." @@ -371,6 +372,7 @@ _ConfBseFstab="FSTAB Oluştur" _ConfBseHost="Bilgisayar Adı Tanımla" _ConfBseTimeHC="Saat Dilimi ve Saati Ayarla" _ConfBseSysLoc="Sistem Yerel Ayarı Ayarla" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Mkinitcpio Çalıştır" _RunUpGrub="GRUB Güncelle" diff --git a/data/translations/ukrainian.trans b/data/translations/ukrainian.trans index d614c59..3c88b6e 100644 --- a/data/translations/ukrainian.trans +++ b/data/translations/ukrainian.trans @@ -214,6 +214,7 @@ _XkbmapBody="Налаштувати розкладку середовища ст # Set Locale _localeBody="Локалі визначають відображені мови, формати дати та час, и т.д.\n\nМає наступний формат: мова_КРАЇНА (напр. en_US - англійський, Сполучені Штати; en_GB - англійский, Велика Британія)." +_langBody="Choose the system language. English is recommended for easier troubleshooting\n\nThe format is language_COUNTRY (e.g. en_US is english, United States; en_GB is english, Great Britain)." #translate me! # Set Timezone _TimeZBody="Часовий пояс використовується для коректної установки системного часу." @@ -420,6 +421,7 @@ _ConfBseFstab="Згенерувати FSTAB" _ConfBseHost="Встановити ім'я хоста" _ConfBseTimeHC="Налаштувати часовий пояс та час" _ConfBseSysLoc="Встановити мову системи" +_ConfBseSysLang="Set System Language" #translate me! _RunMkinit="Запустити Mkinitcpio" _RunUpGrub="Оновлення GRUB" @@ -547,4 +549,4 @@ _DataRecMenu="Відновлення даних" _DataRecBody="Різні утиліти для копіювання та відновлення даних" _HostCache="Виберіть кеш pacman " -_HostCacheBody="Ви хочете використовувати кеш pacman з працюючої системи, замість кешу системи цільового встановлення? Це може зменшити розмір необхідних завантажень в процесі встановлення." \ No newline at end of file +_HostCacheBody="Ви хочете використовувати кеш pacman з працюючої системи, замість кешу системи цільового встановлення? Це може зменшити розмір необхідних завантажень в процесі встановлення." diff --git a/lib/util-base.sh b/lib/util-base.sh index 1e3d92d..8de7590 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -835,13 +835,27 @@ set_locale() { LOCALES="${LOCALES} ${i} -" done - DIALOG " $_ConfBseSysLoc " --menu "\n$_localeBody\n " 0 0 12 ${LOCALES} 2>${ANSWER} || return 0 + # Set the system language + DIALOG " $_ConfBseSysLang " --default-item "${CURR_LOCALE}" --menu "\n$_langBody\n " 0 0 12 ${LOCALES} 2>${ANSWER} || return 0 LOCALE=$(cat ${ANSWER}) - echo "LANG=\"${LOCALE}\"" > ${MOUNTPOINT}/etc/locale.conf + echo "LC_MESSAGES=\"${LOCALE}\"" >> ${MOUNTPOINT}/etc/locale.conf sed -i "s/#${LOCALE}/${LOCALE}/" ${MOUNTPOINT}/etc/locale.gen 2>$ERR + # Set system measurements + DIALOG " $_ConfBseSysLoc " --default-item "${LOCALE}" --menu "\n$_localeBody\n " 0 0 12 ${LOCALES} 2>${ANSWER} || return 0 + + LOCALE2=$(cat ${ANSWER}) + echo "LC_MONETARY=\"${LOCALE2}\"" >> ${MOUNTPOINT}/etc/locale.conf + echo "LC_PAPER=\"${LOCALE2}\"" >> ${MOUNTPOINT}/etc/locale.conf + echo "LC_MEASUREMENT=\"${LOCALE2}\"" >> ${MOUNTPOINT}/etc/locale.conf + echo "LC_ADDRESS=\"${LOCALE2}\"" >> ${MOUNTPOINT}/etc/locale.conf + echo "LC_TIME=\"${LOCALE2}\"" >> ${MOUNTPOINT}/etc/locale.conf + sed -i "s/#${LOCALE2}/${LOCALE2}/" ${MOUNTPOINT}/etc/locale.gen 2>$ERR + + # Generate locales arch_chroot "locale-gen" >/dev/null 2>$ERR & + check_for_error "$FUNCNAME" "$?" ini linux.locale "$LOCALE"