Skip to content

Commit

Permalink
Simplify po/pysol.pot generation
Browse files Browse the repository at this point in the history
  • Loading branch information
jnumm authored and shlomif committed Jul 18, 2019
1 parent 81432ef commit 45f8c31
Show file tree
Hide file tree
Showing 13 changed files with 16,410 additions and 14,677 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include data/pysolfc.glade
graft data/themes
recursive-exclude data/themes *.py
include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py
include scripts/pygettext.py scripts/all_games.py scripts/cardset_viewer.py
include scripts/all_games.py scripts/cardset_viewer.py
include scripts/cardconv scripts/cardsetsgiftobmp
include scripts/gen_individual_importing_tests.py
include tests/individually-importing/PLACEHOLDER
Expand Down
11 changes: 2 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

export PYTHONPATH := $(PYTHONPATH):$(CURDIR)

PYSOLLIB_FILES = pysollib/tk/*.py pysollib/tile/*.py pysollib/*.py \
pysollib/games/*.py pysollib/games/special/*.py \
pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py \
pysollib/kivy/*.py

.PHONY: all install dist rpm all_games_html rules pot mo pretest test runtest

all:
Expand All @@ -32,10 +27,8 @@ rules:

pot:
./scripts/all_games.py gettext > po/games.pot
./scripts/pygettext.py -k n_ --ngettext-keyword ungettext -o po/pysol-1.pot $(PYSOLLIB_FILES)
xgettext -L C --keyword=N_ -o po/pysol-2.pot data/glade-translations
msgcat po/pysol-1.pot po/pysol-2.pot > po/pysol.pot
rm -f po/pysol-1.pot po/pysol-2.pot
xgettext --keyword=n_ -o po/pysol.pot \
pysollib/*.py pysollib/*/*.py pysollib/*/*/*.py data/pysolfc.glade
set -e; \
for lng in ru de pl it; do \
msgmerge --update --quiet --backup=none po/$${lng}_pysol.po po/pysol.pot; \
Expand Down
76 changes: 0 additions & 76 deletions data/glade-translations

This file was deleted.

Loading

0 comments on commit 45f8c31

Please sign in to comment.