From a6790b543ea30e3413e6143fe82443ab2b285b2a Mon Sep 17 00:00:00 2001 From: aliriza Date: Fri, 2 Dec 2022 08:38:59 +0000 Subject: [PATCH] locale fixes --- sys/base/glibc/data/glibc.sysconf | 1 + sys/base/glibc/data/tr_TR | 42 +++++++++++++++---------------- sys/base/glibc/scripts/locale-gen | 1 + sys/base/glibc/ympbuild | 7 ++++++ 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/sys/base/glibc/data/glibc.sysconf b/sys/base/glibc/data/glibc.sysconf index 9b45e25b..4c57885c 100644 --- a/sys/base/glibc/data/glibc.sysconf +++ b/sys/base/glibc/data/glibc.sysconf @@ -4,3 +4,4 @@ /bin/busybox chmod +x -R /sbin /bin/busybox chmod +x -R /usr/bin /bin/busybox chmod +x -R /usr/sbin +/bin/busybox chmod +x -R /usr/libexec diff --git a/sys/base/glibc/data/tr_TR b/sys/base/glibc/data/tr_TR index dd1e9852..0289627f 100644 --- a/sys/base/glibc/data/tr_TR +++ b/sys/base/glibc/data/tr_TR @@ -8,7 +8,7 @@ escape_char / % exempt you from the conditions of the license if your use would % otherwise be governed by that license. -% Turkish Language Locale for Turkey +% Turkish Language Locale for Turkiye % Source: RAP % Address: Sankt Jo//rgens Alle 8 % DK-1615 Ko//benhavn V, Danmark @@ -26,14 +26,14 @@ escape_char / % Corrections by: % 1998-01-11T15:54:39 % Onur Tolga Sehitoglu , -% Dept. of Comp. Eng. METU/Ankara Turkey +% Dept. of Comp. Eng. METU/Ankara Turkiye % 2004-05-29T15:13 % Deniz Akkus Kanca % 2004-10-30T10:28:35 % Nilgn Belma Bugner LC_IDENTIFICATION -title "Turkish locale for Turkey" +title "Turkish locale for Turkiye" source "RAP" address "Sankt Jrgens Alle 8, DK-1615 Kbenhavn V, Danmark" contact "" @@ -41,7 +41,7 @@ email "bug-glibc-locales@gnu.org" tel "" fax "" language "Turkish" -territory "Turkey" +territory "Turkiye" revision "1.0" date "2021-09-27" @@ -133,7 +133,7 @@ LC_MESSAGES yesexpr "^[+1yYeE]" noexpr "^[-0nNhH]" yesstr "evet" -nostr "hayr" +nostr "hayir" END LC_MESSAGES LC_MONETARY @@ -164,37 +164,37 @@ END LC_NUMERIC LC_TIME abday "Paz";"Pzt";"Sal";/ - "r";"Pr";"Cum";"Cts" + "Crs";"Prs";"Cum";"Cts" day "Pazar";/ "Pazartesi";/ - "Sal";/ - "aramba";/ - "Perembe";/ + "Sali";/ + "Carsamba";/ + "Persembe";/ "Cuma";/ "Cumartesi" -abmon "Oca";"ub";/ +abmon "Oca";"Sub";/ "Mar";"Nis";/ "May";"Haz";/ - "Tem";"Au";/ + "Tem";"Agu";/ "Eyl";"Eki";/ "Kas";"Ara" mon "Ocak";/ - "ubat";/ + "Subat";/ "Mart";/ "Nisan";/ - "Mays";/ + "Mayis";/ "Haziran";/ "Temmuz";/ - "Austos";/ - "Eyll";/ + "Agustos";/ + "Eylul";/ "Ekim";/ - "Kasm";/ - "Aralk" + "Kasim";/ + "Aralik" d_t_fmt "%a %d %b %Y %T" date_fmt "%a %d %b %Y %T %Z" d_fmt "%m//%d//%Y" t_fmt "%T" -am_pm "";"S" +am_pm "OO";"OS" t_fmt_ampm "%I:%M:%S %p" week 7;19971130;1 first_weekday 2 @@ -216,7 +216,7 @@ END LC_MEASUREMENT LC_NAME name_fmt "%d%t%g%t%m%t%f" -name_gen "Sayn" +name_gen "Sayin" name_mr "Bay" name_mrs "Bayan" name_miss "Bayan" @@ -225,14 +225,14 @@ END LC_NAME LC_ADDRESS postal_fmt "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N" -country_name "Trkiye" +country_name "Turkiye" country_post "TR" country_car "TR" country_isbn 975 country_num 792 country_ab2 "TR" country_ab3 "TUR" -lang_name "Trke" +lang_name "Turkce" lang_term "tur" lang_lib "tur" lang_ab "tr" diff --git a/sys/base/glibc/scripts/locale-gen b/sys/base/glibc/scripts/locale-gen index c962eb5f..2d5c9c07 100644 --- a/sys/base/glibc/scripts/locale-gen +++ b/sys/base/glibc/scripts/locale-gen @@ -28,6 +28,7 @@ is_entry_ok() { } echo "Generating locales..." +touch /etc/locale.gen while read locale charset; do \ case $locale in \#*) continue;; "") continue;; esac; \ is_entry_ok || continue diff --git a/sys/base/glibc/ympbuild b/sys/base/glibc/ympbuild index 1c359165..5bf260fa 100644 --- a/sys/base/glibc/ympbuild +++ b/sys/base/glibc/ympbuild @@ -116,5 +116,12 @@ package(){ install ../revdep-rebuild ${DESTDIR}/bin/revdep-rebuild # replace buggy turkish format with better one install ../tr_TR ${DESTDIR}/usr/share/i18n/locales/tr_TR + # remove unused languages + for l in ku hy ; do + rm -rf ${DESTDIR}/usr/lib/locale/${i}_* + rm -rf ${DESTDIR/usr/share/locale/${i}_* + rm -rf ${DESTDIR/usr/share/i18n/locales/${i}_* + done + }