diff --git a/horizon/base.py b/horizon/base.py index 49f6f259c3..8beef73193 100644 --- a/horizon/base.py +++ b/horizon/base.py @@ -75,7 +75,8 @@ class HorizonComponent(object): % self.__class__) def __unicode__(self): - return getattr(self, 'name', u"Unnamed %s" % self.__class__.__name__) + name = getattr(self, 'name', u"Unnamed %s" % self.__class__.__name__) + return unicode(name) def _get_default_urlpatterns(self): package_string = '.'.join(self.__module__.split('.')[:-1]) @@ -154,7 +155,7 @@ class Registry(object): % {"type": class_name, "slug": cls, "parent": parent, - "name": self.name}) + "name": self.slug}) else: slug = getattr(cls, "slug", cls) raise NotRegistered('%(type)s with slug "%(slug)s" is not ' @@ -220,7 +221,7 @@ class Panel(HorizonComponent): index_url_name = "index" def __repr__(self): - return "" % self.__unicode__() + return "" % self.slug def get_absolute_url(self): """ Returns the default URL for this panel. @@ -351,7 +352,7 @@ class Dashboard(Registry, HorizonComponent): public = False def __repr__(self): - return "" % self.__unicode__() + return "" % self.slug def get_panel(self, panel): """ @@ -499,7 +500,7 @@ class Site(Registry, HorizonComponent): urls = 'horizon.site_urls' def __repr__(self): - return u"" % self.__unicode__() + return u"" % self.slug @property def _conf(self): 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 b4fef5a359..59225a1c4a 100644 --- a/horizon/dashboards/nova/access_and_security/floating_ips/forms.py +++ b/horizon/dashboards/nova/access_and_security/floating_ips/forms.py @@ -36,9 +36,10 @@ LOG = logging.getLogger(__name__) class FloatingIpAssociate(forms.SelfHandlingForm): floating_ip_id = forms.CharField(widget=forms.HiddenInput()) - floating_ip = forms.CharField(widget=forms.TextInput( + floating_ip = forms.CharField(label=_("Floating IP"), + widget=forms.TextInput( attrs={'readonly': 'readonly'})) - instance_id = forms.ChoiceField() + instance_id = forms.ChoiceField(label=_("Instance ID")) def __init__(self, *args, **kwargs): super(FloatingIpAssociate, self).__init__(*args, **kwargs) @@ -72,7 +73,7 @@ class FloatingIpAssociate(forms.SelfHandlingForm): class FloatingIpAllocate(forms.SelfHandlingForm): tenant_name = forms.CharField(widget=forms.HiddenInput()) - pool = forms.ChoiceField() + pool = forms.ChoiceField(label=_("Pool")) def __init__(self, *args, **kwargs): super(FloatingIpAllocate, self).__init__(*args, **kwargs) diff --git a/horizon/dashboards/nova/access_and_security/panel.py b/horizon/dashboards/nova/access_and_security/panel.py index e2198a1167..29dced17b3 100644 --- a/horizon/dashboards/nova/access_and_security/panel.py +++ b/horizon/dashboards/nova/access_and_security/panel.py @@ -15,7 +15,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 _ import horizon from horizon.dashboards.nova import dashboard 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 2836aee805..bc5acce8fa 100644 --- a/horizon/dashboards/nova/access_and_security/security_groups/forms.py +++ b/horizon/dashboards/nova/access_and_security/security_groups/forms.py @@ -38,8 +38,9 @@ LOG = logging.getLogger(__name__) class CreateGroup(forms.SelfHandlingForm): - name = forms.CharField(validators=[validators.validate_slug]) - description = forms.CharField() + name = forms.CharField(label=_("Name"), + validators=[validators.validate_slug]) + description = forms.CharField(label=_("Description")) def handle(self, request, data): try: diff --git a/horizon/dashboards/nova/containers/panel.py b/horizon/dashboards/nova/containers/panel.py index 36447a6b75..583f2d05a3 100644 --- a/horizon/dashboards/nova/containers/panel.py +++ b/horizon/dashboards/nova/containers/panel.py @@ -18,7 +18,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 _ import horizon from horizon.dashboards.nova import dashboard diff --git a/horizon/dashboards/nova/dashboard.py b/horizon/dashboards/nova/dashboard.py index c47742bdf3..02f504ff9b 100644 --- a/horizon/dashboards/nova/dashboard.py +++ b/horizon/dashboards/nova/dashboard.py @@ -14,13 +14,13 @@ # 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 _ import horizon class Nova(horizon.Dashboard): - name = "Project" + name = _("Project") slug = "nova" panels = {_("Manage Compute"): ('overview', 'instances_and_volumes', diff --git a/horizon/dashboards/nova/images_and_snapshots/panel.py b/horizon/dashboards/nova/images_and_snapshots/panel.py index a1b4ee93a9..161ac2b3f3 100644 --- a/horizon/dashboards/nova/images_and_snapshots/panel.py +++ b/horizon/dashboards/nova/images_and_snapshots/panel.py @@ -15,7 +15,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 _ import horizon from horizon.dashboards.nova import dashboard diff --git a/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py b/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py index 3e9f0a90cc..7dee4e93c1 100644 --- a/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py +++ b/horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py @@ -35,8 +35,9 @@ LOG = logging.getLogger(__name__) class CreateSnapshot(forms.SelfHandlingForm): tenant_id = forms.CharField(widget=forms.HiddenInput()) - instance_id = forms.CharField(widget=forms.TextInput( - attrs={'readonly': 'readonly'})) + instance_id = forms.CharField(label=_("Instance ID"), + widget=forms.TextInput( + attrs={'readonly': 'readonly'})) name = forms.CharField(max_length="20", label=_("Snapshot Name")) def handle(self, request, data): diff --git a/horizon/dashboards/nova/instances_and_volumes/panel.py b/horizon/dashboards/nova/instances_and_volumes/panel.py index 9047a9a31f..b12c225231 100644 --- a/horizon/dashboards/nova/instances_and_volumes/panel.py +++ b/horizon/dashboards/nova/instances_and_volumes/panel.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 _ import horizon from horizon.dashboards.nova import dashboard diff --git a/horizon/dashboards/nova/overview/panel.py b/horizon/dashboards/nova/overview/panel.py index 6a6a0034d4..6fc75e9bd1 100644 --- a/horizon/dashboards/nova/overview/panel.py +++ b/horizon/dashboards/nova/overview/panel.py @@ -18,7 +18,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 _ import horizon from horizon.dashboards.nova import dashboard diff --git a/horizon/dashboards/nova/templates/nova/containers/_create.html b/horizon/dashboards/nova/templates/nova/containers/_create.html index 6ea1fbcc34..9893fd0276 100644 --- a/horizon/dashboards/nova/templates/nova/containers/_create.html +++ b/horizon/dashboards/nova/templates/nova/containers/_create.html @@ -4,7 +4,7 @@ {% block form_id %}create_container_form{% endblock %} {% block form_action %}{% url horizon:nova:containers:create %}{% endblock %} -{% block modal-header %}Create Container{% endblock %} +{% block modal-header %}{% trans "Create Container" %}{% endblock %} {% block modal-body %}
diff --git a/horizon/dashboards/nova/templates/nova/objects/_copy.html b/horizon/dashboards/nova/templates/nova/objects/_copy.html index bc4defc336..0a8e808d23 100644 --- a/horizon/dashboards/nova/templates/nova/objects/_copy.html +++ b/horizon/dashboards/nova/templates/nova/objects/_copy.html @@ -4,7 +4,7 @@ {% block form_id %}copy_object_form{% endblock %} {% block form_action %}{% url horizon:nova:containers:object_copy container_name object_name %}{% endblock %} -{% block modal-header %}Copy Object: {{ object_name }}{% endblock %} +{% block modal-header %}{% trans "Copy Object" %}: {{ object_name }}{% endblock %} {% block modal-body %}
diff --git a/horizon/dashboards/nova/templates/nova/objects/_upload.html b/horizon/dashboards/nova/templates/nova/objects/_upload.html index 0da1e7168c..22d137ae2d 100644 --- a/horizon/dashboards/nova/templates/nova/objects/_upload.html +++ b/horizon/dashboards/nova/templates/nova/objects/_upload.html @@ -5,7 +5,7 @@ {% block form_action %}{% url horizon:nova:containers:object_upload container_name %}{% endblock %} {% block form_attrs %}enctype="multipart/form-data"{% endblock %} -{% block modal-header %}Upload Object To Container: {{ container_name }}{% endblock %} +{% block modal-header %}{% trans "Upload Object To Container" %}: {{ container_name }}{% endblock %} {% block modal-body %}
diff --git a/horizon/dashboards/nova/templates/nova/objects/copy.html b/horizon/dashboards/nova/templates/nova/objects/copy.html index b3c140fe21..d16760ef6a 100644 --- a/horizon/dashboards/nova/templates/nova/objects/copy.html +++ b/horizon/dashboards/nova/templates/nova/objects/copy.html @@ -1,6 +1,6 @@ {% extends 'nova/base.html' %} {% load i18n %} -{% block title %}Copy Object{% endblock %} +{% block title %}{% trans "Copy Object" %}{% endblock %} {% block page_header %} {% include "horizon/common/_page_header.html" with title=_("Copy Object") %} diff --git a/horizon/dashboards/nova/templates/nova/objects/index.html b/horizon/dashboards/nova/templates/nova/objects/index.html index 4608296387..986a254519 100644 --- a/horizon/dashboards/nova/templates/nova/objects/index.html +++ b/horizon/dashboards/nova/templates/nova/objects/index.html @@ -1,6 +1,6 @@ {% extends 'nova/base.html' %} {% load i18n %} -{% block title %}Objects{% endblock %} +{% block title %}{% trans "Objects" %}{% endblock %} {% block page_header %}