External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-13 17:14:40 -03:30
Code Issues Packages Projects Releases Wiki Activity

Get Japanese API l10 working

Browse Source 
Worked with matburt on this. There were some inconsistencies between our code and the po files.
This commit is contained in:
Shane McDonald
2017-01-13 14:47:42 -05:00
parent 824996d3a1
commit e0cd4bc7ae
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/locale/ja/LC_MESSAGES/django.po
View File

@@ -1961,17 +1961,17 @@ msgstr "認証情報がクラウドソースに必要です。"
#: main/models/inventory.py:1005 #: main/models/inventory.py:1005
#, python-format #, python-format
msgid "Invalid %(source)s region%(plural)s: %(region)s" msgid "Invalid %(source)s region: %(region)s"
msgstr "無効な %(source)s リージョン: %(region)s" msgstr "無効な %(source)s リージョン: %(region)s"
#: main/models/inventory.py:1031 #: main/models/inventory.py:1031
#, python-format #, python-format
msgid "Invalid filter expression%(plural)s: %(filter)s" msgid "Invalid filter expression: %(filter)s"
msgstr "無効なフィルター式: %(filter)s" msgstr "無効なフィルター式: %(filter)s"
#: main/models/inventory.py:1050 #: main/models/inventory.py:1050
#, python-format #, python-format
msgid "Invalid group by choice%(plural)s: %(choice)s" msgid "Invalid group by choice: %(choice)s"
msgstr "無効なグループ (選択による): %(choice)s" msgstr "無効なグループ (選択による): %(choice)s"
#: main/models/inventory.py:1198 #: main/models/inventory.py:1198

15
awx/main/models/inventory.py
View File

@@ -1002,9 +1002,8 @@ class InventorySourceOptions(BaseModel):
if r not in valid_regions and r not in invalid_regions: if r not in valid_regions and r not in invalid_regions:
invalid_regions.append(r) invalid_regions.append(r)
if invalid_regions: if invalid_regions:
raise ValidationError(_('Invalid %(source)s region%(plural)s: %(region)s') % { raise ValidationError(_('Invalid %(source)s region: %(region)s') % {
'source': self.source, 'plural': '' if len(invalid_regions) == 1 else 's', 'source': self.source, 'region': ', '.join(invalid_regions)})
'region': ', '.join(invalid_regions)})
return ','.join(regions) return ','.join(regions)
source_vars_dict = VarsDictProperty('source_vars') source_vars_dict = VarsDictProperty('source_vars')
@@ -1028,9 +1027,8 @@ class InventorySourceOptions(BaseModel):
if instance_filter_name not in self.INSTANCE_FILTER_NAMES: if instance_filter_name not in self.INSTANCE_FILTER_NAMES:
invalid_filters.append(instance_filter) invalid_filters.append(instance_filter)
if invalid_filters: if invalid_filters:
raise ValidationError(_('Invalid filter expression%(plural)s: %(filter)s') % raise ValidationError(_('Invalid filter expression: %(filter)s') %
{'plural': '' if len(invalid_filters) == 1 else 's', {'filter': ', '.join(invalid_filters)})
'filter': ', '.join(invalid_filters)})
return instance_filters return instance_filters
def clean_group_by(self): def clean_group_by(self):
@@ -1047,9 +1045,8 @@ class InventorySourceOptions(BaseModel):
if c not in valid_choices and c not in invalid_choices: if c not in valid_choices and c not in invalid_choices:
invalid_choices.append(c) invalid_choices.append(c)
if invalid_choices: if invalid_choices:
raise ValidationError(_('Invalid group by choice%(plural)s: %(choice)s') % raise ValidationError(_('Invalid group by choice: %(choice)s') %
{'plural': '' if len(invalid_choices) == 1 else 's', {'choice': ', '.join(invalid_choices)})
'choice': ', '.join(invalid_choices)})
return ','.join(choices) return ','.join(choices)