# HG changeset patch # User Christophe Lincoln # Date 1306929289 -7200 # Node ID a4bc0aff568e006447ef6b5159bdc907c0e3e4f5 # Parent 0b96ee321bf3e96c0b2d7e1ecb75f9654ca9a9d3 slitaz-i18n: Fix and improve - Get files from slitaz-configs and slitaz-tools diff -r 0b96ee321bf3 -r a4bc0aff568e slitaz-i18n/receipt --- a/slitaz-i18n/receipt Wed Jun 01 12:10:23 2011 +0200 +++ b/slitaz-i18n/receipt Wed Jun 01 13:54:49 2011 +0200 @@ -29,7 +29,7 @@ tazwok cook locale-$i fi done - cat > $fs/usr/share/doc/slitaz/i18n.txt << _EOT_ + cat > $fs/usr/share/doc/slitaz/i18n.txt << EOT SliTaz i18n information ================================================================================ @@ -49,5 +49,5 @@ ================================================================================ -_EOT_ +EOT } diff -r 0b96ee321bf3 -r a4bc0aff568e slitaz-i18n/stuff/locale-pack.functions --- a/slitaz-i18n/stuff/locale-pack.functions Wed Jun 01 12:10:23 2011 +0200 +++ b/slitaz-i18n/stuff/locale-pack.functions Wed Jun 01 13:54:49 2011 +0200 @@ -9,18 +9,36 @@ $fs/etc/xdg/openbox } -# Get translated files from SliTaz sub projects: configs, doc, tools. +# Get translated files from SliTaz sub projects: configs & tools. get_slitaz_messages() { - [ -d $WOK/slitaz-configs ] && . $WOK/slitaz-configs/receipt - [ -f $WOK/slitaz-configs/slitaz-configs-$VERSION/rootfs/etc/xdg/openbox/menu.${LOCALE}.xml ] && \ - cp $WOK/slitaz-configs/slitaz-configs-$VERSION/rootfs/etc/xdg/openbox/menu.${LOCALE}.xml \ - $fs/etc/xdg/openbox + configs=$WOK/slitaz-configs/source + openbox=$configs/slitaz-configs-*/rootfs/etc/xdg/openbox + tools=$WOK/slitaz-tools/source + + [ ! -d $configs ] && echo "ERROR: missing source slitaz-configs" && exit 1 + [ ! -d $tools ] && echo "ERROR: missing source slitaz-tools" && exit 1 - [ -d $WOK/slitaz-tools ] && . $WOK/slitaz-tools/receipt - [ -d $WOK/slitaz-tools/slitaz-tools-$VERSION/messages/$LOCALE ] && \ - cp -a $WOK/slitaz-tools/slitaz-tools-$VERSION/messages/$LOCALE \ - $fs/usr/share/slitaz/messages + if [ -f $openbox/menu.${LOCALE}.xml ]; then + echo "* Found $LOCALE locale for: openbox menu" + cp $openbox/menu.${LOCALE}.xml $fs/etc/xdg/openbox + fi + + # Tools messages will be replace in time by POT files. + if [ -d $tools/slitaz-tools-*/messages/$LOCALE ]; then + echo "* Found $LOCALE locale for: slitaz-tools" + cp -a $tools/slitaz-tools-*/messages/$LOCALE \ + $fs/usr/share/slitaz/messages + fi + + if [ -d $tools/slitaz-tools-*/po/mo/$LOCALE ]; then + for app in $(ls $tools/slitaz-tools-*/po/mo/$LOCALE) + do + echo "* Found $LOCALE locale for: ${app%.mo}" + cp -a $tools/slitaz-tools-*/po/mo/$LOCALE/$app \ + $fs/usr/share/locale/$LOCALE + done + fi } # Get the core packages messages.