diff -Nru click-reviewers-tools-0.35/clickreviews/cr_scope.py click-reviewers-tools-0.35/clickreviews/cr_scope.py --- click-reviewers-tools-0.35/clickreviews/cr_scope.py 2015-11-18 16:01:40.000000000 +0000 +++ click-reviewers-tools-0.35/clickreviews/cr_scope.py 2015-11-18 16:08:30.000000000 +0000 @@ -148,7 +148,7 @@ f = i.lower() if f not in required and f not in optional and \ (f.split("[")[0] not in translated or not - re.search(r'.*\[[a-z][a-z](_[a-z][a-z])?\]$', f)): + re.search('.*\[[a-z]{2,3}(_[a-z]{2,3})?\]$', f)): unknown.append(f) if len(unknown) == 1: diff -Nru click-reviewers-tools-0.35/clickreviews/tests/test_cr_scope.py click-reviewers-tools-0.35/clickreviews/tests/test_cr_scope.py --- click-reviewers-tools-0.35/clickreviews/tests/test_cr_scope.py 2015-11-18 16:01:40.000000000 +0000 +++ click-reviewers-tools-0.35/clickreviews/tests/test_cr_scope.py 2015-11-18 16:08:30.000000000 +0000 @@ -145,6 +145,19 @@ expected_counts = {'info': None, 'warn': 0, 'error': 0} self.check_results(r, expected_counts) + def test_check_scope_ini_translated_field3(self): + '''Test check_scope_ini() - translated field - ast''' + config = self._stub_config() + config['searchhint[ast]'] = "foo" + scope = self._create_scope(config) + + self.set_test_scope(self.default_appname, scope) + c = ClickReviewScope(self.test_name) + c.check_scope_ini() + r = c.click_report + expected_counts = {'info': None, 'warn': 0, 'error': 0} + self.check_results(r, expected_counts) + def test_check_scope_ini_bad_translated_field(self): '''Test check_scope_ini() - bad translated field''' config = self._stub_config() @@ -158,6 +171,19 @@ expected_counts = {'info': None, 'warn': 1, 'error': 0} self.check_results(r, expected_counts) + def test_check_scope_ini_bad_translated_field2(self): + '''Test check_scope_ini() - translated field - de_DE''' + config = self._stub_config() + config['searchhint[de_DE]'] = "foo" + scope = self._create_scope(config) + + self.set_test_scope(self.default_appname, scope) + c = ClickReviewScope(self.test_name) + c.check_scope_ini() + r = c.click_report + expected_counts = {'info': None, 'warn': 0, 'error': 0} + self.check_results(r, expected_counts) + def test_check_scope_ini_nonexistent_field(self): '''Test check_scope_ini() - non-existent field''' config = self._stub_config() diff -Nru click-reviewers-tools-0.35/debian/bzr-builder.manifest click-reviewers-tools-0.35/debian/bzr-builder.manifest --- click-reviewers-tools-0.35/debian/bzr-builder.manifest 2015-11-18 16:01:41.000000000 +0000 +++ click-reviewers-tools-0.35/debian/bzr-builder.manifest 2015-11-18 16:08:30.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~548 -lp:click-reviewers-tools revid:jamie@ubuntu.com-20151118155623-e3ewmdxr6df8amm8 +# bzr-builder format 0.3 deb-version {debupstream}-0~550 +lp:click-reviewers-tools revid:daniel.holbach@canonical.com-20151118160525-2795s50iitvkusyc diff -Nru click-reviewers-tools-0.35/debian/changelog click-reviewers-tools-0.35/debian/changelog --- click-reviewers-tools-0.35/debian/changelog 2015-11-18 16:01:41.000000000 +0000 +++ click-reviewers-tools-0.35/debian/changelog 2015-11-18 16:08:30.000000000 +0000 @@ -1,8 +1,8 @@ -click-reviewers-tools (0.35-0~548~ubuntu16.04.1) xenial; urgency=low +click-reviewers-tools (0.35-0~550~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Daniel Holbach Wed, 18 Nov 2015 16:01:41 +0000 + -- Daniel Holbach Wed, 18 Nov 2015 16:08:30 +0000 click-reviewers-tools (0.35) UNRELEASED; urgency=medium @@ -37,8 +37,10 @@ [ Daniel Holbach ] * Pass absolute path of click or snap file - that way it's safe even if we chdir (LP: #1514346). + * Allow translated scope .ini fields to have 3 letters as their lang_code + identifier, ie. 'ast'. (LP: #1517017) - -- Jamie Strandboge Thu, 12 Nov 2015 07:36:49 -0600 + -- Daniel Holbach Tue, 17 Nov 2015 13:40:38 +0100 click-reviewers-tools (0.34) wily; urgency=medium