From df5c066d7cc5ee642e1d24560472af6d3519a39b Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 24 Sep 2023 22:24:16 +0200 Subject: [PATCH] add turkish to supported glibc --- usr/bin/archboot-localize.sh | 7 +++++-- usr/lib/archboot/container.sh | 2 +- usr/lib/archboot/update/desktop.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/usr/bin/archboot-localize.sh b/usr/bin/archboot-localize.sh index 371be8e35..8ba5207af 100755 --- a/usr/bin/archboot-localize.sh +++ b/usr/bin/archboot-localize.sh @@ -9,7 +9,7 @@ _locale_menu() { while [[ -z "${_LOCALE}" ]]; do _LOCALE="" _LOCALES="en_US English de_DE German es_ES Spanish fr_FR French pt_PT Portuguese OTHER Other" - _OTHER_LOCALES="be_BY Belarusian bg_BG Bulgarian cs_CZ Czech da_DK Dansk fi_FI Finnish el_GR Greek hu_HU Hungarian it_IT Italian lt_LT Lithuanian lv_LV Latvian mk_MK Macedonian nl_NL Dutch nn_NO Norwegian pl_PL Polish ro_RO Romanian ru_RU Russian sk_SK Slovak sr_RS Serbian sv_SE Swedish uk_UA Ukrainian" + _OTHER_LOCALES="be_BY Belarusian bg_BG Bulgarian cs_CZ Czech da_DK Dansk fi_FI Finnish el_GR Greek hu_HU Hungarian it_IT Italian lt_LT Lithuanian lv_LV Latvian mk_MK Macedonian nl_NL Dutch nn_NO Norwegian pl_PL Polish ro_RO Romanian ru_RU Russian sk_SK Slovak sr_RS Serbian sv_SE Swedish tr_TR Turkish uk_UA Ukrainian" _CANCEL="" #shellcheck disable=SC2086 _dialog --cancel-label "${_LABEL}" --title " Locale " --menu "" 12 35 5 ${_LOCALES} 2>${_ANSWER} || _abort @@ -27,7 +27,7 @@ _locale_menu() { _vconsole_keymap() { _LIST_MAPS="localectl list-keymaps --no-pager" - _KEYMAPS="us de es fr pt be bg br ca cz dk et fi gr hu it lt lv mk nl no pl ro ru sk sr sv ua" + _KEYMAPS="us de es fr pt be bg br ca cz dk et fi gr hu it lt lv mk nl no pl ro ru sk sr sv tr ua" _LOW_LOCALE="$(echo "${_LOCALE}" | tr "[:upper:]" "[:lower:]")" for i in ${_KEYMAPS}; do echo "${_LOW_LOCALE}" | grep -q "${i}" && _DETECTED_KEYMAP="${i}" @@ -49,6 +49,9 @@ _vconsole_keymap() { # Serbian elif ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep -q "^${_DETECTED_KEYMAP}-latin"; then _KEYMAP="$(${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "^${_DETECTED_KEYMAP}-latin$")" + # Turkish + elif ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep -q "^${_DETECTED_KEYMAP}q$"; then + _KEYMAP="$(${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "^${_DETECTED_KEYMAP}q$")" # Ukrainian elif ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep -q "^${_DETECTED_KEYMAP}-utf"; then _KEYMAP="$(${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "^${_DETECTED_KEYMAP}-utf$")" diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index b86916959..7910d4c5b 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -70,7 +70,7 @@ _clean_container() { find "${1}"/usr/share/locale/ -mindepth 2 ! -path '*/be/*' ! -path '*/bg/*' ! -path '*/cs/*' ! -path '*/da/*' ! -path '*/de/*' \ ! -path '*/en/*' ! -path '*/el/*' ! -path '*/es/*' ! -path '*/fi/*' ! -path '*/fr/*' ! -path '*/hu/*' ! -path '*/it/*' \ ! -path '*/lt/*' ! -path '*/lv/*' ! -path '*/mk/*' ! -path '*/nl/*' ! -path '*/nn/*' ! -path '*/pl/*' ! -path '*/pt/*' \ - ! -path '*/ro/*' ! -path '*/ru/*' ! -path '*/sk/*' ! -path '*/sr/*' ! -path '*/sv/*' ! -path '*/uk/*' -delete &>"${_NO_LOG}" + ! -path '*/ro/*' ! -path '*/ru/*' ! -path '*/sk/*' ! -path '*/sr/*' ! -path '*/sv/*' ! -path '*/tr/*' ! -path '*/uk/*' -delete &>"${_NO_LOG}" find "${1}"/usr/share/i18n/charmaps ! -name 'UTF-8.gz' -delete &>"${_NO_LOG}" fi } diff --git a/usr/lib/archboot/update/desktop.sh b/usr/lib/archboot/update/desktop.sh index 77b2dfbeb..1636fb03f 100644 --- a/usr/lib/archboot/update/desktop.sh +++ b/usr/lib/archboot/update/desktop.sh @@ -43,7 +43,7 @@ _install_graphic() { done # install firefox langpacks if [[ "${_STANDARD_BROWSER}" == "firefox" ]]; then - _LANG="be bg cs da de el fi fr hu it lt lv mk nl nn pl ro ru sk sr uk" + _LANG="be bg cs da de el fi fr hu it lt lv mk nl nn pl ro ru sk sr tr uk" for i in ${_LANG}; do if grep -q "${i}" /etc/locale.conf; then pacman -S firefox-i18n-"${i}" --noconfirm &>"${_LOG}" @@ -97,7 +97,7 @@ _prepare_graphic() { ! -path '*/fi/*' ! -path '*/fr/*' ! -path '*/hu/*' ! -path '*/it/*' ! -path '*/lt/*' \ ! -path '*/lv/*' ! -path '*/mk/*' ! -path '*/nl/*' ! -path '*/nn/*' ! -path '*/pl/*' \ ! -path '*/pt/*' ! -path '*/ro/*' ! -path '*/ru/*' ! -path '*/sk/*' ! -path '*/sr/*' \ - ! -path '*/sv/*' ! -path '*/uk/*' -delete &>"${_NO_LOG}" + ! -path '*/sv/*' ! -path '*/tr/*' ! -path '*/uk/*' -delete &>"${_NO_LOG}" find /usr/share/i18n/charmaps ! -name 'UTF-8.gz' -delete &>"${_NO_LOG}" fi _progress "98" "Restart dbus..."