SliTaz Repositories

     1.1 --- a/slitaz-i18n/stuff/locale-pack.functions	Wed Apr 30 10:05:22 2014 +0000
     1.2 +++ b/slitaz-i18n/stuff/locale-pack.functions	Sat Jun 14 19:43:22 2014 +0000
     1.3 @@ -43,6 +43,14 @@
     1.4  		cp -a $WOK/glibc/install/$usil/$def $fs/$usil
     1.5  	done
     1.6  
     1.7 +	if [ "x$LOCALE_DEPENDS" != x ]; then
     1.8 +		for dep in $LOCALE_DEPENDS; do
     1.9 +			echo "* Copying additional $dep locale files"
    1.10 +			cp -a $WOK/glibc/install/usr/share/i18n/locales/$dep \
    1.11 +			$fs/usr/share/i18n/locales
    1.12 +		done
    1.13 +	fi
    1.14 +
    1.15  	# Get timezones from tzdata
    1.16  	countries=$(echo $locales | \
    1.17  		sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u)
    1.18 @@ -61,9 +69,9 @@
    1.19  	done
    1.20  
    1.21  	# Get country flags
    1.22 -	echo "* Copy flag icons for countries: "$countries $ADD_FLAGS
    1.23 +	echo "* Copy flag icons for countries: "$countries
    1.24  	usih=usr/share/icons/hicolor
    1.25 -	for country in $countries $ADD_FLAGS; do
    1.26 +	for country in $countries; do
    1.27  		for size in 16x16 48x48; do
    1.28  			install -Dm644 \
    1.29  				$WOK/flag-icons/taz/*/fs/$usih/$size/intl/$country.png \
    1.30 @@ -75,14 +83,27 @@
    1.31  	mkdir -p $fusl
    1.32  	cp -a $WOK/flag-icons/source/*/LICENSE.txt $fusl/gosquared.txt
    1.33  
    1.34 -	# Keyboard flags for default lxpanel keyboard applet
    1.35 -	if [ "x$LXPANEL_FLAGS" != "x" ]; then
    1.36 -		uslix=usr/share/lxpanel/images/xkb-flags
    1.37 -		mkdir -p $fs/$uslix
    1.38 -		for i in $LXPANEL_FLAGS; do
    1.39 -			ln -s /$usih/16x16/intl/$(echo $i | tr a-z A-Z).png $fs/$uslix/$i.png
    1.40 +	# Gconv modules for encodings other than default
    1.41 +	if [ "x$GCONV" != x ]; then
    1.42 +		mkdir -p $fs/usr/lib/gconv
    1.43 +		for enc in $GCONV; do
    1.44 +			echo "* Copying $enc gconv module"
    1.45 +			cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv
    1.46  		done
    1.47  	fi
    1.48  
    1.49 +	# Keyboard flags for default lxpanel keyboard applet
    1.50 +	if [ "x$KB_FLAGS" != x ]; then
    1.51 +		uslix=usr/share/lxpanel/images/xkb-flags
    1.52 +		mkdir -p $fs/$uslix
    1.53 +		for i in $KB_FLAGS; do
    1.54 +			install -Dm644 \
    1.55 +				$WOK/flag-icons/taz/*/fs/$usih/16x16/intl/${i%%:*}.png \
    1.56 +				$fs/$usih/16x16/intl/${i%%:*}.png
    1.57 +			ln -s /$usih/16x16/intl/${i%%:*}.png $fs/$uslix/${i##*:}.png
    1.58 +		done
    1.59 +	fi
    1.60 +
    1.61 +	# exit code OK
    1.62  	echo
    1.63  }