SliTaz Repositories

     1.1 --- a/tinyutils/tazlocale	Fri Aug 21 09:05:49 2020 +0000
     1.2 +++ b/tinyutils/tazlocale	Fri Aug 21 09:59:00 2020 +0000
     1.3 @@ -30,28 +30,17 @@
     1.4  }
     1.5  
     1.6  
     1.7 -mksymlink() {
     1.8 -	[ "$(readlink $2)" = "$1" ] || ln -fs "$1" "$2"
     1.9 -}
    1.10 -
    1.11  # Make symlink to file, substitute "%%" to "ll_CC", "ll" or "en" according to
    1.12  # current language settings and file existence
    1.13  # (where "ll_CC" - full locale format (lang and country, and maybe, modifier).
    1.14  
    1.15  make_i18n_link() {
    1.16 -	if [ -d $(dirname ${1/.%%/}) ]; then
    1.17 -		cd $(dirname ${1/.%%/})
    1.18 -
    1.19 -		if [ -e ${1/%%/$LANG} ]; then
    1.20 -			mksymlink $(basename ${1/%%/$LANG}) ${1/.%%/}
    1.21 -		else
    1.22 -			if [ -e ${1/%%/$LANGUAGE} ]; then
    1.23 -				mksymlink $(basename ${1/%%/$LANGUAGE}) ${1/.%%/}
    1.24 -			else
    1.25 -				mksymlink $(basename ${1/%%/en}) ${1/.%%/}
    1.26 -			fi
    1.27 -		fi
    1.28 -	fi
    1.29 +	for i in $LANG $LANGUAGE en; do
    1.30 +		[ -e ${1/.%%./.$i.} ] || continue
    1.31 +		[ "$(readlink ${1/.%%/})" = "$(basename ${1/.%%./.$i.})" ] ||
    1.32 +			ln -fs $(basename ${1/.%%./.$i.}) ${1/.%%/}
    1.33 +		break
    1.34 +	done
    1.35  }
    1.36  
    1.37