From 5451f552197a6ed9239b7dc84e8d06bce489364b Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Sun, 8 May 2022 19:23:13 -0500 Subject: [PATCH] Move qtlib localization files to top level --- .tx/config | 4 ++-- MANIFEST.in | 1 - Makefile | 2 +- README.md | 1 - build.py | 10 +--------- {qtlib/locale => locale}/ar/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/cs/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/de/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/el/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/en/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/es/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/fr/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/hy/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/it/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/ja/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/ko/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/ms/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/nl/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/pl_PL/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/pt_BR/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/qtlib.pot | 0 {qtlib/locale => locale}/ru/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/tr/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/uk/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/vi/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/zh_CN/LC_MESSAGES/qtlib.po | 0 {qtlib/locale => locale}/zh_TW/LC_MESSAGES/qtlib.po | 0 27 files changed, 4 insertions(+), 14 deletions(-) rename {qtlib/locale => locale}/ar/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/cs/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/de/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/el/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/en/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/es/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/fr/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/hy/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/it/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/ja/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/ko/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/ms/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/nl/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/pl_PL/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/pt_BR/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/qtlib.pot (100%) rename {qtlib/locale => locale}/ru/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/tr/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/uk/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/vi/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/zh_CN/LC_MESSAGES/qtlib.po (100%) rename {qtlib/locale => locale}/zh_TW/LC_MESSAGES/qtlib.po (100%) diff --git a/.tx/config b/.tx/config index 7d856c78..a573e03c 100644 --- a/.tx/config +++ b/.tx/config @@ -14,8 +14,8 @@ source_lang = en type = PO [o:voltaicideas:p:dupeguru-1:r:qtlib] -file_filter = qtlib/locale//LC_MESSAGES/qtlib.po -source_file = qtlib/locale/qtlib.pot +file_filter = locale//LC_MESSAGES/qtlib.po +source_file = locale/qtlib.pot source_lang = en type = PO diff --git a/MANIFEST.in b/MANIFEST.in index e9842436..894fe423 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,4 +3,3 @@ recursive-include core *.m include run.py graft locale graft help -graft qtlib/locale \ No newline at end of file diff --git a/Makefile b/Makefile index 8ecac155..71be91cb 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ endif # Our build scripts are not very "make like" yet and perform their task in a bundle. For now, we # use one of each file to act as a representative, a target, of these groups. -packages = hscommon qtlib core qt +packages = hscommon core qt localedirs = $(wildcard locale/*/LC_MESSAGES) pofiles = $(wildcard locale/*/LC_MESSAGES/*.po) mofiles = $(patsubst %.po,%.mo,$(pofiles)) diff --git a/README.md b/README.md index a92e518d..60194318 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ This folder contains the source for dupeGuru. Its documentation is in `help`, bu * help: Help document, written for Sphinx. * locale: .po files for localization. * hscommon: A collection of helpers used across HS applications. -* qtlib: A collection of helpers used across Qt UI codebases of HS applications. ## How to build dupeGuru from source diff --git a/build.py b/build.py index 2a615b79..87399d3a 100644 --- a/build.py +++ b/build.py @@ -88,14 +88,8 @@ def build_help(): p.map(build_one_help, languages) -def build_qt_localizations(): - loc.compile_all_po(Path("qtlib", "locale")) - loc.merge_locale_dir(Path("qtlib", "locale"), "locale") - - def build_localizations(): loc.compile_all_po("locale") - build_qt_localizations() locale_dest = Path("build", "locale") if locale_dest.exists(): shutil.rmtree(locale_dest) @@ -111,18 +105,16 @@ def build_updatepot(): print("Building ui.pot") loc.generate_pot(["qt"], Path("locale", "ui.pot"), ["tr"], merge=True) print("Building qtlib.pot") - loc.generate_pot(["qtlib"], Path("qtlib", "locale", "qtlib.pot"), ["tr"]) + loc.generate_pot(["qtlib"], Path("locale", "qtlib.pot"), ["tr"]) def build_mergepot(): print("Updating .po files using .pot files") loc.merge_pots_into_pos("locale") - loc.merge_pots_into_pos(Path("qtlib", "locale")) def build_normpo(): loc.normalize_all_pos("locale") - loc.normalize_all_pos(Path("qtlib", "locale")) def build_pe_modules(): diff --git a/qtlib/locale/ar/LC_MESSAGES/qtlib.po b/locale/ar/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/ar/LC_MESSAGES/qtlib.po rename to locale/ar/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/cs/LC_MESSAGES/qtlib.po b/locale/cs/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/cs/LC_MESSAGES/qtlib.po rename to locale/cs/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/de/LC_MESSAGES/qtlib.po b/locale/de/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/de/LC_MESSAGES/qtlib.po rename to locale/de/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/el/LC_MESSAGES/qtlib.po b/locale/el/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/el/LC_MESSAGES/qtlib.po rename to locale/el/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/en/LC_MESSAGES/qtlib.po b/locale/en/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/en/LC_MESSAGES/qtlib.po rename to locale/en/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/es/LC_MESSAGES/qtlib.po b/locale/es/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/es/LC_MESSAGES/qtlib.po rename to locale/es/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/fr/LC_MESSAGES/qtlib.po b/locale/fr/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/fr/LC_MESSAGES/qtlib.po rename to locale/fr/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/hy/LC_MESSAGES/qtlib.po b/locale/hy/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/hy/LC_MESSAGES/qtlib.po rename to locale/hy/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/it/LC_MESSAGES/qtlib.po b/locale/it/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/it/LC_MESSAGES/qtlib.po rename to locale/it/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/ja/LC_MESSAGES/qtlib.po b/locale/ja/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/ja/LC_MESSAGES/qtlib.po rename to locale/ja/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/ko/LC_MESSAGES/qtlib.po b/locale/ko/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/ko/LC_MESSAGES/qtlib.po rename to locale/ko/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/ms/LC_MESSAGES/qtlib.po b/locale/ms/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/ms/LC_MESSAGES/qtlib.po rename to locale/ms/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/nl/LC_MESSAGES/qtlib.po b/locale/nl/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/nl/LC_MESSAGES/qtlib.po rename to locale/nl/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/pl_PL/LC_MESSAGES/qtlib.po b/locale/pl_PL/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/pl_PL/LC_MESSAGES/qtlib.po rename to locale/pl_PL/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/pt_BR/LC_MESSAGES/qtlib.po b/locale/pt_BR/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/pt_BR/LC_MESSAGES/qtlib.po rename to locale/pt_BR/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/qtlib.pot b/locale/qtlib.pot similarity index 100% rename from qtlib/locale/qtlib.pot rename to locale/qtlib.pot diff --git a/qtlib/locale/ru/LC_MESSAGES/qtlib.po b/locale/ru/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/ru/LC_MESSAGES/qtlib.po rename to locale/ru/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/tr/LC_MESSAGES/qtlib.po b/locale/tr/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/tr/LC_MESSAGES/qtlib.po rename to locale/tr/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/uk/LC_MESSAGES/qtlib.po b/locale/uk/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/uk/LC_MESSAGES/qtlib.po rename to locale/uk/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/vi/LC_MESSAGES/qtlib.po b/locale/vi/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/vi/LC_MESSAGES/qtlib.po rename to locale/vi/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/zh_CN/LC_MESSAGES/qtlib.po b/locale/zh_CN/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/zh_CN/LC_MESSAGES/qtlib.po rename to locale/zh_CN/LC_MESSAGES/qtlib.po diff --git a/qtlib/locale/zh_TW/LC_MESSAGES/qtlib.po b/locale/zh_TW/LC_MESSAGES/qtlib.po similarity index 100% rename from qtlib/locale/zh_TW/LC_MESSAGES/qtlib.po rename to locale/zh_TW/LC_MESSAGES/qtlib.po