From e0cd4bc7aee2eeceb01856b3c729e67c329e2eaf Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Fri, 13 Jan 2017 14:47:42 -0500
Subject: [PATCH] Get Japanese API l10 working

Worked with matburt on this. There were some inconsistencies between our code and the po files.
---
 awx/locale/ja/LC_MESSAGES/django.po |  6 +++---
 awx/main/models/inventory.py        | 15 ++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/awx/locale/ja/LC_MESSAGES/django.po b/awx/locale/ja/LC_MESSAGES/django.po
index 3d734acfd1..34aee63799 100644
--- a/awx/locale/ja/LC_MESSAGES/django.po
+++ b/awx/locale/ja/LC_MESSAGES/django.po
@@ -1961,17 +1961,17 @@ msgstr "認証情報がクラウドソースに必要です。"
 
 #: main/models/inventory.py:1005
 #, python-format
-msgid "Invalid %(source)s region%(plural)s: %(region)s"
+msgid "Invalid %(source)s region: %(region)s"
 msgstr "無効な %(source)s リージョン: %(region)s"
 
 #: main/models/inventory.py:1031
 #, python-format
-msgid "Invalid filter expression%(plural)s: %(filter)s"
+msgid "Invalid filter expression: %(filter)s"
 msgstr "無効なフィルター式: %(filter)s"
 
 #: main/models/inventory.py:1050
 #, python-format
-msgid "Invalid group by choice%(plural)s: %(choice)s"
+msgid "Invalid group by choice: %(choice)s"
 msgstr "無効なグループ (選択による): %(choice)s"
 
 #: main/models/inventory.py:1198
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index e7183f356d..b01d44802c 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -1002,9 +1002,8 @@ class InventorySourceOptions(BaseModel):
             if r not in valid_regions and r not in invalid_regions:
                 invalid_regions.append(r)
         if invalid_regions:
-            raise ValidationError(_('Invalid %(source)s region%(plural)s: %(region)s') % {
-                'source': self.source, 'plural': '' if len(invalid_regions) == 1 else 's',
-                'region': ', '.join(invalid_regions)})
+            raise ValidationError(_('Invalid %(source)s region: %(region)s') % {
+                'source': self.source, 'region': ', '.join(invalid_regions)})
         return ','.join(regions)
 
     source_vars_dict = VarsDictProperty('source_vars')
@@ -1028,9 +1027,8 @@ class InventorySourceOptions(BaseModel):
             if instance_filter_name not in self.INSTANCE_FILTER_NAMES:
                 invalid_filters.append(instance_filter)
         if invalid_filters:
-            raise ValidationError(_('Invalid filter expression%(plural)s: %(filter)s') %
-                                  {'plural': '' if len(invalid_filters) == 1 else 's',
-                                   'filter': ', '.join(invalid_filters)})
+            raise ValidationError(_('Invalid filter expression: %(filter)s') %
+                                  {'filter': ', '.join(invalid_filters)})
         return instance_filters
 
     def clean_group_by(self):
@@ -1047,9 +1045,8 @@ class InventorySourceOptions(BaseModel):
             if c not in valid_choices and c not in invalid_choices:
                 invalid_choices.append(c)
         if invalid_choices:
-            raise ValidationError(_('Invalid group by choice%(plural)s: %(choice)s') %
-                                  {'plural': '' if len(invalid_choices) == 1 else 's',
-                                   'choice': ', '.join(invalid_choices)})
+            raise ValidationError(_('Invalid group by choice: %(choice)s') %
+                                  {'choice': ', '.join(invalid_choices)})
         return ','.join(choices)