From 69a982db74b954c4e2d17a829ce699152a35c5f8 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Fri, 28 Apr 2023 11:06:59 +0200
Subject: [PATCH] Update to use transifex-client 1.x

---
 .tx/config           | 10 +++++-----
 po/README.md         |  2 +-
 requirements-dev.txt |  1 -
 setup.py             |  9 ++++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.tx/config b/.tx/config
index 7bb5bad67c..1db9c65576 100644
--- a/.tx/config
+++ b/.tx/config
@@ -3,31 +3,31 @@
 [main]
 host = https://www.transifex.com
 
-[musicbrainz.picard]
+[o:musicbrainz:p:musicbrainz:r:picard]
 file_filter = po/<lang>.po
 source_file = po/picard.pot
 source_lang = en
 type = PO
 
-[musicbrainz.picard_appstream]
+[o:musicbrainz:p:musicbrainz:r:picard_appstream]
 file_filter = po/appstream/<lang>.po
 source_file = po/appstream/picard-appstream.pot
 source_lang = en
 type = PO
 
-[musicbrainz.picard_installer]
+[o:musicbrainz:p:musicbrainz:r:picard_installer]
 file_filter = installer/i18n/sources/<lang>.json
 source_file = installer/i18n/sources/en.json
 source_lang = en
 type = KEYVALUEJSON
 
-[musicbrainz.countries]
+[o:musicbrainz:p:musicbrainz:r:countries]
 file_filter = po/countries/<lang>.po
 source_file = po/countries/countries.pot
 source_lang = en
 type = PO
 
-[musicbrainz.attributes]
+[o:musicbrainz:p:musicbrainz:r:attributes]
 file_filter = po/attributes/<lang>.po
 source_file = po/attributes/attributes.pot
 source_lang = en
diff --git a/po/README.md b/po/README.md
index 42f102a9c9..d9d7f0db1e 100644
--- a/po/README.md
+++ b/po/README.md
@@ -8,7 +8,7 @@ _Please do not manually edit the PO files._
 Required tools
 --------------
 
-* [Transifex client](https://developers.transifex.com/docs/cli)
+* [Transifex client 1.x](https://developers.transifex.com/docs/cli)
 * [Babel](https://babel.pocoo.org/)
 
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3ba0fb9999..f6084448a0 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,4 +4,3 @@ flake8
 isort>=5.0
 pycodestyle
 pylint>=2.6.0
-transifex-client
diff --git a/setup.py b/setup.py
index 7570b5aa26..3f4b288153 100644
--- a/setup.py
+++ b/setup.py
@@ -518,10 +518,9 @@ def run(self):
             tx_executable,
             'pull',
             '--force',
-            '--resource',
-            'musicbrainz.picard',
-            '--language',
+            '--languages',
             'en_AU,en_GB,en_CA'
+            'musicbrainz.picard',
         ])
 
 
@@ -600,9 +599,9 @@ def run(self):
                 tx_executable,
                 'pull',
                 '--force',
-                '--resource=musicbrainz.attributes,musicbrainz.countries',
                 '--source',
-                '--language=none',
+                'musicbrainz.attributes',
+                'musicbrainz.countries',
             ]
             self.spawn(txpull_cmd)