wok-current rev 16433
glibc-base: Russian locale moved to "locale-ru"; slitaz-i18n: more locales to choose; locale-ru: some changes in the icons.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Apr 18 13:49:58 2014 +0300 (2014-04-18) |
| parents | ad0058d03f19 |
| children | a174d1a04edd |
| files | glibc-base/receipt glibc-base/stuff/i486-files.list locale-ru/receipt locale-ru/stuff/16x16/RU.png locale-ru/stuff/16x16/UA.png locale-ru/stuff/16x16/US.png locale-ru/stuff/48x48/RU.png locale-ru/stuff/48x48/UA.png locale-ru/stuff/48x48/US.png locale-ru/stuff/ru.png locale-ru/stuff/ua.png locale-ru/stuff/us.png slitaz-i18n/stuff/locale-pack.conf slitaz-i18n/stuff/locale-pack.functions |
line diff
1.1 --- a/glibc-base/receipt Fri Apr 18 10:26:47 2014 +0000 1.2 +++ b/glibc-base/receipt Fri Apr 18 13:49:58 2014 +0300 1.3 @@ -11,7 +11,7 @@ 1.4 HOST_ARCH="i486 arm x86_64" 1.5 1.6 # Locales include by default, other locales are in: glibc-locale 1.7 -DEFAULT_LOCALE="de_DE en_US en_GB es_ES fr_FR it_IT pt_BR pt_PT ru_RU" 1.8 +DEFAULT_LOCALE="de_DE en_US en_GB es_ES fr_FR it_IT pt_BR pt_PT" 1.9 1.10 # Handle multiarch compilation. 1.11 case "$ARCH" in 1.12 @@ -34,7 +34,7 @@ 1.13 get_locales() 1.14 { 1.15 local path=$1 1.16 - for i in $DEFAULT_LOCALE 1.17 + for i in $DEFAULT_LOCALE 1.18 do 1.19 cp $install/$path/i18n/locales/$i $fs/usr/share/i18n/locales 1.20 done 1.21 @@ -57,9 +57,9 @@ 1.22 1.23 # /usr/{bin,share} /usr/lib/gconv 1.24 for file in $(cat $stuff/arm-files.list) 1.25 - do 1.26 - cp -a ${install}$file ${fs}$file 1.27 - done 1.28 + do 1.29 + cp -a ${install}$file ${fs}$file 1.30 + done 1.31 1.32 # libs 1.33 for lib in libcrypt libm libc libresolv librt libutil libpthread \ 1.34 @@ -84,9 +84,9 @@ 1.35 1.36 # /usr/{bin,share} /usr/lib/gconv 1.37 for file in $(cat $stuff/arm-files.list) 1.38 - do 1.39 - cp -a ${install}$file ${fs}/usr/$file 1.40 - done 1.41 + do 1.42 + cp -a ${install}$file ${fs}/usr/$file 1.43 + done 1.44 1.45 # /lib 1.46 for lib in libcrypt libm libc libresolv librt libutil libpthread \ 1.47 @@ -105,13 +105,13 @@ 1.48 sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so 1.49 sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libpthread.so ;; 1.50 *) 1.51 - # Copy all files specified in stuff/files.list. We get the files 1.52 - # from glibc package. 1.53 - for file in $(cat $stuff/wanted-files.list) 1.54 - do 1.55 - cp -a ${install}$file ${fs}$file 1.56 - done 1.57 - get_locales "usr/share" 1.58 + # Copy all files specified in stuff/files.list. We get the files 1.59 + # from glibc package. 1.60 + for file in $(cat $stuff/wanted-files.list) 1.61 + do 1.62 + cp -a ${install}$file ${fs}$file 1.63 + done 1.64 + get_locales "usr/share" 1.65 esac 1.66 } 1.67
2.1 --- a/glibc-base/stuff/i486-files.list Fri Apr 18 10:26:47 2014 +0000 2.2 +++ b/glibc-base/stuff/i486-files.list Fri Apr 18 13:49:58 2014 +0300 2.3 @@ -42,7 +42,6 @@ 2.4 /usr/share/i18n/locales/translit_wide 2.5 2.6 /usr/share/zoneinfo/Europe/Madrid 2.7 -/usr/share/zoneinfo/Europe/Moscow 2.8 /usr/share/zoneinfo/Europe/London 2.9 /usr/share/zoneinfo/Europe/Zurich 2.10 /usr/share/zoneinfo/Europe/Paris
3.1 --- a/locale-ru/receipt Fri Apr 18 10:26:47 2014 +0000 3.2 +++ b/locale-ru/receipt Fri Apr 18 13:49:58 2014 +0300 3.3 @@ -20,10 +20,24 @@ 3.4 . $WOK/slitaz-i18n/stuff/locale-pack.conf 3.5 get_locale 3.6 3.7 - mkdir -p $fs/usr/share/lxpanel/images/xkb-flags 3.8 - for i in us.png ru.png ua.png LICENSE.txt; do 3.9 - install -m644 $stuff/$i $fs/usr/share/lxpanel/images/xkb-flags/$i 3.10 + # country flags used in the some dialogs 3.11 + usih=usr/share/icons/hicolor 3.12 + for size in 16x16 48x48; do 3.13 + mkdir -p $fs/$usih/$size/intl 3.14 + cp -a $stuff/$size/* $fs/$usih/$size/intl 3.15 done 3.16 + 3.17 + # keyboard flags for default lxpanel keyboard applet 3.18 + uslix=usr/share/lxpanel/images/xkb-flags 3.19 + mkdir -p $fs/$uslix 3.20 + for i in us ru ua; do 3.21 + ln -s /$usih/16x16/intl/$(echo $i | tr a-z A-Z).png $fs/$uslix/$i.png 3.22 + done 3.23 + 3.24 + # above icons credits 3.25 + fusl=$fs/usr/share/licenses 3.26 + mkdir -p $fusl 3.27 + cp -a $stuff/LICENSE.txt $fusl/gosquared.txt 3.28 } 3.29 3.30 # Back to C if it's the last used locale.
4.1 Binary file locale-ru/stuff/16x16/RU.png has changed
5.1 Binary file locale-ru/stuff/16x16/UA.png has changed
6.1 Binary file locale-ru/stuff/16x16/US.png has changed
7.1 Binary file locale-ru/stuff/48x48/RU.png has changed
8.1 Binary file locale-ru/stuff/48x48/UA.png has changed
9.1 Binary file locale-ru/stuff/48x48/US.png has changed
10.1 Binary file locale-ru/stuff/ru.png has changed
11.1 Binary file locale-ru/stuff/ua.png has changed
12.1 Binary file locale-ru/stuff/us.png has changed
13.1 --- a/slitaz-i18n/stuff/locale-pack.conf Fri Apr 18 10:26:47 2014 +0000 13.2 +++ b/slitaz-i18n/stuff/locale-pack.conf Fri Apr 18 13:49:58 2014 +0300 13.3 @@ -3,7 +3,7 @@ 13.4 CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs epdfview \ 13.5 galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base gparted \ 13.6 gtk+ isomaster kbd leafpad libwebkit lostirc lxappearance lxpanel lxrandr \ 13.7 -lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted spacefm \ 13.8 +lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted pcmanfm \ 13.9 popt retawq sakura transmission viewnior yad lxsession lxsession-edit lxinput" 13.10 13.11 # List of all locale pack (locale-xx)
14.1 --- a/slitaz-i18n/stuff/locale-pack.functions Fri Apr 18 10:26:47 2014 +0000 14.2 +++ b/slitaz-i18n/stuff/locale-pack.functions Fri Apr 18 13:49:58 2014 +0300 14.3 @@ -45,6 +45,14 @@ 14.4 # localedef -i $def -c -f $CHARMAP $fs/usr/lib/locale/$def 14.5 #done 14.6 14.7 + # OK, Christophe. So, we still need next // Aleksej 14.8 + usil=usr/share/i18n/locales 14.9 + for def in $locales; do 14.10 + echo "* Copying $def locale files" 14.11 + mkdir -p $fs/$usil 14.12 + cp -a $WOK/glibc/install/$usil/$def $fs/$usil 14.13 + done 14.14 + 14.15 # Get timezones 14.16 countries=$(echo $locales | \ 14.17 sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u)