[PATCH 1/2] Switch translation support to fedora.zanata.org

bcl installerbot-noreply at redhat.com
Mon Feb 23 19:13:52 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

This commit adjusts the Makefile targets to use zanata, and makebumpver
to check the zanata.xml for the correct branch.
---
 .tx/config          |   9 -----
 Makefile.am         |  10 ++---
 scripts/makebumpver |  60 ++++++++++++++---------------
 zanata.xml          | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 139 insertions(+), 46 deletions(-)
 delete mode 100644 .tx/config
 create mode 100644 zanata.xml

diff --git a/.tx/config b/.tx/config
deleted file mode 100644
index 5944c9e..0000000
--- a/.tx/config
+++ /dev/null
@@ -1,9 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[anaconda-1.master]
-file_filter = po/<lang>.po
-source_file = po/anaconda.pot
-source_lang = en
-type = PO
-
diff --git a/Makefile.am b/Makefile.am
index 5945109..8714fba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,16 +44,16 @@ dist_sbin_SCRIPTS     = anaconda
 
 ARCHIVE_TAG   = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)
 
-TX_PULL_ARGS = -a -f
-TX_PUSH_ARGS = -s
+ZANATA_PULL_ARGS = --transdir $(srcdir)/po/
+ZANATA_PUSH_ARGS = --srcdir $(srcdir)/po/ --push-type source --force
 
 tag:
 	@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
 	@echo "Tagged as $(ARCHIVE_TAG)"
 
 po-pull:
-	rpm -q transifex-client &>/dev/null || ( echo "need to run: yum install transifex-client"; exit 1 )
-	tx pull $(TX_PULL_ARGS)
+	rpm -q zanata-python-client &>/dev/null || ( echo "need to run: yum install zanata-python-client"; exit 1 )
+	zanata pull $(ZANATA_PULL_ARGS)
 
 po-empty:
 	for lingua in $$(grep -v '^#' $(srcdir)/po/LINGUAS) ; do \
@@ -99,7 +99,7 @@ bumpver: po-pull
 	fi ; \
 	( cd $(srcdir) && scripts/makebumpver $${opts} ) || exit 1 ; \
 	$(MAKE) -C po $(PACKAGE_NAME).pot-update && \
-	tx push $(TX_PUSH_ARGS)
+	zanata push $(ZANATA_PUSH_ARGS)
 
 # Install all packages specified as BuildRequires in the Anaconda specfile
 # -> installs packages needed to build Anaconda
diff --git a/scripts/makebumpver b/scripts/makebumpver
index 4ec6c07..287fcee 100755
--- a/scripts/makebumpver
+++ b/scripts/makebumpver
@@ -37,7 +37,6 @@ import subprocess
 import sys
 import textwrap
 import urllib
-from ConfigParser import ConfigParser
 
 class MakeBumpVer:
     def __init__(self, *args, **kwargs):
@@ -89,14 +88,14 @@ class MakeBumpVer:
         self.spec = kwargs.get('spec')
         self.skip_acks = kwargs.get('skip_acks', False)
         self.skip_all = kwargs.get('skip_all', False)
-        self.tx_config = kwargs.get('tx_config')
-        self.skip_tx = kwargs.get("skip_tx", False)
+        self.zanata_config = kwargs.get('zanata_config')
+        self.skip_zanata = kwargs.get("skip_zanata", False)
         self.skip_jenkins = kwargs.get("skip_jenkins", False)
 
         if self.skip_all:
             self.skip_acks = True
             self.skip_jenkins = True
-            self.skip_tx = True
+            self.skip_zanata = True
 
         self.git_branch = None
 
@@ -494,38 +493,35 @@ class MakeBumpVer:
 
         return ret
 
-    def check_transifex(self):
+    def check_zanata(self):
         """
-        Make sure that the transifex branch matches the current git branch
+        Make sure that the zanata project-version matches the current git branch
 
         This is to prevent accidentally pushing translations to the wrong branch,
-        eg. when branching for a new release and .tx/config hasn't been updated
+        eg. when branching for a new release and zanata.xml hasn't been updated
         """
         if not self.git_branch:
-            log.error("No git branch, cannot check transifex config")
+            log.error("No git branch, cannot check zanata config")
             return False
 
-        ret = True
-        section_name = "anaconda-1."+self.git_branch
-
-        config = ConfigParser()
-        config.read(self.tx_config)
-
-        if section_name not in config.sections():
-            log.error(".tx/config is missing the section for this branch: %s", section_name)
-            ret = False
-
-        # There should only be anaconda.<branch_name> and main sections
-        valid_sections = (section_name, "main")
-        for section in config.sections():
-            if section not in valid_sections:
-                log.error(".tx/config has an invalid section: %s", section)
-                ret = False
+        version_re = re.compile("<project-version>(.*)</project-version>")
+        ret = False
+        with open(self.zanata_config, "r") as f:
+            for line in f:
+                m = version_re.match(line.strip())
+                if m and m.group(1) == self.git_branch:
+                    ret = True
+                    break
+                elif m:
+                    log.error("zanata.xml branch (%s) does not match current branch: %s", m.group(1), self.git_branch)
+                    break
+            else:
+                log.error("zanata.xml does not have a project-version")
 
         return ret
 
     def run(self):
-        if not self.skip_tx and not self.check_transifex():
+        if not self.skip_zanata and not self.check_zanata():
             sys.exit(1)
 
         # For now, jenkins is in an advisory role so do not require it to pass.
@@ -551,7 +547,7 @@ def usage(cmd):
     sys.stdout.write("    -s, --skip-acks  Skip checking for rhel-X.X.X ack flag\n")
     sys.stdout.write("    -S, --skip-all   Skip all checks\n")
     sys.stdout.write("    -d, --debug      Turn on debug logging to stdout\n")
-    sys.stdout.write("    --skip-tx        Skip checking Transifex config for branch name\n")
+    sys.stdout.write("    --skip-zanata    Skip checking Zanata config for branch name\n")
     sys.stdout.write("    --skip-jenkins   Skip checking Jenkins for test results\n")
     sys.stdout.write("\nThe -i switch is intended for use with utility commits that we do not need to\n")
     sys.stdout.write("reference in the spec file changelog.  The -m switch is used to map a Fedora\n")
@@ -564,17 +560,17 @@ def main(argv):
     cwd = os.getcwd()
     configure = os.path.realpath(cwd + '/configure.ac')
     spec = os.path.realpath(cwd + '/anaconda.spec.in')
-    tx_config = os.path.realpath(cwd + '/.tx/config')
+    zanata_config = os.path.realpath(cwd + '/zanata.xml')
     name, version, release, bugreport = None, None, None, None
     ignore, bugmap = None, None
-    show_help, unknown, skip_acks, skip_all, skip_tx, skip_jenkins = False, False, False, False, False, False
+    show_help, unknown, skip_acks, skip_all, skip_zanata, skip_jenkins = False, False, False, False, False, False
     opts = []
 
     try:
         opts, _args = getopt.getopt(sys.argv[1:], 'n:v:r:b:i:m:sSd?',
                                    ['name=', 'version=', 'release=',
                                     'bugreport=', 'ignore=', 'map=',
-                                    'debug', 'help', 'skip-tx', 'skip-jenkins'])
+                                    'debug', 'help', 'skip-zanata', 'skip-jenkins'])
     except getopt.GetoptError:
         show_help = True
 
@@ -597,8 +593,8 @@ def main(argv):
             skip_all = True
         elif o in ('-d', '--debug'):
             log.setLevel(logging.DEBUG)
-        elif o in ('--skip-tx'):
-            skip_tx = True
+        elif o in ('--skip-zanata'):
+            skip_zanata = True
         elif o in ('--skip-jenkins'):
             skip_jenkins = True
         elif o in ('-?', '--help'):
@@ -637,7 +633,7 @@ def main(argv):
     mbv = MakeBumpVer(name=name, version=version, release=release,
                       bugreport=bugreport, ignore=ignore, bugmap=bugmap,
                       configure=configure, spec=spec, skip_acks=skip_acks,
-                      skip_all=skip_all, tx_config=tx_config, skip_tx=skip_tx,
+                      skip_all=skip_all, zanata_config=zanata_config, skip_zanata=skip_zanata,
                       skip_jenkins=skip_jenkins)
     mbv.run()
 
diff --git a/zanata.xml b/zanata.xml
new file mode 100644
index 0000000..7dfce2c
--- /dev/null
+++ b/zanata.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<config xmlns="http://zanata.org/namespace/config/">
+  <url>https://fedora.zanata.org/</url>
+  <project>anaconda</project>
+  <project-version>master</project-version>
+  <project-type>gettext</project-type>
+
+  <locales>
+    <locale>sq</locale>
+    <locale>ar</locale>
+    <locale>as</locale>
+    <locale>ast</locale>
+    <locale>bal</locale>
+    <locale>eu</locale>
+    <locale>bn</locale>
+    <locale>bn-IN</locale>
+    <locale>brx</locale>
+    <locale>bs</locale>
+    <locale>br</locale>
+    <locale>bg</locale>
+    <locale>ca</locale>
+    <locale>zh-CN</locale>
+    <locale>zh-HK</locale>
+    <locale>zh-TW</locale>
+    <locale>kw</locale>
+    <locale>kw-GB</locale>
+    <locale>cs</locale>
+    <locale>da</locale>
+    <locale>nl</locale>
+    <locale>en-GB</locale>
+    <locale>eo</locale>
+    <locale>et</locale>
+    <locale>fi</locale>
+    <locale>fr</locale>
+    <locale>gl</locale>
+    <locale>ka</locale>
+    <locale>de</locale>
+    <locale>el</locale>
+    <locale>gu</locale>
+    <locale>he</locale>
+    <locale>hi</locale>
+    <locale>hu</locale>
+    <locale>is</locale>
+    <locale>id</locale>
+    <locale>ia</locale>
+    <locale>it</locale>
+    <locale>ja</locale>
+    <locale>kn</locale>
+    <locale>kk</locale>
+    <locale>km</locale>
+    <locale>ky</locale>
+    <locale>ko</locale>
+    <locale>lt</locale>
+    <locale>nds</locale>
+    <locale>mk</locale>
+    <locale>mai</locale>
+    <locale>ms</locale>
+    <locale>ml</locale>
+    <locale>mr</locale>
+    <locale>mn</locale>
+    <locale>ne</locale>
+    <locale>nb</locale>
+    <locale>nn</locale>
+    <locale>or</locale>
+    <locale>pa</locale>
+    <locale>fa</locale>
+    <locale>pl</locale>
+    <locale>pt</locale>
+    <locale>pt-BR</locale>
+    <locale>ro</locale>
+    <locale>ru</locale>
+    <locale>sr</locale>
+    <locale>sr at latin</locale>
+    <locale>si</locale>
+    <locale>sk</locale>
+    <locale>sl</locale>
+    <locale>es</locale>
+    <locale>sv</locale>
+    <locale>tg</locale>
+    <locale>ta</locale>
+    <locale>te</locale>
+    <locale>bo</locale>
+    <locale>tr</locale>
+    <locale>uk</locale>
+    <locale>ur</locale>
+    <locale>wba</locale>
+    <locale>cy</locale>
+    <locale>lv</locale>
+    <locale>kw at uccor</locale>
+    <locale>kw at kkcor</locale>
+    <locale>af</locale>
+    <locale>am</locale>
+    <locale>be</locale>
+    <locale>hr</locale>
+    <locale>de-CH</locale>
+    <locale>th</locale>
+    <locale>vi</locale>
+    <locale>zu</locale>
+    <locale>ilo</locale>
+    <locale>nso</locale>
+    <locale>tw</locale>
+    <locale>yo</locale>
+    <locale>anp</locale>
+  </locales>
+
+</config>


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/ba8978c7522b177b362f68e8006c86b63977df6f


More information about the anaconda-patches mailing list