Branko Vukelic avatar Branko Vukelic committed f8b27aa

Do not write native label twice if it's in English

Comments (0)

Files changed (2)


             languages_english.append((l_id, _(l.english_name)))
             if l.display_name:
                 languages_native.append((l_id, l.display_name))
-                languages.append(
-                    (l_id, "%s (%s)" % (l.display_name, l.english_name))
-                )
+                if l.display_name == l.english_name:
+                    label = '%s' % l.english_name
+                else:
+                    label = '%s (%s)' % (l.display_name, l.english_name)
+                languages.append((l_id, label))
 class Country(models.Model):
     def test_language_list(self):
         self.assertIn(('ja', '日本語 (Japanese)'), languages)
+    def test_english_name_has_no_parens(self):
+        self.assertIn(('en_US', 'U.S. English'), languages)
     def test_language_native_list(self):
         self.assertIn(('ja', '日本語'), languages_native)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.