# HG changeset patch # User Aleksej Bobylev # Date 1506514659 -10800 # Node ID 712f472c52c6ddfefb6399815fe1219fe5a30825 # Parent 47f6bed040f74702d3d09b31e62f0ba471fcd346 Make Openbox menu translated again. diff -r 47f6bed040f7 -r 712f472c52c6 Makefile --- a/Makefile Wed Sep 27 08:48:02 2017 +0200 +++ b/Makefile Wed Sep 27 15:17:39 2017 +0300 @@ -28,13 +28,13 @@ menu: @for l in $(LINGUAS); do \ echo "Formatting $$l messages..."; \ - mkdir -p po/mo/$$l/LC_MESSAGES; \ - msgfmt -o po/mo/$$l/LC_MESSAGES/$(DOMAIN).mo po/$$l.po; \ + mkdir -p /usr/share/locale/$$l/LC_MESSAGES; \ + msgfmt -o /usr/share/locale/$$l/LC_MESSAGES/$(DOMAIN).mo po/$$l.po; \ done; \ mkdir -p $(DESTDIR)/etc/xdg/openbox; \ for l in en $(LINGUAS); do \ echo "Processing $$l menu..."; \ - ./ob-menu/menu.xml.in $$l `pwd`/po/mo > \ + ./ob-menu/menu.xml.in $$l > \ $(DESTDIR)/etc/xdg/openbox/menu.$$l.xml; \ done; diff -r 47f6bed040f7 -r 712f472c52c6 ob-menu/menu.xml.in --- a/ob-menu/menu.xml.in Wed Sep 27 08:48:02 2017 +0200 +++ b/ob-menu/menu.xml.in Wed Sep 27 15:17:39 2017 +0300 @@ -1,25 +1,23 @@ # don't forget to add "locale-**" as BUILD_DEPENDS to slitaz-configs receipt # in case of adding new menu languages case $1 in - en) L=C ;; - fr) L=fr_FR ;; - hu) L=hu_HU ;; - ja) L=ja_JP ;; - pt|pt_BR) L=pt_BR ;; - ru) L=ru_RU ;; - zh_CN) L=zh_CN ;; + de) L='de_DE';; + en) L='en_US';; + fr) L='fr_FR';; + hu) L='hu_HU';; + ja) L='ja_JP';; + pt|pt_BR) L='pt_BR';; + ru) L='ru_RU';; + zh_CN) L='zh_CN';; esac -if [ $L != C ]; then - mkdir -p /usr/lib/locale/$L.UTF-8 - localedef -i $L -c -f UTF-8 /usr/lib/locale/$L.UTF-8 -fi +mkdir -p "/usr/lib/locale/$L.UTF-8" +localedef -i "$L" -c -f 'UTF-8' "/usr/lib/locale/$L.UTF-8" -export LANG=$L LC_ALL=$L TEXTDOMAINDIR=$2 TEXTDOMAIN=slitaz-ob-menu +export LC_ALL="$L.UTF-8" TEXTDOMAIN='slitaz-ob-menu' -cat << EOT +cat < -