Hi guys, I'm not sure about removal of this line: potcheckfile = checkfile + ".h"
but as far as I can tell it should be the correct thing to do. There are both .glade and .glade.h files and I think the .h files need to go. Everything else appears to be OK.
Please comment.
From: Alexander Todorov atodorov@redhat.com
--- tests/gettext/gettext_potfiles.py | 3 +-- tests/gettext/style_guide.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/gettext/gettext_potfiles.py b/tests/gettext/gettext_potfiles.py index 1a77ec1..5d80308 100755 --- a/tests/gettext/gettext_potfiles.py +++ b/tests/gettext/gettext_potfiles.py @@ -35,7 +35,7 @@ def check_potfile(checkfile, potlist): elif checkfile.endswith(".glade"): # Look for a "translatable=yes" attribute if ET.parse(checkfile).findall(".//*[@translatable='yes']"): - potcheckfile = checkfile + ".h" + potcheckfile = checkfile elif checkfile.endswith(".desktop.in"): # These are handled by intltool, make sure the .h version is present potcheckfile = checkfile + ".h" @@ -59,7 +59,6 @@ def check_potfile(checkfile, potlist):
# Walk the source tree and look for files with translatable strings for testfile in testfilelist(): - sys.stderr.write(testfile + "\n") check_potfile(testfile, POTFILES)
if not success: diff --git a/tests/gettext/style_guide.py b/tests/gettext/style_guide.py index 7aeff08..9f7d273 100755 --- a/tests/gettext/style_guide.py +++ b/tests/gettext/style_guide.py @@ -31,7 +31,8 @@ 'BTRFS': 'Btrfs', 'btrfs': 'Btrfs', '[Cc]an not': 'cannot', - '(?i)mountpoint': 'mount point'} + '(?i)mountpoint': 'mount point', + 'Ok': 'OK'}
# Sometimes we need to use a bad string, or it's just too much of a pain to # write a more specific regex. List occurrences here.
In reply to line 38 of tests/gettext/gettext_potfiles.py:
This should be left alone. The master branch uses a newer gettext that can handle glade files directly, but rhel7-branch does not have this luxury and has to generate glade.h files first.
The rest looks fine. I think the stderr.write was something I left in by accident, and Ok -> OK is obviously OK.
anaconda-patches@lists.fedorahosted.org