Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'i18n-enh' of https://github.com/lanurmi/wxWidgets

Browse Source 
Keep strings in wxstd.pot in the natural, but the same under all
platforms, order.

See https://github.com/wxWidgets/wxWidgets/pull/2214
This commit is contained in:
Vadim Zeitlin
2021-02-06 14:21:25 +01:00
parent 27141e6a7c 232d1c1156
commit 7cca64bb0e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
locale/Makefile
View File

@@ -17,7 +17,7 @@ XGETTEXT=xgettext
XARGS=xargs XARGS=xargs
# common xgettext args: C++ syntax, use the specified macro names as markers # common xgettext args: C++ syntax, use the specified macro names as markers
XGETTEXT_ARGS=-C -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -kwxGetTranslation --add-comments=TRANSLATORS: -s -j XGETTEXT_ARGS=-C -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -kwxGetTranslation --add-comments=TRANSLATORS: -j
# implicit rules # implicit rules
%.mo: %.po %.mo: %.po
@@ -32,9 +32,7 @@ $(foreach lang,$(WX_LINGUAS_UPDATE),$(lang).po): wxstd.pot
wxstd.pot: wxstd.pot:
touch $@ touch $@
find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot (find ../include -name "*.h"; find ../src -name "*.cpp"; find ../src -name "*.mm") | LC_COLLATE=C sort | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
find ../src -name "*.mm" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
allpo: force-update allpo: force-update
@-for t in $(WX_LINGUAS_UPDATE); do $(MAKE) $$t.po; done @-for t in $(WX_LINGUAS_UPDATE); do $(MAKE) $$t.po; done