From 8e83bc8bc406a70432ea52084010f03765c3aa1c Mon Sep 17 00:00:00 2001 From: Jim Yeh Date: Thu, 22 Mar 2012 21:15:56 +0800 Subject: [PATCH] Use ugettext_lazy for verbose_texts instead of unicode. * Fix bug 962417 * Change the ugettext to ugettext_lazy * Unicode the verbose_name while the DataTableOption is initialize will make the translation fixed. * Similar scenario in Column class and Action class. Change-Id: I69ce9f89b0f0c2afb32b26e15ea8db84828d840f --- .../nova/access_and_security/floating_ips/forms.py | 2 +- .../nova/access_and_security/floating_ips/tables.py | 2 +- .../nova/access_and_security/floating_ips/views.py | 2 +- .../nova/access_and_security/keypairs/forms.py | 2 +- .../nova/access_and_security/keypairs/tables.py | 2 +- .../nova/access_and_security/keypairs/views.py | 2 +- .../nova/access_and_security/security_groups/forms.py | 2 +- .../nova/access_and_security/security_groups/tables.py | 2 +- .../nova/access_and_security/security_groups/views.py | 2 +- horizon/dashboards/nova/access_and_security/views.py | 2 +- horizon/dashboards/nova/containers/forms.py | 2 +- horizon/dashboards/nova/containers/tables.py | 2 +- horizon/dashboards/nova/containers/views.py | 2 +- .../nova/images_and_snapshots/images/forms.py | 2 +- .../nova/images_and_snapshots/images/tables.py | 2 +- .../nova/images_and_snapshots/images/tabs.py | 2 +- .../nova/images_and_snapshots/images/views.py | 2 +- .../nova/images_and_snapshots/snapshots/forms.py | 2 +- .../nova/images_and_snapshots/snapshots/tables.py | 2 +- .../nova/images_and_snapshots/snapshots/views.py | 2 +- horizon/dashboards/nova/images_and_snapshots/views.py | 2 +- .../images_and_snapshots/volume_snapshots/tables.py | 2 +- .../nova/instances_and_volumes/instances/forms.py | 2 +- .../nova/instances_and_volumes/instances/tables.py | 2 +- .../nova/instances_and_volumes/instances/tabs.py | 2 +- .../nova/instances_and_volumes/instances/views.py | 2 +- horizon/dashboards/nova/instances_and_volumes/views.py | 2 +- .../nova/instances_and_volumes/volumes/forms.py | 2 +- .../nova/instances_and_volumes/volumes/tables.py | 2 +- .../nova/instances_and_volumes/volumes/tabs.py | 2 +- .../nova/instances_and_volumes/volumes/views.py | 2 +- horizon/dashboards/syspanel/flavors/forms.py | 2 +- horizon/dashboards/syspanel/flavors/views.py | 2 +- horizon/dashboards/syspanel/images/tables.py | 2 +- horizon/dashboards/syspanel/images/views.py | 2 +- horizon/dashboards/syspanel/instances/tables.py | 2 +- horizon/dashboards/syspanel/instances/views.py | 2 +- horizon/dashboards/syspanel/projects/forms.py | 2 +- horizon/dashboards/syspanel/projects/views.py | 2 +- horizon/dashboards/syspanel/users/forms.py | 2 +- horizon/dashboards/syspanel/users/tables.py | 2 +- horizon/dashboards/syspanel/users/views.py | 2 +- horizon/tables/actions.py | 8 ++++---- horizon/tables/base.py | 10 +++++----- horizon/usage/tables.py | 2 +- 45 files changed, 52 insertions(+), 52 deletions(-) diff --git a/horizon/dashboards/nova/access_and_security/floating_ips/forms.py b/horizon/dashboards/nova/access_and_security/floating_ips/forms.py index 59225a1c4..e2f35f5f1 100644 --- a/horizon/dashboards/nova/access_and_security/floating_ips/forms.py +++ b/horizon/dashboards/nova/access_and_security/floating_ips/forms.py @@ -23,7 +23,7 @@ import logging from django.contrib import messages from django import shortcuts -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from novaclient import exceptions as novaclient_exceptions from horizon import api diff --git a/horizon/dashboards/nova/access_and_security/floating_ips/tables.py b/horizon/dashboards/nova/access_and_security/floating_ips/tables.py index 74fe0664a..b71fea112 100644 --- a/horizon/dashboards/nova/access_and_security/floating_ips/tables.py +++ b/horizon/dashboards/nova/access_and_security/floating_ips/tables.py @@ -19,7 +19,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/access_and_security/floating_ips/views.py b/horizon/dashboards/nova/access_and_security/floating_ips/views.py index 898422347..07bd4c894 100644 --- a/horizon/dashboards/nova/access_and_security/floating_ips/views.py +++ b/horizon/dashboards/nova/access_and_security/floating_ips/views.py @@ -25,7 +25,7 @@ Views for managing Nova floating IPs. 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 api from horizon import exceptions diff --git a/horizon/dashboards/nova/access_and_security/keypairs/forms.py b/horizon/dashboards/nova/access_and_security/keypairs/forms.py index c96174125..d83e400da 100644 --- a/horizon/dashboards/nova/access_and_security/keypairs/forms.py +++ b/horizon/dashboards/nova/access_and_security/keypairs/forms.py @@ -23,7 +23,7 @@ import logging from django import shortcuts from django.contrib import messages from django.core import validators -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from novaclient import exceptions as novaclient_exceptions from horizon import api diff --git a/horizon/dashboards/nova/access_and_security/keypairs/tables.py b/horizon/dashboards/nova/access_and_security/keypairs/tables.py index 54306ae65..8a9345c32 100644 --- a/horizon/dashboards/nova/access_and_security/keypairs/tables.py +++ b/horizon/dashboards/nova/access_and_security/keypairs/tables.py @@ -16,7 +16,7 @@ import logging -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/nova/access_and_security/keypairs/views.py b/horizon/dashboards/nova/access_and_security/keypairs/views.py index 5bfba1655..a4b8683cf 100644 --- a/horizon/dashboards/nova/access_and_security/keypairs/views.py +++ b/horizon/dashboards/nova/access_and_security/keypairs/views.py @@ -27,7 +27,7 @@ from django import http from django.core.urlresolvers import reverse from django.template.defaultfilters import slugify from django.views.generic import View, TemplateView -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from .forms import CreateKeypair, ImportKeypair from horizon import api diff --git a/horizon/dashboards/nova/access_and_security/security_groups/forms.py b/horizon/dashboards/nova/access_and_security/security_groups/forms.py index bc5acce8f..af2ee3567 100644 --- a/horizon/dashboards/nova/access_and_security/security_groups/forms.py +++ b/horizon/dashboards/nova/access_and_security/security_groups/forms.py @@ -24,7 +24,7 @@ from django import shortcuts from django.contrib import messages from django.core import validators from django.forms import ValidationError -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from novaclient import exceptions as novaclient_exceptions from horizon import api diff --git a/horizon/dashboards/nova/access_and_security/security_groups/tables.py b/horizon/dashboards/nova/access_and_security/security_groups/tables.py index 49acc7a2a..d5321b29b 100644 --- a/horizon/dashboards/nova/access_and_security/security_groups/tables.py +++ b/horizon/dashboards/nova/access_and_security/security_groups/tables.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 api from horizon import tables diff --git a/horizon/dashboards/nova/access_and_security/security_groups/views.py b/horizon/dashboards/nova/access_and_security/security_groups/views.py index 9d38f9a4b..f856d73e7 100644 --- a/horizon/dashboards/nova/access_and_security/security_groups/views.py +++ b/horizon/dashboards/nova/access_and_security/security_groups/views.py @@ -24,7 +24,7 @@ Views for managing Nova instances. import logging from django import shortcuts -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/access_and_security/views.py b/horizon/dashboards/nova/access_and_security/views.py index 36ae9297e..ec2072a96 100644 --- a/horizon/dashboards/nova/access_and_security/views.py +++ b/horizon/dashboards/nova/access_and_security/views.py @@ -25,7 +25,7 @@ Views for Instances and Volumes. import logging from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from novaclient import exceptions as novaclient_exceptions from horizon import api diff --git a/horizon/dashboards/nova/containers/forms.py b/horizon/dashboards/nova/containers/forms.py index 308dd1f45..1aeba8c11 100644 --- a/horizon/dashboards/nova/containers/forms.py +++ b/horizon/dashboards/nova/containers/forms.py @@ -24,7 +24,7 @@ from django import shortcuts from django.contrib import messages from django.core import validators from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/containers/tables.py b/horizon/dashboards/nova/containers/tables.py index 049dd3e29..27b915e26 100644 --- a/horizon/dashboards/nova/containers/tables.py +++ b/horizon/dashboards/nova/containers/tables.py @@ -22,7 +22,7 @@ from django.contrib import messages from django.core.urlresolvers import reverse from django.template.defaultfilters import filesizeformat from django.utils import http -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/nova/containers/views.py b/horizon/dashboards/nova/containers/views.py index 4b31ec5df..c8720319f 100644 --- a/horizon/dashboards/nova/containers/views.py +++ b/horizon/dashboards/nova/containers/views.py @@ -26,7 +26,7 @@ import os from django import http from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/images/forms.py b/horizon/dashboards/nova/images_and_snapshots/images/forms.py index 3db5d44e0..2650b9918 100644 --- a/horizon/dashboards/nova/images_and_snapshots/images/forms.py +++ b/horizon/dashboards/nova/images_and_snapshots/images/forms.py @@ -29,7 +29,7 @@ from django.contrib import messages from django.core.urlresolvers import reverse from django.forms import ValidationError 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 api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/images/tables.py b/horizon/dashboards/nova/images_and_snapshots/images/tables.py index 0e81cf8c7..df57e6f01 100644 --- a/horizon/dashboards/nova/images_and_snapshots/images/tables.py +++ b/horizon/dashboards/nova/images_and_snapshots/images/tables.py @@ -17,7 +17,7 @@ import logging from django.template import defaultfilters as filters -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/nova/images_and_snapshots/images/tabs.py b/horizon/dashboards/nova/images_and_snapshots/images/tabs.py index 685f819d7..78d71350e 100644 --- a/horizon/dashboards/nova/images_and_snapshots/images/tabs.py +++ b/horizon/dashboards/nova/images_and_snapshots/images/tabs.py @@ -15,7 +15,7 @@ # under the License. from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/images/views.py b/horizon/dashboards/nova/images_and_snapshots/images/views.py index 95c8801ed..f30614566 100644 --- a/horizon/dashboards/nova/images_and_snapshots/images/views.py +++ b/horizon/dashboards/nova/images_and_snapshots/images/views.py @@ -24,7 +24,7 @@ Views for managing Nova images. 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 api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py b/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py index 7dee4e93c..d59c8271f 100644 --- a/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py +++ b/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py @@ -23,7 +23,7 @@ import logging from django import shortcuts from django.core.urlresolvers import reverse from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/snapshots/tables.py b/horizon/dashboards/nova/images_and_snapshots/snapshots/tables.py index 37f4fe53f..13b19dd31 100644 --- a/horizon/dashboards/nova/images_and_snapshots/snapshots/tables.py +++ b/horizon/dashboards/nova/images_and_snapshots/snapshots/tables.py @@ -16,7 +16,7 @@ import logging -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from ..images.tables import ImagesTable, LaunchImage, EditImage, DeleteImage diff --git a/horizon/dashboards/nova/images_and_snapshots/snapshots/views.py b/horizon/dashboards/nova/images_and_snapshots/snapshots/views.py index 5d3f1061a..a45c4313e 100644 --- a/horizon/dashboards/nova/images_and_snapshots/snapshots/views.py +++ b/horizon/dashboards/nova/images_and_snapshots/snapshots/views.py @@ -25,7 +25,7 @@ Views for managing Nova instance snapshots. 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 api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/views.py b/horizon/dashboards/nova/images_and_snapshots/views.py index cc6588e17..82d0d0b9c 100644 --- a/horizon/dashboards/nova/images_and_snapshots/views.py +++ b/horizon/dashboards/nova/images_and_snapshots/views.py @@ -25,7 +25,7 @@ Views for managing Images and Snapshots. import logging -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tables.py b/horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tables.py index c73b1ab44..5868e0bbf 100644 --- a/horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tables.py +++ b/horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tables.py @@ -16,7 +16,7 @@ import logging -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/nova/instances_and_volumes/instances/forms.py b/horizon/dashboards/nova/instances_and_volumes/instances/forms.py index a9cb4847e..bf8219e19 100644 --- a/horizon/dashboards/nova/instances_and_volumes/instances/forms.py +++ b/horizon/dashboards/nova/instances_and_volumes/instances/forms.py @@ -22,7 +22,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/instances_and_volumes/instances/tables.py b/horizon/dashboards/nova/instances_and_volumes/instances/tables.py index d178249c5..cf4a7581b 100644 --- a/horizon/dashboards/nova/instances_and_volumes/instances/tables.py +++ b/horizon/dashboards/nova/instances_and_volumes/instances/tables.py @@ -19,7 +19,7 @@ import logging from django import template from django.template.defaultfilters import title from django.utils.datastructures import SortedDict -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py b/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py index 4ae2fba80..5cc707dca 100644 --- a/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py +++ b/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/instances_and_volumes/instances/views.py b/horizon/dashboards/nova/instances_and_volumes/instances/views.py index 21856d1fc..e48b58591 100644 --- a/horizon/dashboards/nova/instances_and_volumes/instances/views.py +++ b/horizon/dashboards/nova/instances_and_volumes/instances/views.py @@ -27,7 +27,7 @@ from django import http from django import shortcuts from django.core.urlresolvers import reverse from django.utils.datastructures import SortedDict -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/instances_and_volumes/views.py b/horizon/dashboards/nova/instances_and_volumes/views.py index 5a27426d2..9d2b6903c 100644 --- a/horizon/dashboards/nova/instances_and_volumes/views.py +++ b/horizon/dashboards/nova/instances_and_volumes/views.py @@ -25,7 +25,7 @@ Views for Instances and Volumes. import logging from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.utils.datastructures import SortedDict from novaclient import exceptions as novaclient_exceptions diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/forms.py b/horizon/dashboards/nova/instances_and_volumes/volumes/forms.py index 0d8133fb6..7e3084388 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/forms.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/forms.py @@ -11,7 +11,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import forms diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py index ed4618910..71ee00630 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py @@ -19,7 +19,7 @@ import logging from django.core.urlresolvers import reverse from django.template.defaultfilters import title from django.utils import safestring -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py index 81d349ea9..07b27b77a 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py @@ -15,7 +15,7 @@ # under the License. from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/views.py b/horizon/dashboards/nova/instances_and_volumes/volumes/views.py index 491a6ace4..15d634d71 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/views.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/views.py @@ -20,7 +20,7 @@ Views for managing Nova volumes. import logging -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/syspanel/flavors/forms.py b/horizon/dashboards/syspanel/flavors/forms.py index 809535207..5ced33d11 100644 --- a/horizon/dashboards/syspanel/flavors/forms.py +++ b/horizon/dashboards/syspanel/flavors/forms.py @@ -22,7 +22,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import forms diff --git a/horizon/dashboards/syspanel/flavors/views.py b/horizon/dashboards/syspanel/flavors/views.py index 4ae1f1711..236987ea0 100644 --- a/horizon/dashboards/syspanel/flavors/views.py +++ b/horizon/dashboards/syspanel/flavors/views.py @@ -21,7 +21,7 @@ import logging from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from novaclient import exceptions as api_exceptions from horizon import api diff --git a/horizon/dashboards/syspanel/images/tables.py b/horizon/dashboards/syspanel/images/tables.py index 57bf996a0..d4cfe2100 100644 --- a/horizon/dashboards/syspanel/images/tables.py +++ b/horizon/dashboards/syspanel/images/tables.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon.dashboards.nova.images_and_snapshots.images.tables import ( ImagesTable, EditImage, DeleteImage) diff --git a/horizon/dashboards/syspanel/images/views.py b/horizon/dashboards/syspanel/images/views.py index 28ac07023..bf422ad7d 100644 --- a/horizon/dashboards/syspanel/images/views.py +++ b/horizon/dashboards/syspanel/images/views.py @@ -20,7 +20,7 @@ import logging -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/syspanel/instances/tables.py b/horizon/dashboards/syspanel/instances/tables.py index d9afde2ba..7aa073639 100644 --- a/horizon/dashboards/syspanel/instances/tables.py +++ b/horizon/dashboards/syspanel/instances/tables.py @@ -18,7 +18,7 @@ import logging from django.template.defaultfilters import title -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import tables from horizon.dashboards.nova.instances_and_volumes.instances.tables import ( diff --git a/horizon/dashboards/syspanel/instances/views.py b/horizon/dashboards/syspanel/instances/views.py index f6692705f..354f7846c 100644 --- a/horizon/dashboards/syspanel/instances/views.py +++ b/horizon/dashboards/syspanel/instances/views.py @@ -22,7 +22,7 @@ import logging from django.utils.datastructures import SortedDict -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/syspanel/projects/forms.py b/horizon/dashboards/syspanel/projects/forms.py index 340dc28de..8361387f5 100644 --- a/horizon/dashboards/syspanel/projects/forms.py +++ b/horizon/dashboards/syspanel/projects/forms.py @@ -22,7 +22,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/syspanel/projects/views.py b/horizon/dashboards/syspanel/projects/views.py index c4300aa15..cf2217ac2 100644 --- a/horizon/dashboards/syspanel/projects/views.py +++ b/horizon/dashboards/syspanel/projects/views.py @@ -22,7 +22,7 @@ import logging import operator from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import exceptions diff --git a/horizon/dashboards/syspanel/users/forms.py b/horizon/dashboards/syspanel/users/forms.py index 2301c026e..516e24030 100644 --- a/horizon/dashboards/syspanel/users/forms.py +++ b/horizon/dashboards/syspanel/users/forms.py @@ -22,7 +22,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.forms import ValidationError from horizon import api diff --git a/horizon/dashboards/syspanel/users/tables.py b/horizon/dashboards/syspanel/users/tables.py index 4c813bb45..eb4498263 100644 --- a/horizon/dashboards/syspanel/users/tables.py +++ b/horizon/dashboards/syspanel/users/tables.py @@ -2,7 +2,7 @@ import logging from django import shortcuts from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from horizon import api from horizon import tables diff --git a/horizon/dashboards/syspanel/users/views.py b/horizon/dashboards/syspanel/users/views.py index 5edf20034..b9ccb03c7 100644 --- a/horizon/dashboards/syspanel/users/views.py +++ b/horizon/dashboards/syspanel/users/views.py @@ -22,7 +22,7 @@ import logging from django.contrib import messages from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from keystoneclient import exceptions as api_exceptions from horizon import api diff --git a/horizon/tables/actions.py b/horizon/tables/actions.py index 6689fe4a1..66f1c18ea 100644 --- a/horizon/tables/actions.py +++ b/horizon/tables/actions.py @@ -22,7 +22,7 @@ from django.conf import settings from django.contrib import messages from django.core import urlresolvers from django.utils.functional import Promise -from django.utils.translation import string_concat, ugettext as _ +from django.utils.translation import string_concat, ugettext_lazy as _ from horizon import exceptions from horizon.utils import html @@ -230,9 +230,9 @@ class LinkAction(BaseAction): def __init__(self, verbose_name=None, url=None, attrs=None): super(LinkAction, self).__init__() - self.verbose_name = verbose_name or unicode(getattr(self, + self.verbose_name = verbose_name or getattr(self, "verbose_name", - self.name.title())) + self.name.title()) self.url = getattr(self, "url", url) if not self.verbose_name: raise NotImplementedError('A LinkAction object must have a ' @@ -295,7 +295,7 @@ class FilterAction(BaseAction): def __init__(self, verbose_name=None, param_name=None): super(FilterAction, self).__init__() - self.verbose_name = unicode(verbose_name or self.name) + self.verbose_name = verbose_name or self.name self.param_name = param_name or 'q' def get_param_name(self): diff --git a/horizon/tables/base.py b/horizon/tables/base.py index d433b409b..683e35adf 100644 --- a/horizon/tables/base.py +++ b/horizon/tables/base.py @@ -31,7 +31,7 @@ from django.utils import http from django.utils.datastructures import SortedDict from django.utils.html import escape from django.utils.http import urlencode -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.utils.safestring import mark_safe from django.utils import termcolors @@ -175,7 +175,7 @@ class Column(html.HTMLElement): verbose_name = self.transform.title() else: verbose_name = verbose_name - self.verbose_name = unicode(verbose_name) + self.verbose_name = verbose_name self.link = link self.hidden = hidden self.status = status @@ -193,7 +193,7 @@ class Column(html.HTMLElement): self.classes.append("hide") def __unicode__(self): - return self.verbose_name + return unicode(self.verbose_name) def __repr__(self): return '<%s: %s>' % (self.__class__.__name__, self.name) @@ -546,7 +546,7 @@ class DataTableOptions(object): self.name = getattr(options, 'name', self.__class__.__name__) verbose_name = getattr(options, 'verbose_name', None) \ or self.name.title() - self.verbose_name = unicode(verbose_name) + self.verbose_name = verbose_name self.columns = getattr(options, 'columns', None) self.status_columns = getattr(options, 'status_columns', []) self.table_actions = getattr(options, 'table_actions', []) @@ -685,7 +685,7 @@ class DataTable(object): action.table = self def __unicode__(self): - return self._meta.verbose_name + return unicode(self._meta.verbose_name) def __repr__(self): return '<%s: %s>' % (self.__class__.__name__, self.name) diff --git a/horizon/usage/tables.py b/horizon/usage/tables.py index 802b8c2a7..c7fdfdc9c 100644 --- a/horizon/usage/tables.py +++ b/horizon/usage/tables.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.template.defaultfilters import timesince, floatformat from horizon import tables