Merge lp:~dholbach/click-reviewers-tools/1517017 into lp:click-reviewers-tools

[Daniel Holbach]

Allow translated scope .ini fields to have 3 letters as their lang_code identifier, ie. 'ast'. (LP: #1517017)

[lp:~dholbach/click-reviewers-tools/1517017]

549. By Daniel Holbach on 2015-11-17

fix changelog version number

[Jamie Strandboge (jdstrand)]

LGTM so long as the testsuite passes. Thanks!

review: Approve

[Daniel Holbach (dholbach)]

Ran 593 tests in 6.666s

OK

=== modified file 'clickreviews/cr_scope.py'
--- clickreviews/cr_scope.py	2015-08-13 21:07:13 +0000
+++ clickreviews/cr_scope.py	2015-11-17 12:43:53 +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:

=== modified file 'clickreviews/tests/test_cr_scope.py'
--- clickreviews/tests/test_cr_scope.py	2015-10-16 02:54:07 +0000
+++ clickreviews/tests/test_cr_scope.py	2015-11-17 12:43:53 +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()

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-12 13:37:12 +0000
+++ debian/changelog	2015-11-17 12:43:53 +0000
@@ -30,8 +30,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 <[e-mail]>  Thu, 12 Nov 2015 07:36:49 -0600
+ -- Daniel Holbach <[e-mail]>  Tue, 17 Nov 2015 13:40:38 +0100
 
 click-reviewers-tools (0.34) wily; urgency=medium