diff options
Diffstat (limited to 'openstack_dashboard/management')
| -rw-r--r-- | openstack_dashboard/management/commands/update_catalog.py | 8 | ||||
| -rw-r--r-- | openstack_dashboard/management/commands/upgrade_check.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/openstack_dashboard/management/commands/update_catalog.py b/openstack_dashboard/management/commands/update_catalog.py index 1b2ac2505..48f57bfd8 100644 --- a/openstack_dashboard/management/commands/update_catalog.py +++ b/openstack_dashboard/management/commands/update_catalog.py @@ -33,12 +33,12 @@ MODULES = ['openstack_dashboard', 'horizon', 'openstack_auth'] def translate(segment): - prefix = u"" + prefix = "" # When the id starts with a newline the mo compiler enforces that # the translated message must also start with a newline. Make # sure that doesn't get broken when prepending the bracket. if segment.startswith('\n'): - prefix = u"\n" + prefix = "\n" orig_size = len(segment) # Add extra expansion space based on recommendation from # http://www-01.ibm.com/software/globalization/guidelines/a3.html @@ -54,7 +54,7 @@ def translate(segment): multiplier = 0.3 extra_length = int(max(0, (orig_size * multiplier) - 10)) extra_chars = "~" * extra_length - return u"{0}[~{1}~您好яшçあ{2}]".format(prefix, segment, extra_chars) + return "{0}[~{1}~您好яшçあ{2}]".format(prefix, segment, extra_chars) class Command(BaseCommand): @@ -121,7 +121,7 @@ class Command(BaseCommand): for msg in pot_cat: if msg.pluralizable: msg.string = [ - translate(u"{}:{}".format(i, msg.id[0])) + translate("{}:{}".format(i, msg.id[0])) for i in range(num_plurals)] else: msg.string = translate(msg.id) diff --git a/openstack_dashboard/management/commands/upgrade_check.py b/openstack_dashboard/management/commands/upgrade_check.py index d1af7b70c..c3c669720 100644 --- a/openstack_dashboard/management/commands/upgrade_check.py +++ b/openstack_dashboard/management/commands/upgrade_check.py @@ -156,7 +156,7 @@ def check_invalid_settings(dummy=None): if invalid: return upgradecheck.Result( upgradecheck.Code.WARNING, - _("Unknown settings: {}.").format(u", ".join(invalid)), + _("Unknown settings: {}.").format(", ".join(invalid)), ) return upgradecheck.Result(upgradecheck.Code.SUCCESS) @@ -173,7 +173,7 @@ def check_deprecated_settings(dummy=None): if deprecated: return upgradecheck.Result( upgradecheck.Code.FAILURE, - _("Deprecated settings: {}.").format(u", ".join(deprecated)), + _("Deprecated settings: {}.").format(", ".join(deprecated)), ) return upgradecheck.Result(upgradecheck.Code.SUCCESS) @@ -193,7 +193,7 @@ def check_required_settings(dummy=None): if missing: return upgradecheck.Result( upgradecheck.Code.FAILURE, - _("Missing required settings: {}.").format(u", ".join(missing)), + _("Missing required settings: {}.").format(", ".join(missing)), ) return upgradecheck.Result(upgradecheck.Code.SUCCESS) |