From 52776b2dcb0fd150bdbb1fafc0c17647fa339c60 Mon Sep 17 00:00:00 2001 From: Osmo Salomaa Date: Wed, 8 Nov 2017 01:38:02 +0200 Subject: [PATCH] Drop build dependency on intltool Closes #13 --- .gitignore | 2 +- .travis.yml | 2 +- INSTALL.md | 2 +- TODO.md | 6 +- .../custom-framerates.extension.in | 4 +- .../test/test_custom-framerates.py | 1 + data/gaupol.appdata.xml.in | 6 +- data/gaupol.desktop.in | 8 +- data/patterns/Latn-en-US.common-error.in | 4 +- data/patterns/Latn-en.capitalization.in | 4 +- data/patterns/Latn-en.common-error.in | 52 +++--- data/patterns/Latn-en.hearing-impaired.in | 4 +- data/patterns/Latn-en.line-break.in | 16 +- data/patterns/Latn-fi.common-error.in | 4 +- data/patterns/Latn-fr.common-error.in | 24 +-- data/patterns/Latn.capitalization.in | 8 +- data/patterns/Latn.common-error.in | 104 +++++------ data/patterns/Latn.hearing-impaired.in | 20 +- data/patterns/Latn.line-break.in | 20 +- data/patterns/Zyyy.common-error.in | 32 ++-- manifests/clean.manifest | 1 + po/POTFILES.in | 176 ------------------ po/POTFILES.skip | 6 - po/README.md | 4 +- setup.py | 62 ++++-- tools/update-translations | 66 ++++++- 26 files changed, 276 insertions(+), 362 deletions(-) delete mode 100644 po/POTFILES.in delete mode 100644 po/POTFILES.skip diff --git a/.gitignore b/.gitignore index 1ea6f1fa..b71ede60 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ data/patterns/*.hearing-impaired data/patterns/*.line-break dist locale -winsetup.log +po/LINGUAS diff --git a/.travis.yml b/.travis.yml index ddd8acf9..f27f28fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - 3.6 before_install: - sudo apt-get update -qq - - sudo apt-get install -y enchant gettext intltool + - sudo apt-get install -y enchant gettext - pip install chardet pyenchant script: - py.test aeidon diff --git a/INSTALL.md b/INSTALL.md index f0e12f8d..1b210632 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -5,7 +5,7 @@ To install, run command python3 setup.py install [--prefix=...] -You'll need Python, gettext and intltool. +In addition to Python, you'll need gettext. Developers or packagers interested in installing Python packages aeidon and gaupol separately, see the file [`README.aeidon.md`](README.aeidon.md). diff --git a/TODO.md b/TODO.md index 79e53e08..081e331b 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,10 @@ -Gaupol 1.2.1/1.3 -================ +Gaupol 1.3 +========== * [x] Fix unhandled exception when adding recent menu items * [x] Fix video player actions being sensitive when playback initialization fails (#52) * [x] Install appdata XML file under /usr/share/metainfo +* [x] Drop build dependency on intltool (use gettext instead, #13) * [x] Add donate button to about dialog +* [ ] Update translations diff --git a/data/extensions/custom-framerates/custom-framerates.extension.in b/data/extensions/custom-framerates/custom-framerates.extension.in index 2fdddd67..3459ba87 100644 --- a/data/extensions/custom-framerates/custom-framerates.extension.in +++ b/data/extensions/custom-framerates/custom-framerates.extension.in @@ -1,8 +1,8 @@ [Extension] GaupolVersion=1.2 Module=custom-framerates -_Name=Custom Framerates -_Description=Allow use of non-standard framerates +Name=Custom Framerates +Description=Allow use of non-standard framerates Version=1.2 Authors=Osmo Salomaa ; Copyright=Copyright © 2011 Osmo Salomaa; diff --git a/data/extensions/custom-framerates/test/test_custom-framerates.py b/data/extensions/custom-framerates/test/test_custom-framerates.py index d24f3028..22a63277 100644 --- a/data/extensions/custom-framerates/test/test_custom-framerates.py +++ b/data/extensions/custom-framerates/test/test_custom-framerates.py @@ -20,6 +20,7 @@ sys.path.insert(0, os.path.abspath(os.path.join( os.path.dirname(__file__), ".."))) + sys.path.insert(1, os.path.abspath(os.path.join( os.path.dirname(__file__), "..", "..", "..", ".."))) diff --git a/data/gaupol.appdata.xml.in b/data/gaupol.appdata.xml.in index 3eda7ff8..012354e7 100644 --- a/data/gaupol.appdata.xml.in +++ b/data/gaupol.appdata.xml.in @@ -6,16 +6,16 @@ CC0-1.0 GPL-3.0+ - <_p>Gaupol is an editor for text-based subtitle files. It supports +

Gaupol is an editor for text-based subtitle files. It supports multiple subtitle file formats and provides means of creating subtitles, editing texts and timing subtitles to match video. The user interface is designed with attention to batch processing of - multiple documents and convenience of translating. + multiple documents and convenience of translating.

 https://otsaloma.io/gaupol/screenshot-appdata.png - <_caption>Main window + Main window https://otsaloma.io/gaupol/ diff --git a/data/gaupol.desktop.in b/data/gaupol.desktop.in index c7828138..bb50448b 100644 --- a/data/gaupol.desktop.in +++ b/data/gaupol.desktop.in @@ -1,9 +1,9 @@ [Desktop Entry] Name=Gaupol -_GenericName=Subtitle Editor -_Comment=Edit subtitle files +GenericName=Subtitle Editor +Comment=Edit subtitle files # TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -_Keywords=video;subtitles;captions; +Keywords=video;subtitles;captions; Exec=gaupol %F Terminal=false StartupNotify=true @@ -11,4 +11,4 @@ Icon=gaupol Type=Application MimeType=text/x-microdvd;text/x-ssa;application/x-subrip;text/x-subviewer;text/vtt; Categories=GTK;AudioVideo;Video; -_X-GNOME-FullName=Gaupol Subtitle Editor +X-GNOME-FullName=Gaupol Subtitle Editor diff --git a/data/patterns/Latn-en-US.common-error.in b/data/patterns/Latn-en-US.common-error.in index 56fb9039..9f7646ae 100644 --- a/data/patterns/Latn-en-US.common-error.in +++ b/data/patterns/Latn-en-US.common-error.in @@ -1,8 +1,8 @@ # -*- conf -*- [Common Error Pattern] -_Name=Period after title -_Description=Add period after a shortened title, such as "Mr" and "Dr" +Name=Period after title +Description=Add period after a shortened title, such as "Mr" and "Dr" Classes=Human; Pattern=\b(Dr|Jr|Mr|Mrs|Ms|Sr|St)\b(?!\.) Flags=DOTALL;MULTILINE; diff --git a/data/patterns/Latn-en.capitalization.in b/data/patterns/Latn-en.capitalization.in index c55ea4b5..6492a469 100644 --- a/data/patterns/Latn-en.capitalization.in +++ b/data/patterns/Latn-en.capitalization.in @@ -1,8 +1,8 @@ # -*- conf -*- [Capitalization Pattern] -_Name=First person pronoun -_Description=Capitalize the first person pronoun "I" +Name=First person pronoun +Description=Capitalize the first person pronoun "I" Capitalize=Start Pattern=\bi\b Flags=DOTALL;MULTILINE; diff --git a/data/patterns/Latn-en.common-error.in b/data/patterns/Latn-en.common-error.in index ab0fa1b5..c1785d45 100644 --- a/data/patterns/Latn-en.common-error.in +++ b/data/patterns/Latn-en.common-error.in @@ -1,8 +1,8 @@ # -*- conf -*- [Common Error Pattern] -_Name=Letter "I" in a lower case word -_Description=Replace letter "I" with letter "l" in a lower case word +Name=Letter "I" in a lower case word +Description=Replace letter "I" with letter "l" in a lower case word Classes=OCR; Pattern=(?<=[a-z])I Flags=DOTALL;MULTILINE; @@ -10,8 +10,8 @@ Replacement=l Repeat=True [Common Error Pattern] -_Name=Letter "I" in a lower case word -_Description=Replace letter "I" with letter "l" in a lower case word +Name=Letter "I" in a lower case word +Description=Replace letter "I" with letter "l" in a lower case word Classes=OCR; Pattern=(?<=\b[A-Z])I(?=[a-z]) Flags=DOTALL;MULTILINE; @@ -19,8 +19,8 @@ Replacement=l Repeat=True [Common Error Pattern] -_Name=Letter "I" in a lower case word -_Description=Replace letter "I" with letter "l" in a lower case word +Name=Letter "I" in a lower case word +Description=Replace letter "I" with letter "l" in a lower case word Classes=OCR; Pattern='[Il][Il]\b Flags=DOTALL;MULTILINE; @@ -28,8 +28,8 @@ Replacement='ll Repeat=False [Common Error Pattern] -_Name=Letter "l" in an upper case word -_Description=Replace letter "l" with letter "I" in an upper case word +Name=Letter "l" in an upper case word +Description=Replace letter "l" with letter "I" in an upper case word Classes=OCR; Pattern=(?<=[A-Z][A-Z])l Flags=DOTALL;MULTILINE; @@ -37,8 +37,8 @@ Replacement=I Repeat=True [Common Error Pattern] -_Name=Letter "l" in an upper case word -_Description=Replace letter "l" with letter "I" in an upper case word +Name=Letter "l" in an upper case word +Description=Replace letter "l" with letter "I" in an upper case word Classes=OCR; Pattern=l(?=[A-Z]) Flags=DOTALL;MULTILINE; @@ -46,8 +46,8 @@ Replacement=I Repeat=True [Common Error Pattern] -_Name=Letter "l" in an upper case word -_Description=Replace letter "l" with letter "I" in an upper case word +Name=Letter "l" in an upper case word +Description=Replace letter "l" with letter "I" in an upper case word Classes=OCR; # Handle the case of the first person pronoun "I". # Disallow dashes for the case of spelling out a word, but allow them @@ -58,8 +58,8 @@ Replacement=I Repeat=True [Common Error Pattern] -_Name=Letter "l" in an upper case word -_Description=Replace letter "l" with letter "I" in an upper case word +Name=Letter "l" in an upper case word +Description=Replace letter "l" with letter "I" in an upper case word Classes=OCR; # Replace with "I" if "l" is the the first letter of a word # and is followed by a consonant. @@ -69,8 +69,8 @@ Replacement=\1I\3 Repeat=False [Common Error Pattern] -_Name=Zero in an upper case word -_Description=Replace zero with letter "O" in an upper case word +Name=Zero in an upper case word +Description=Replace zero with letter "O" in an upper case word Classes=OCR; Pattern=(?<=[A-Z])0(?!\d) Flags=DOTALL;MULTILINE; @@ -78,8 +78,8 @@ Replacement=O Repeat=True [Common Error Pattern] -_Name=Zero in an upper case word -_Description=Replace zero with letter "O" in an upper case word +Name=Zero in an upper case word +Description=Replace zero with letter "O" in an upper case word Classes=OCR; Pattern=(?