diff --git a/.gitignore b/.gitignore index a2d12c3a..b123133f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ vorta.egg-info *.log htmlcov *.qm -src/vorta/i18n/ts/vorta.en_US.ts +src/vorta/i18n/ts/vorta.en.ts flatpak/app/ flatpak/.flatpak-builder/ diff --git a/.tx/config b/.tx/config index 3585351a..e0ffc9f4 100644 --- a/.tx/config +++ b/.tx/config @@ -4,7 +4,7 @@ host = https://www.transifex.com [vorta.vorta] file_filter = src/vorta/i18n/ts/vorta..ts minimum_perc = 80 -source_file = src/vorta/i18n/ts/vorta.en_US.ts -source_lang = en_US +source_file = src/vorta/i18n/ts/vorta.en.ts +source_lang = en type = QT diff --git a/MANIFEST.in b/MANIFEST.in index 193c2fe0..6d93ee89 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,7 @@ graft src/vorta/assets -# Include all compiled .qm language files, but exclude the source language (en_US). +# Include all compiled .qm language files, but exclude the source language (en). recursive-include src/vorta/i18n/qm *.qm -exclude src/vorta/i18n/qm/vorta.en_US.qm +exclude src/vorta/i18n/qm/vorta.en.qm recursive-exclude tests * diff --git a/Makefile b/Makefile index 3d109c09..f2b990b2 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ translations-from-source: ## Extract strings from source code / UI files, merge pylupdate5 -verbose -translate-function trans_late \ $$VORTA_SRC/*.py $$VORTA_SRC/views/*.py $$VORTA_SRC/borg/*.py \ $$VORTA_SRC/assets/UI/*.ui \ - -ts $$VORTA_SRC/i18n/ts/vorta.en_US.ts + -ts $$VORTA_SRC/i18n/ts/vorta.en.ts translations-push: translations-from-source ## Upload .ts to Transifex. tx push -s diff --git a/tests/conftest.py b/tests/conftest.py index 5731ee7e..012bd1bb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -49,7 +49,7 @@ def local_en(): Some tests use English strings. So override whatever language the current user has and run the tests with the English UI. """ - os.environ['LANG'] = 'en_US' + os.environ['LANG'] = 'en' @pytest.fixture(scope='session')