From b9b97174e240d2fb47151cf4720e22f067c6717d Mon Sep 17 00:00:00 2001 From: Michael Gorven Date: Fri, 6 Nov 2009 11:29:38 +0200 Subject: [PATCH 1/4] Improve transaltion string regex. --- openlp-get-strings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 openlp-get-strings.py diff --git a/openlp-get-strings.py b/openlp-get-strings.py old mode 100644 new mode 100755 index e53924b02..dc101e945 --- a/openlp-get-strings.py +++ b/openlp-get-strings.py @@ -42,7 +42,7 @@ ts_message = u""" """ -find_trUtf8 = re.compile(r"trUtf8\(u'([\.:;\\&\w]+)'\)", re.UNICODE) +find_trUtf8 = re.compile(r"trUtf8\(u['\"]([^)]+)['\"]\)", re.UNICODE) strings = {} def parse_file(filename): From a9a53d9c947851e166beba80ae5613a8e3d54364 Mon Sep 17 00:00:00 2001 From: Michael Gorven Date: Fri, 6 Nov 2009 11:40:31 +0200 Subject: [PATCH 2/4] Use string quotes to detect end. --- openlp-get-strings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp-get-strings.py b/openlp-get-strings.py index dc101e945..adb2f8821 100755 --- a/openlp-get-strings.py +++ b/openlp-get-strings.py @@ -42,7 +42,7 @@ ts_message = u""" """ -find_trUtf8 = re.compile(r"trUtf8\(u['\"]([^)]+)['\"]\)", re.UNICODE) +find_trUtf8 = re.compile(r"trUtf8\(u?(['\"])([^\1]+)\1\)", re.UNICODE) strings = {} def parse_file(filename): From 4ee481ca6e43aa06ad83412a7cc3e0ab91bb8666 Mon Sep 17 00:00:00 2001 From: Michael Gorven Date: Fri, 6 Nov 2009 11:52:04 +0200 Subject: [PATCH 3/4] Change to Unicode string. --- openlp/core/ui/amendthemeform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index 652b26284..b3a1d49e7 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -193,7 +193,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): def onImageToolButtonClicked(self): filename = QtGui.QFileDialog.getOpenFileName( - self, self.trUtf8('Open file')) + self, self.trUtf8(u'Open file')) if filename: self.ImageLineEdit.setText(filename) self.theme.background_filename = filename From cf4291b73b0d81b5a4f46d2037e1b9e2a3a7c19f Mon Sep 17 00:00:00 2001 From: Michael Gorven Date: Sat, 21 Nov 2009 14:53:36 +0200 Subject: [PATCH 4/4] Use the right match... --- openlp-get-strings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp-get-strings.py b/openlp-get-strings.py index adb2f8821..02aa16772 100755 --- a/openlp-get-strings.py +++ b/openlp-get-strings.py @@ -56,9 +56,9 @@ def parse_file(filename): class_name = line[6:line.find(u'(')] continue for match in find_trUtf8.finditer(line): - key = u'%s-%s' % (class_name, match.group(1)) + key = u'%s-%s' % (class_name, match.group(2)) if not key in strings: - strings[key] = [class_name, filename, line_number, match.group(1)] + strings[key] = [class_name, filename, line_number, match.group(2)] file.close() def write_file(filename):