fixed a crash and a leak in GetShortcutTarget() (closes bug 1541321)

[wxWidgets.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index eca5dd8e9122cf2a510d7b3ae9e6c2feb5cfabd0..5e122b02c20a9706139e08d7bc8bc1bbd93fa6d4 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -7,20 +7,21 @@
 # being called with this dir as the cwd, but if we generate this file
 # with configure an explicit path should be specified -- RL.
 
 # being called with this dir as the cwd, but if we generate this file
 # with configure an explicit path should be specified -- RL.
 

-WX_LINGUAS := `ls *.po 2> /dev/null | sed -n 's/\(wxstd\)\?\.po//p'`
+WX_LINGUAS := $(shell ls *.po */*.po 2> /dev/null | sed 's/wxstd.po//g' | sed 's/.po//g')
+WX_LINGUAS_UPDATE := $(shell ls *.po 2> /dev/null | sed 's/wxstd.po//g' | sed 's/.po//g')

 
 # the programs we use (TODO: use configure to detect them)
 
 # the programs we use (TODO: use configure to detect them)

-MSGFMT=msgfmt
+MSGFMT=msgfmt --verbose

 MSGMERGE=msgmerge
 XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers
 MSGMERGE=msgmerge
 XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers

-XGETTEXT_ARGS=-C -k_ -kwxGetTranslation -kwxTRANSLATE -s -j
+XGETTEXT_ARGS=-C -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -s -j

 
 # implicit rules
 %.mo: %.po
 
 # implicit rules
 %.mo: %.po

-       $(MSGFMT) -o $@ $<
+       $(MSGFMT) -c -o $@ $<

 
 # a PO file must be updated from wxstd.po to include new translations
 %.po: wxstd.po
 
 # a PO file must be updated from wxstd.po to include new translations
 %.po: wxstd.po


@@ -30,9 +31,11 @@ wxstd.po:
        touch $@
        find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        touch $@
        find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po

+       find ../contrib/include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
+       find ../contrib/src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po

 
 allpo: force-update
 
 allpo: force-update

-       @-for t in $(WX_LINGUAS); do $(MAKE) $$t.po; done
+       @-for t in $(WX_LINGUAS_UPDATE); do $(MAKE) $$t.po; done

 
 allmo:
        @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done
 
 allmo:
        @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done


@@ -40,9 +43,21 @@ allmo:
 force-update:
        $(RM) wxstd.po
 
 force-update:
        $(RM) wxstd.po
 

-# targets depending on this one will be always remade
+# print out the percentage of the translated strings
+stats: FORCE
+       @for i in $(WX_LINGUAS); do \
+               x=`$(MSGFMT) -o /dev/null "$$i.po" 2>&1 | sed -e 's/[,\.]//g' \
+                       -e 's/\([0-9]\+\) translated messages\?/TR=\1/' \
+                       -e 's/\([0-9]\+\) fuzzy translations\?/FZ=\1/' \
+                       -e 's/\([0-9]\+\) untranslated messages\?/UT=\1/'`; \
+               TR=0 FZ=0 UT=0; \
+               eval $$x; \
+               TOTAL=`expr $$TR + $$FZ + $$UT`; \
+               echo "$$i.po `expr 100 "*" $$TR / $$TOTAL`% of $$TOTAL strings"; \
+       done
+

 FORCE:
 
 FORCE:
 

-.PHONY: allpo allmo force-update
+.PHONY: allpo allmo force-update percentage FORCE

 
 # $Id$
 
 # $Id$