[entropy] split server and client .po files

misc/po/Makefile

@@ -9,7 +9,32 @@ NLSPACKAGE = entropy
 CATALOGS = $(shell ls *.po)
 FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
 GLADEFILES = $(wildcard ../../magneto/src/magneto/gtk/*.glade)
-PYFILES =  $(wildcard ../../lib/entropy/transceivers/uri_handlers/*.py) $(wildcard ../../lib/entropy/transceivers/uri_handlers/plugins/*.py) $(wildcard ../../lib/entropy/transceivers/*.py) $(wildcard ../../lib/entropy/db/*.py) $(wildcard ../../lib/entropy/core/*.py) $(wildcard ../../lib/entropy/core/settings/*.py) $(wildcard ../../lib/entropy/core/settings/plugins/*.py) $(wildcard ../../lib/entropy/core/settings/plugins/interfaces/*.py) $(wildcard ../../lib/entropy/spm/*.py) $(wildcard ../../lib/entropy/spm/plugins/*.py) $(wildcard ../../lib/entropy/spm/plugins/portage_plugin/*.py) $(wildcard ../../lib/entropy/spm/plugins/interfaces/portage_plugin/*.py) $(wildcard ../../lib/entropy/spm/plugins/interfaces/*.py) $(wildcard ../../lib/entropy/services/system/*.py) $(wildcard ../../lib/entropy/services/ugc/*.py) $(wildcard ../../lib/entropy/services/repository/*.py) $(wildcard ../../lib/entropy/services/*.py) $(wildcard ../../lib/entropy/server/*.py) $(wildcard ../../lib/entropy/server/interfaces/*.py) $(wildcard ../../lib/entropy/client/services/ugc/*.py) $(wildcard ../../lib/entropy/client/services/system/*.py) $(wildcard ../../lib/entropy/client/services/*.py) $(wildcard ../../lib/entropy/client/*.py) $(wildcard ../../lib/entropy/client/interfaces/*.py) $(wildcard ../../lib/entropy/*.py) $(wildcard ../../client/*.py) $(wildcard ../../server/*.py) $(wildcard ../../server/eit/*.py) $(wildcard ../../server/eit/commands/*.py) $(wildcard ../../magneto/src/magneto/kde/*.py) $(wildcard ../../magneto/src/magneto/gtk/*.py) $(wildcard ../../magneto/src/magneto/core/*.py) ../../services/kernel-switcher
+PYFILES = $(wildcard ../../lib/entropy/db/*.py) \
+	$(wildcard ../../lib/entropy/core/*.py) \
+	$(wildcard ../../lib/entropy/core/settings/*.py) \
+	$(wildcard ../../lib/entropy/core/settings/plugins/*.py) \
+	$(wildcard ../../lib/entropy/core/settings/plugins/interfaces/*.py) \
+	$(wildcard ../../lib/entropy/spm/*.py) \
+	$(wildcard ../../lib/entropy/spm/plugins/*.py) \
+	$(wildcard ../../lib/entropy/spm/plugins/portage_plugin/*.py) \
+	$(wildcard ../../lib/entropy/spm/plugins/interfaces/portage_plugin/*.py) \
+	$(wildcard ../../lib/entropy/spm/plugins/interfaces/*.py) \
+	$(wildcard ../../lib/entropy/services/system/*.py) \
+	$(wildcard ../../lib/entropy/services/ugc/*.py) \
+	$(wildcard ../../lib/entropy/services/repository/*.py) \
+	$(wildcard ../../lib/entropy/services/*.py) \
+	$(wildcard ../../lib/entropy/client/services/ugc/*.py) \
+	$(wildcard ../../lib/entropy/client/services/system/*.py) \
+	$(wildcard ../../lib/entropy/client/services/*.py) \
+	$(wildcard ../../lib/entropy/client/*.py) \
+	$(wildcard ../../lib/entropy/client/interfaces/*.py) \
+	$(wildcard ../../lib/entropy/*.py) \
+	$(wildcard ../../client/*.py) \
+	$(wildcard ../../magneto/src/magneto/kde/*.py) \
+	$(wildcard ../../magneto/src/magneto/gtk/*.py) \
+	$(wildcard ../../magneto/src/magneto/core/*.py) \
+	../../services/kernel-switcher
+
 POTFILES = $(PYFILES) $(GLADEFILES)
 
 all: $(NLSPACKAGE).pot $(FMTCATALOGS)

misc/po/POTFILES.in

@@ -1,9 +1,3 @@
-../lib/entropy/transceivers/uri_handlers/__init__.py
-../lib/entropy/transceivers/uri_handlers/skel.py
-../lib/entropy/transceivers/uri_handlers/plugins/factory.py
-../lib/entropy/transceivers/uri_handlers/plugins/__init__.py
-../lib/entropy/transceivers/__init__.py
-../lib/entropy/transceivers/exceptions.py
 ../lib/entropy/db/__init__.py
 ../lib/entropy/db/exceptions.py
 ../lib/entropy/db/skel.py
@@ -24,13 +18,6 @@
 ../lib/entropy/spm/plugins/interfaces/__init__.py
 ../lib/entropy/services/__init__.py
 ../lib/entropy/services/client.py
-../lib/entropy/server/transceivers.py
-../lib/entropy/server/__init__.py
-../lib/entropy/server/interfaces/mirrors.py
-../lib/entropy/server/interfaces/rss.py
-../lib/entropy/server/interfaces/db.py
-../lib/entropy/server/interfaces/__init__.py
-../lib/entropy/server/interfaces/main.py
 ../lib/entropy/client/services/interfaces.py
 ../lib/entropy/client/services/__init__.py
 ../lib/entropy/client/__init__.py
@@ -75,48 +62,6 @@
 ../client/text_smart.py
 ../client/equo.py
 ../client/text_ui.py
-../server/eit.py
-../server/eit/__init__.py
-../server/eit/colorful.py
-../server/eit/main.py
-../server/eit/commands/test.py
-../server/eit/commands/query.py
-../server/eit/commands/add.py
-../server/eit/commands/list.py
-../server/eit/commands/mv.py
-../server/eit/commands/log.py
-../server/eit/commands/remove.py
-../server/eit/commands/search.py
-../server/eit/commands/command.py
-../server/eit/commands/graph.py
-../server/eit/commands/reset.py
-../server/eit/commands/remote.py
-../server/eit/commands/help.py
-../server/eit/commands/pull.py
-../server/eit/commands/bump.py
-../server/eit/commands/init.py
-../server/eit/commands/push.py
-../server/eit/commands/pkgmove.py
-../server/eit/commands/repo.py
-../server/eit/commands/notice.py
-../server/eit/commands/merge.py
-../server/eit/commands/__init__.py
-../server/eit/commands/repack.py
-../server/eit/commands/commit.py
-../server/eit/commands/own.py
-../server/eit/commands/match.py
-../server/eit/commands/lock.py
-../server/eit/commands/cleanup.py
-../server/eit/commands/files.py
-../server/eit/commands/descriptor.py
-../server/eit/commands/branch.py
-../server/eit/commands/checkout.py
-../server/eit/commands/status.py
-../server/eit/commands/deps.py
-../server/eit/commands/cp.py
-../server/eit/commands/revgraph.py
-../server/eit/commands/key.py
-../server/eit/commands/inject.py
 ../magneto/src/magneto/kde/interfaces.py
 ../magneto/src/magneto/kde/components.py
 ../magneto/src/magneto/kde/__init__.py

misc/po/TRANSIFEX_README

@@ -9,10 +9,10 @@ UPLOAD
 
 and pushed using:
 
-    $ sh transifex-push # requires transifex-client
+    $ make transifex-push # requires transifex-client
 
 DOWNLOAD
 ========
 .po files are downloaded via:
 
-    $ sh transifex-pull # requires transifex-client
+    $ make transifex-pull # requires transifex-client

scripts/tag-version.sh

@@ -12,9 +12,12 @@ for cur_tag in `git tag`; do
 	[[ "$cur_tag" == "$new_tag" ]] && echo "$new_tag already tagged" && exit 1
 done
 
-# Validate Entropy po files
+# Validate Entropy Client po files
 ( cd misc/po && make validate ) || exit 1
 
+# Validate Entropy Server po files
+( cd server/po && make validate ) || exit 1
+
 # Validate Rigo po files
 ( cd rigo/po && make validate ) || exit 1
 

server/Makefile

@@ -1,5 +1,5 @@
 PKGNAME = entropy
-SUBDIRS = doc
+SUBDIRS = doc po
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib

server/eit.py

@@ -1,6 +1,9 @@
 #!/usr/bin/python2
+import os
 import sys
 
+os.environ['ETP_GETTEXT_DOMAIN'] = "entropy-server"
+
 # Entropy imports
 sys.path.insert(0, "/usr/lib/entropy/lib")
 sys.path.insert(0, "/usr/lib/entropy/client")

server/matter

@@ -12,6 +12,8 @@ import errno
 import fcntl
 from threading import Lock
 
+os.environ['ETP_GETTEXT_DOMAIN'] = "entropy-server"
+
 # Entropy imports
 sys.path.insert(0,'/usr/lib/entropy/lib')
 sys.path.insert(0,'/usr/lib/entropy/server')

server/po/.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.net
+
+[sabayon-entropy-server.entropy-server-pot-file]
+file_filter = <lang>.po
+source_file = entropy-server.pot
+source_lang = en
+

server/po/Makefile

@@ -0,0 +1,94 @@
+DESTDIR =
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALLNLSDIR = $(DESTDIR)/usr/share/locale
+MSGMERGE = intltool-update -x --gettext-package=$(NLSPACKAGE) --dist
+NLSPACKAGE = entropy-server
+CATALOGS = $(shell ls *.po)
+FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
+
+PYFILES =  $(wildcard ../../lib/entropy/transceivers/uri_handlers/*.py) \
+	$(wildcard ../../lib/entropy/transceivers/uri_handlers/plugins/*.py) \
+	$(wildcard ../../lib/entropy/transceivers/*.py) \
+	$(wildcard ../../lib/entropy/db/*.py) \
+	$(wildcard ../../lib/entropy/core/*.py) \
+	$(wildcard ../../lib/entropy/core/settings/*.py) \
+	$(wildcard ../../lib/entropy/core/settings/plugins/*.py) \
+	$(wildcard ../../lib/entropy/core/settings/plugins/interfaces/*.py) \
+	$(wildcard ../../lib/entropy/server/*.py) \
+	$(wildcard ../../lib/entropy/server/interfaces/*.py) \
+	$(wildcard ../../lib/entropy/*.py) \
+	$(wildcard ../../server/*.py) \
+	$(wildcard ../../server/eit/*.py) \
+	$(wildcard ../../server/eit/commands/*.py)
+
+POTFILES = $(PYFILES)
+
+all: $(NLSPACKAGE).pot $(FMTCATALOGS)
+
+POTFILES.in:
+	for file in $(POTFILES); do \
+		echo "$${file#../}" ; \
+	done > $@
+
+$(NLSPACKAGE).pot: $(POTFILES) POTFILES.in
+	intltool-update --gettext-package=$(NLSPACKAGE) --pot
+
+transifex-pull:
+	tx pull -a -f
+
+transifex-push:
+	tx push -s
+
+validate:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`basename $$cat .po`; \
+		msgfmt -c $$lang.po -o /dev/null || exit 1; \
+	done
+
+update-po: Makefile $(NLSPACKAGE).pot transifex-pull
+
+refresh-po: Makefile POTFILES.in
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`basename $$cat .po`; \
+		cp $$lang.po $$lang.old.po; \
+		if $(MSGMERGE) $$lang ; then \
+			rm -f $$lang.old.po ; \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			mv $$lang.old.po $$lang.po ; \
+		fi \
+	done
+
+report:
+	@for cat in *.po ; do \
+		echo -n "$$cat: "; \
+		msgfmt --statistics -o /dev/null $$cat; \
+	done
+
+clean:
+	@rm -fv *mo *~ .depend *.autosave
+
+distclean: clean
+	rm -f *mo .depend Makefile $(NLSPACKAGE).pot POTFILES.in
+
+depend:
+
+install:	all
+	mkdir -p $(INSTALLNLSDIR)
+	for n in $(CATALOGS); do \
+	    l=`basename $$n .po`; \
+	    mo=$$l.mo; \
+	    if [ ! -f $$mo ]; then continue; fi; \
+	    $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 644 $$mo \
+		$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
+	done
+
+%.mo: %.po
+	msgfmt -o $@ $<

server/po/POTFILES.in

@@ -0,0 +1,81 @@
+../lib/entropy/transceivers/uri_handlers/__init__.py
+../lib/entropy/transceivers/uri_handlers/skel.py
+../lib/entropy/transceivers/uri_handlers/plugins/factory.py
+../lib/entropy/transceivers/uri_handlers/plugins/__init__.py
+../lib/entropy/transceivers/__init__.py
+../lib/entropy/transceivers/exceptions.py
+../lib/entropy/db/__init__.py
+../lib/entropy/db/exceptions.py
+../lib/entropy/db/skel.py
+../lib/entropy/core/__init__.py
+../lib/entropy/core/settings/base.py
+../lib/entropy/core/settings/__init__.py
+../lib/entropy/core/settings/plugins/factory.py
+../lib/entropy/core/settings/plugins/__init__.py
+../lib/entropy/core/settings/plugins/skel.py
+../lib/entropy/core/settings/plugins/interfaces/__init__.py
+../lib/entropy/server/transceivers.py
+../lib/entropy/server/__init__.py
+../lib/entropy/server/interfaces/mirrors.py
+../lib/entropy/server/interfaces/rss.py
+../lib/entropy/server/interfaces/db.py
+../lib/entropy/server/interfaces/__init__.py
+../lib/entropy/server/interfaces/main.py
+../lib/entropy/fetchers.py
+../lib/entropy/i18n.py
+../lib/entropy/cache.py
+../lib/entropy/security.py
+../lib/entropy/__init__.py
+../lib/entropy/const.py
+../lib/entropy/cli.py
+../lib/entropy/tools.py
+../lib/entropy/exceptions.py
+../lib/entropy/output.py
+../lib/entropy/debug.py
+../lib/entropy/dump.py
+../lib/entropy/dep.py
+../lib/entropy/qa.py
+../lib/entropy/graph.py
+../lib/entropy/misc.py
+../server/eit.py
+../server/eit/__init__.py
+../server/eit/colorful.py
+../server/eit/main.py
+../server/eit/commands/test.py
+../server/eit/commands/query.py
+../server/eit/commands/add.py
+../server/eit/commands/list.py
+../server/eit/commands/mv.py
+../server/eit/commands/log.py
+../server/eit/commands/remove.py
+../server/eit/commands/search.py
+../server/eit/commands/command.py
+../server/eit/commands/graph.py
+../server/eit/commands/reset.py
+../server/eit/commands/remote.py
+../server/eit/commands/help.py
+../server/eit/commands/pull.py
+../server/eit/commands/bump.py
+../server/eit/commands/init.py
+../server/eit/commands/push.py
+../server/eit/commands/pkgmove.py
+../server/eit/commands/repo.py
+../server/eit/commands/notice.py
+../server/eit/commands/merge.py
+../server/eit/commands/__init__.py
+../server/eit/commands/repack.py
+../server/eit/commands/commit.py
+../server/eit/commands/own.py
+../server/eit/commands/match.py
+../server/eit/commands/lock.py
+../server/eit/commands/cleanup.py
+../server/eit/commands/files.py
+../server/eit/commands/descriptor.py
+../server/eit/commands/branch.py
+../server/eit/commands/checkout.py
+../server/eit/commands/status.py
+../server/eit/commands/deps.py
+../server/eit/commands/cp.py
+../server/eit/commands/revgraph.py
+../server/eit/commands/key.py
+../server/eit/commands/inject.py

server/po/TRANSIFEX_README

@@ -0,0 +1,18 @@
+URL: https://www.transifex.net/projects/p/sabayon-entropy-server
+:: Transifex .po files management workflow ::
+
+UPLOAD
+======
+.pot file is generated via:
+
+    $ make entropy-server.pot
+
+and pushed using:
+
+    $ make transifex-push # requires transifex-client
+
+DOWNLOAD
+========
+.po files are downloaded via:
+
+    $ make transifex-pull # requires transifex-client