From d107e4d9b5a6374007a0f265884b3b237d805eaf Mon Sep 17 00:00:00 2001 From: Joe Topjian Date: Wed, 13 Feb 2013 21:44:49 +0000 Subject: [PATCH] Replaces ugettext with ugettext_lazy in the dashboard-related files While most files correctly import ugettext_lazy, some are importing ugettext instead. This is causing some parts of the dashboard to not translate correctly when a user switches languages. The core cause of this is because ugettext will translate the string once when the django application starts. ugettext_lazy will translate when the string is retrieved. Change-Id: Ibbdef60b3616d13aa7c2c5449ca592bf214a5f71 Fixes: bug #1124276 --- .../dashboards/admin/networks/subnets/workflows.py | 2 +- openstack_dashboard/dashboards/admin/projects/workflows.py | 2 +- openstack_dashboard/dashboards/project/instances/workflows.py | 2 +- .../dashboards/project/networks/subnets/workflows.py | 2 +- openstack_dashboard/dashboards/project/networks/workflows.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py b/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py index 0b479ca372e..798c352c722 100644 --- a/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py +++ b/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py @@ -17,7 +17,7 @@ import logging from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import exceptions diff --git a/openstack_dashboard/dashboards/admin/projects/workflows.py b/openstack_dashboard/dashboards/admin/projects/workflows.py index 91527bb5ab2..aa5b78ceaeb 100644 --- a/openstack_dashboard/dashboards/admin/projects/workflows.py +++ b/openstack_dashboard/dashboards/admin/projects/workflows.py @@ -20,7 +20,7 @@ from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse from horizon import exceptions diff --git a/openstack_dashboard/dashboards/project/instances/workflows.py b/openstack_dashboard/dashboards/project/instances/workflows.py index 2e4f78e9cbe..a6069b0f92c 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows.py +++ b/openstack_dashboard/dashboards/project/instances/workflows.py @@ -22,7 +22,7 @@ import logging from django.utils.text import normalize_newlines -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms diff --git a/openstack_dashboard/dashboards/project/networks/subnets/workflows.py b/openstack_dashboard/dashboards/project/networks/subnets/workflows.py index 469c609d2cd..0289b614ad7 100644 --- a/openstack_dashboard/dashboards/project/networks/subnets/workflows.py +++ b/openstack_dashboard/dashboards/project/networks/subnets/workflows.py @@ -19,7 +19,7 @@ import netaddr from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms diff --git a/openstack_dashboard/dashboards/project/networks/workflows.py b/openstack_dashboard/dashboards/project/networks/workflows.py index 74b07e924cd..a1381a4cd02 100644 --- a/openstack_dashboard/dashboards/project/networks/workflows.py +++ b/openstack_dashboard/dashboards/project/networks/workflows.py @@ -19,7 +19,7 @@ import netaddr from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms