# HG changeset patch # User Aleksej Bobylev # Date 1397818198 -10800 # Node ID fbd26a7703dd7146532b8b2939d2aaf48bfc7ed0 # Parent ad0058d03f197b4b15e2a49edd87da6c649cfbf0 glibc-base: Russian locale moved to "locale-ru"; slitaz-i18n: more locales to choose; locale-ru: some changes in the icons. diff -r ad0058d03f19 -r fbd26a7703dd glibc-base/receipt --- a/glibc-base/receipt Fri Apr 18 10:26:47 2014 +0000 +++ b/glibc-base/receipt Fri Apr 18 13:49:58 2014 +0300 @@ -11,7 +11,7 @@ HOST_ARCH="i486 arm x86_64" # Locales include by default, other locales are in: glibc-locale -DEFAULT_LOCALE="de_DE en_US en_GB es_ES fr_FR it_IT pt_BR pt_PT ru_RU" +DEFAULT_LOCALE="de_DE en_US en_GB es_ES fr_FR it_IT pt_BR pt_PT" # Handle multiarch compilation. case "$ARCH" in @@ -34,7 +34,7 @@ get_locales() { local path=$1 - for i in $DEFAULT_LOCALE + for i in $DEFAULT_LOCALE do cp $install/$path/i18n/locales/$i $fs/usr/share/i18n/locales done @@ -57,9 +57,9 @@ # /usr/{bin,share} /usr/lib/gconv for file in $(cat $stuff/arm-files.list) - do - cp -a ${install}$file ${fs}$file - done + do + cp -a ${install}$file ${fs}$file + done # libs for lib in libcrypt libm libc libresolv librt libutil libpthread \ @@ -84,9 +84,9 @@ # /usr/{bin,share} /usr/lib/gconv for file in $(cat $stuff/arm-files.list) - do - cp -a ${install}$file ${fs}/usr/$file - done + do + cp -a ${install}$file ${fs}/usr/$file + done # /lib for lib in libcrypt libm libc libresolv librt libutil libpthread \ @@ -105,13 +105,13 @@ sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libpthread.so ;; *) - # Copy all files specified in stuff/files.list. We get the files - # from glibc package. - for file in $(cat $stuff/wanted-files.list) - do - cp -a ${install}$file ${fs}$file - done - get_locales "usr/share" + # Copy all files specified in stuff/files.list. We get the files + # from glibc package. + for file in $(cat $stuff/wanted-files.list) + do + cp -a ${install}$file ${fs}$file + done + get_locales "usr/share" esac } diff -r ad0058d03f19 -r fbd26a7703dd glibc-base/stuff/i486-files.list --- a/glibc-base/stuff/i486-files.list Fri Apr 18 10:26:47 2014 +0000 +++ b/glibc-base/stuff/i486-files.list Fri Apr 18 13:49:58 2014 +0300 @@ -42,7 +42,6 @@ /usr/share/i18n/locales/translit_wide /usr/share/zoneinfo/Europe/Madrid -/usr/share/zoneinfo/Europe/Moscow /usr/share/zoneinfo/Europe/London /usr/share/zoneinfo/Europe/Zurich /usr/share/zoneinfo/Europe/Paris diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/receipt --- a/locale-ru/receipt Fri Apr 18 10:26:47 2014 +0000 +++ b/locale-ru/receipt Fri Apr 18 13:49:58 2014 +0300 @@ -20,10 +20,24 @@ . $WOK/slitaz-i18n/stuff/locale-pack.conf get_locale - mkdir -p $fs/usr/share/lxpanel/images/xkb-flags - for i in us.png ru.png ua.png LICENSE.txt; do - install -m644 $stuff/$i $fs/usr/share/lxpanel/images/xkb-flags/$i + # country flags used in the some dialogs + usih=usr/share/icons/hicolor + for size in 16x16 48x48; do + mkdir -p $fs/$usih/$size/intl + cp -a $stuff/$size/* $fs/$usih/$size/intl done + + # keyboard flags for default lxpanel keyboard applet + uslix=usr/share/lxpanel/images/xkb-flags + mkdir -p $fs/$uslix + for i in us ru ua; do + ln -s /$usih/16x16/intl/$(echo $i | tr a-z A-Z).png $fs/$uslix/$i.png + done + + # above icons credits + fusl=$fs/usr/share/licenses + mkdir -p $fusl + cp -a $stuff/LICENSE.txt $fusl/gosquared.txt } # Back to C if it's the last used locale. diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/16x16/RU.png Binary file locale-ru/stuff/16x16/RU.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/16x16/UA.png Binary file locale-ru/stuff/16x16/UA.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/16x16/US.png Binary file locale-ru/stuff/16x16/US.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/48x48/RU.png Binary file locale-ru/stuff/48x48/RU.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/48x48/UA.png Binary file locale-ru/stuff/48x48/UA.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/48x48/US.png Binary file locale-ru/stuff/48x48/US.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/ru.png Binary file locale-ru/stuff/ru.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/ua.png Binary file locale-ru/stuff/ua.png has changed diff -r ad0058d03f19 -r fbd26a7703dd locale-ru/stuff/us.png Binary file locale-ru/stuff/us.png has changed diff -r ad0058d03f19 -r fbd26a7703dd slitaz-i18n/stuff/locale-pack.conf --- a/slitaz-i18n/stuff/locale-pack.conf Fri Apr 18 10:26:47 2014 +0000 +++ b/slitaz-i18n/stuff/locale-pack.conf Fri Apr 18 13:49:58 2014 +0300 @@ -3,7 +3,7 @@ CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs epdfview \ galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base gparted \ gtk+ isomaster kbd leafpad libwebkit lostirc lxappearance lxpanel lxrandr \ -lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted spacefm \ +lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted pcmanfm \ popt retawq sakura transmission viewnior yad lxsession lxsession-edit lxinput" # List of all locale pack (locale-xx) diff -r ad0058d03f19 -r fbd26a7703dd slitaz-i18n/stuff/locale-pack.functions --- a/slitaz-i18n/stuff/locale-pack.functions Fri Apr 18 10:26:47 2014 +0000 +++ b/slitaz-i18n/stuff/locale-pack.functions Fri Apr 18 13:49:58 2014 +0300 @@ -45,6 +45,14 @@ # localedef -i $def -c -f $CHARMAP $fs/usr/lib/locale/$def #done + # OK, Christophe. So, we still need next // Aleksej + usil=usr/share/i18n/locales + for def in $locales; do + echo "* Copying $def locale files" + mkdir -p $fs/$usil + cp -a $WOK/glibc/install/$usil/$def $fs/$usil + done + # Get timezones countries=$(echo $locales | \ sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u)