From 9c1f5410bb856a8001b2cc9893877df66205c0b1 Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Wed, 26 Oct 2011 13:58:54 -0700 Subject: [PATCH] Internationalizes all form labels. --- .../django_openstack/dash/views/containers.py | 2 +- .../dash/views/floating_ips.py | 2 +- .../django_openstack/dash/views/images.py | 22 ++++++------ .../django_openstack/dash/views/keypairs.py | 6 ++-- .../django_openstack/dash/views/networks.py | 2 +- .../django_openstack/dash/views/objects.py | 8 ++--- .../django_openstack/dash/views/ports.py | 4 +-- .../django_openstack/dash/views/snapshots.py | 2 +- .../syspanel/views/flavors.py | 10 +++--- .../django_openstack/syspanel/views/images.py | 16 ++++----- .../syspanel/views/tenants.py | 36 +++++++++---------- .../django_openstack/syspanel/views/users.py | 22 ++++++------ 12 files changed, 66 insertions(+), 66 deletions(-) diff --git a/django-openstack/django_openstack/dash/views/containers.py b/django-openstack/django_openstack/dash/views/containers.py index 1f7b909b53..9dae709feb 100644 --- a/django-openstack/django_openstack/dash/views/containers.py +++ b/django-openstack/django_openstack/dash/views/containers.py @@ -58,7 +58,7 @@ class DeleteContainer(forms.SelfHandlingForm): class CreateContainer(forms.SelfHandlingForm): - name = forms.CharField(max_length="255", label="Container Name") + name = forms.CharField(max_length="255", label=_("Container Name")) def handle(self, request, data): api.swift_create_container(request, data['name']) diff --git a/django-openstack/django_openstack/dash/views/floating_ips.py b/django-openstack/django_openstack/dash/views/floating_ips.py index 7915984587..425785d934 100644 --- a/django-openstack/django_openstack/dash/views/floating_ips.py +++ b/django-openstack/django_openstack/dash/views/floating_ips.py @@ -64,7 +64,7 @@ class FloatingIpAssociate(forms.SelfHandlingForm): instancelist = kwargs.get('initial', {}).get('instances', []) self.fields['instance_id'] = forms.ChoiceField( choices=instancelist, - label="Instance") + label=_("Instance")) def handle(self, request, data): try: diff --git a/django-openstack/django_openstack/dash/views/images.py b/django-openstack/django_openstack/dash/views/images.py index 4ea3296822..6a3c8798fd 100644 --- a/django-openstack/django_openstack/dash/views/images.py +++ b/django-openstack/django_openstack/dash/views/images.py @@ -43,15 +43,15 @@ LOG = logging.getLogger('django_openstack.dash.views.images') class UpdateImageForm(forms.SelfHandlingForm): image_id = forms.CharField(widget=forms.HiddenInput()) - name = forms.CharField(max_length="25", label="Name") - kernel = forms.CharField(max_length="25", label="Kernel ID", + name = forms.CharField(max_length="25", label=_("Name")) + kernel = forms.CharField(max_length="25", label=_("Kernel ID"), required=False) - ramdisk = forms.CharField(max_length="25", label="Ramdisk ID", + ramdisk = forms.CharField(max_length="25", label=_("Ramdisk ID"), required=False) - architecture = forms.CharField(label="Architecture", required=False) - container_format = forms.CharField(label="Container Format", + architecture = forms.CharField(label=_("Architecture"), required=False) + container_format = forms.CharField(label=_("Container Format"), required=False) - disk_format = forms.CharField(label="Disk Format") + disk_format = forms.CharField(label=_("Disk Format")) def handle(self, request, data): image_id = data['image_id'] @@ -108,11 +108,11 @@ class UpdateImageForm(forms.SelfHandlingForm): class LaunchForm(forms.SelfHandlingForm): - name = forms.CharField(max_length=80, label="Server Name") + name = forms.CharField(max_length=80, label=_("Server Name")) image_id = forms.CharField(widget=forms.HiddenInput()) tenant_id = forms.CharField(widget=forms.HiddenInput()) user_data = forms.CharField(widget=forms.Textarea, - label="User Data", + label=_("User Data"), required=False) # make the dropdown populate when the form is loaded not when django is @@ -122,12 +122,12 @@ class LaunchForm(forms.SelfHandlingForm): flavorlist = kwargs.get('initial', {}).get('flavorlist', []) self.fields['flavor'] = forms.ChoiceField( choices=flavorlist, - label="Flavor", + label=_("Flavor"), help_text="Size of Image to launch") keynamelist = kwargs.get('initial', {}).get('keynamelist', []) self.fields['key_name'] = forms.ChoiceField(choices=keynamelist, - label="Key Name", + label=_("Key Name"), required=False, help_text="Which keypair to use for authentication") @@ -135,7 +135,7 @@ class LaunchForm(forms.SelfHandlingForm): 'securitygrouplist', []) self.fields['security_groups'] = forms.MultipleChoiceField( choices=securitygrouplist, - label='Security Groups', + label=_("Security Groups"), required=True, initial=['default'], widget=forms.SelectMultiple( diff --git a/django-openstack/django_openstack/dash/views/keypairs.py b/django-openstack/django_openstack/dash/views/keypairs.py index 646002f26f..ef077f4b64 100644 --- a/django-openstack/django_openstack/dash/views/keypairs.py +++ b/django-openstack/django_openstack/dash/views/keypairs.py @@ -57,7 +57,7 @@ class DeleteKeypair(forms.SelfHandlingForm): class CreateKeypair(forms.SelfHandlingForm): - name = forms.CharField(max_length="20", label="Keypair Name", + name = forms.CharField(max_length="20", label=_("Keypair Name"), validators=[validators.RegexValidator('\w+')]) def handle(self, request, data): @@ -78,9 +78,9 @@ class CreateKeypair(forms.SelfHandlingForm): class ImportKeypair(forms.SelfHandlingForm): - name = forms.CharField(max_length="20", label="Keypair Name", + name = forms.CharField(max_length="20", label=_("Keypair Name"), validators=[validators.RegexValidator('\w+')]) - public_key = forms.CharField(label='Public Key', widget=forms.Textarea) + public_key = forms.CharField(label=_("Public Key"), widget=forms.Textarea) def handle(self, request, data): try: diff --git a/django-openstack/django_openstack/dash/views/networks.py b/django-openstack/django_openstack/dash/views/networks.py index 8a2b5a1911..8753a40de0 100644 --- a/django-openstack/django_openstack/dash/views/networks.py +++ b/django-openstack/django_openstack/dash/views/networks.py @@ -46,7 +46,7 @@ LOG = logging.getLogger('django_openstack.dash.views.networks') class CreateNetwork(forms.SelfHandlingForm): - name = forms.CharField(required=True, label="Network Name") + name = forms.CharField(required=True, label=_("Network Name")) def handle(self, request, data): network_name = data['name'] diff --git a/django-openstack/django_openstack/dash/views/objects.py b/django-openstack/django_openstack/dash/views/objects.py index c86f695a10..b190090cda 100644 --- a/django-openstack/django_openstack/dash/views/objects.py +++ b/django-openstack/django_openstack/dash/views/objects.py @@ -73,8 +73,8 @@ class DeleteObject(forms.SelfHandlingForm): class UploadObject(forms.SelfHandlingForm): - name = forms.CharField(max_length="255", label="Object Name") - object_file = forms.FileField(label="File") + name = forms.CharField(max_length="255", label=_("Object Name")) + object_file = forms.FileField(label=_("File")) container_name = forms.CharField(widget=forms.HiddenInput()) def handle(self, request, data): @@ -90,10 +90,10 @@ class UploadObject(forms.SelfHandlingForm): class CopyObject(forms.SelfHandlingForm): new_container_name = forms.ChoiceField( - label="Container to store object in") + label=_("Container to store object in")) new_object_name = forms.CharField(max_length="255", - label="New object name") + label=_("New object name")) orig_container_name = forms.CharField(widget=forms.HiddenInput()) orig_object_name = forms.CharField(widget=forms.HiddenInput()) diff --git a/django-openstack/django_openstack/dash/views/ports.py b/django-openstack/django_openstack/dash/views/ports.py index 7e720a54ad..95c88a1201 100644 --- a/django-openstack/django_openstack/dash/views/ports.py +++ b/django-openstack/django_openstack/dash/views/ports.py @@ -40,7 +40,7 @@ LOG = logging.getLogger('django_openstack.dash.views.ports') class CreatePort(forms.SelfHandlingForm): network = forms.CharField(widget=forms.HiddenInput()) - ports_num = forms.IntegerField(required=True, label="Number of Ports") + ports_num = forms.IntegerField(required=True, label=_("Number of Ports")) def handle(self, request, data): try: @@ -86,7 +86,7 @@ class AttachPort(forms.SelfHandlingForm): network = forms.CharField(widget=forms.HiddenInput()) port = forms.CharField(widget=forms.HiddenInput()) vif_id = forms.CharField(widget=forms.Select(), - label="Select VIF to connect") + label=_("Select VIF to connect")) def handle(self, request, data): try: diff --git a/django-openstack/django_openstack/dash/views/snapshots.py b/django-openstack/django_openstack/dash/views/snapshots.py index 99a22d096a..19b757702e 100644 --- a/django-openstack/django_openstack/dash/views/snapshots.py +++ b/django-openstack/django_openstack/dash/views/snapshots.py @@ -48,7 +48,7 @@ class CreateSnapshot(forms.SelfHandlingForm): tenant_id = forms.CharField(widget=forms.HiddenInput()) instance_id = forms.CharField(widget=forms.TextInput( attrs={'readonly': 'readonly'})) - name = forms.CharField(max_length="20", label="Snapshot Name") + name = forms.CharField(max_length="20", label=_("Snapshot Name")) def handle(self, request, data): try: diff --git a/django-openstack/django_openstack/syspanel/views/flavors.py b/django-openstack/django_openstack/syspanel/views/flavors.py index ecdcd6ae48..e15f9561c7 100644 --- a/django-openstack/django_openstack/syspanel/views/flavors.py +++ b/django-openstack/django_openstack/syspanel/views/flavors.py @@ -41,11 +41,11 @@ LOG = logging.getLogger('django_openstack.syspanel.views.flavors') class CreateFlavor(forms.SelfHandlingForm): - flavorid = forms.CharField(max_length="10", label="Flavor ID") - name = forms.CharField(max_length="25", label="Name") - vcpus = forms.CharField(max_length="5", label="VCPUs") - memory_mb = forms.CharField(max_length="5", label="Memory MB") - disk_gb = forms.CharField(max_length="5", label="Disk GB") + flavorid = forms.CharField(max_length="10", label=_("Flavor ID")) + name = forms.CharField(max_length="25", label=_("Name")) + vcpus = forms.CharField(max_length="5", label=_("VCPUs")) + memory_mb = forms.CharField(max_length="5", label=_("Memory MB")) + disk_gb = forms.CharField(max_length="5", label=_("Disk GB")) def handle(self, request, data): api.flavor_create(request, diff --git a/django-openstack/django_openstack/syspanel/views/images.py b/django-openstack/django_openstack/syspanel/views/images.py index f96f9e4b66..8dd8d7aa73 100644 --- a/django-openstack/django_openstack/syspanel/views/images.py +++ b/django-openstack/django_openstack/syspanel/views/images.py @@ -72,17 +72,17 @@ class ToggleImage(forms.SelfHandlingForm): class UpdateImageForm(forms.Form): - name = forms.CharField(max_length="25", label="Name") - kernel = forms.CharField(max_length="25", label="Kernel ID", + name = forms.CharField(max_length="25", label=_("Name")) + kernel = forms.CharField(max_length="25", label=_("Kernel ID"), required=False) - ramdisk = forms.CharField(max_length="25", label="Ramdisk ID", + ramdisk = forms.CharField(max_length="25", label=_("Ramdisk ID"), required=False) - architecture = forms.CharField(label="Architecture", required=False) - #project_id = forms.CharField(label="Project ID") - container_format = forms.CharField(label="Container Format", + architecture = forms.CharField(label=_("Architecture"), required=False) + #project_id = forms.CharField(label=_("Project ID")) + container_format = forms.CharField(label=_("Container Format"), required=False) - disk_format = forms.CharField(label="Disk Format") - #is_public = forms.BooleanField(label="Publicly Available", required=False) + disk_format = forms.CharField(label=_("Disk Format")) + #is_public = forms.BooleanField(label=_("Publicly Available"), required=False) @login_required diff --git a/django-openstack/django_openstack/syspanel/views/tenants.py b/django-openstack/django_openstack/syspanel/views/tenants.py index 5d2a6da9e3..8ca6aaf0bd 100644 --- a/django-openstack/django_openstack/syspanel/views/tenants.py +++ b/django-openstack/django_openstack/syspanel/views/tenants.py @@ -83,10 +83,10 @@ class RemoveUser(forms.SelfHandlingForm): class CreateTenant(forms.SelfHandlingForm): - name = forms.CharField(label="Name") + name = forms.CharField(label=_("Name")) description = forms.CharField(widget=forms.widgets.Textarea(), - label="Description") - enabled = forms.BooleanField(label="Enabled", required=False, + label=_("Description")) + enabled = forms.BooleanField(label=_("Enabled"), required=False, initial=True) def handle(self, request, data): @@ -109,13 +109,13 @@ class CreateTenant(forms.SelfHandlingForm): class UpdateTenant(forms.SelfHandlingForm): - id = forms.CharField(label="ID", + id = forms.CharField(label=_("ID"), widget=forms.TextInput(attrs={'readonly': 'readonly'})) - name = forms.CharField(label="Name", + name = forms.CharField(label=_("Name"), widget=forms.TextInput(attrs={'readonly': 'readonly'})) description = forms.CharField(widget=forms.widgets.Textarea(), - label="Description") - enabled = forms.BooleanField(required=False, label="Enabled") + label=_("Description")) + enabled = forms.BooleanField(required=False, label=_("Enabled")) def handle(self, request, data): try: @@ -139,18 +139,18 @@ class UpdateTenant(forms.SelfHandlingForm): class UpdateQuotas(forms.SelfHandlingForm): - tenant_id = forms.CharField(label="ID (name)", + tenant_id = forms.CharField(label=_("ID (name)"), widget=forms.TextInput(attrs={'readonly': 'readonly'})) - metadata_items = forms.CharField(label="Metadata Items") - injected_files = forms.CharField(label="Injected Files") - injected_file_content_bytes = forms.CharField(label="Injected File " - "Content Bytes") - cores = forms.CharField(label="VCPUs") - instances = forms.CharField(label="Instances") - volumes = forms.CharField(label="Volumes") - gigabytes = forms.CharField(label="Gigabytes") - ram = forms.CharField(label="RAM (in MB)") - floating_ips = forms.CharField(label="Floating IPs") + metadata_items = forms.CharField(label=_("Metadata Items")) + injected_files = forms.CharField(label=_("Injected Files")) + injected_file_content_bytes = forms.CharField(label=_("Injected File " + "Content Bytes")) + cores = forms.CharField(label=_("VCPUs")) + instances = forms.CharField(label=_("Instances")) + volumes = forms.CharField(label=_("Volumes")) + gigabytes = forms.CharField(label=_("Gigabytes")) + ram = forms.CharField(label=_("RAM (in MB)")) + floating_ips = forms.CharField(label=_("Floating IPs")) def handle(self, request, data): try: diff --git a/django-openstack/django_openstack/syspanel/views/users.py b/django-openstack/django_openstack/syspanel/views/users.py index c7b370ba53..7b8e66a4f3 100644 --- a/django-openstack/django_openstack/syspanel/views/users.py +++ b/django-openstack/django_openstack/syspanel/views/users.py @@ -50,12 +50,12 @@ class UserForm(forms.Form): self.fields['tenant_id'].choices = [[tenant.id, tenant.id] for tenant in tenant_list] - name = forms.CharField(label="Name") - email = forms.CharField(label="Email") - password = forms.CharField(label="Password", + name = forms.CharField(label=_("Name")) + email = forms.CharField(label=_("Email")) + password = forms.CharField(label=_("Password"), widget=forms.PasswordInput(render_value=False), required=False) - tenant_id = forms.ChoiceField(label="Primary Tenant") + tenant_id = forms.ChoiceField(label=_("Primary Tenant")) class UserUpdateForm(forms.Form): @@ -65,15 +65,15 @@ class UserUpdateForm(forms.Form): self.fields['tenant_id'].choices = [[tenant.id, tenant.id] for tenant in tenant_list] - id = forms.CharField(label="ID", + id = forms.CharField(label=_("ID"), widget=forms.TextInput(attrs={'readonly': 'readonly'})) # FIXME: keystone doesn't return the username from a get API call. - #name = forms.CharField(label="Name") - email = forms.CharField(label="Email") - password = forms.CharField(label="Password", + #name = forms.CharField(label=_("Name")) + email = forms.CharField(label=_("Email")) + password = forms.CharField(label=_("Password"), widget=forms.PasswordInput(render_value=False), required=False) - tenant_id = forms.ChoiceField(label="Primary Tenant") + tenant_id = forms.ChoiceField(label=_("Primary Tenant")) class UserDeleteForm(forms.SelfHandlingForm): @@ -89,8 +89,8 @@ class UserDeleteForm(forms.SelfHandlingForm): class UserEnableDisableForm(forms.SelfHandlingForm): - id = forms.CharField(label="ID (username)", widget=forms.HiddenInput()) - enabled = forms.ChoiceField(label="enabled", widget=forms.HiddenInput(), + id = forms.CharField(label=_("ID (username)"), widget=forms.HiddenInput()) + enabled = forms.ChoiceField(label=_("enabled"), widget=forms.HiddenInput(), choices=[[c, c] for c in ("disable", "enable")])