Fix mistakes with writing a phrases

Availability zone replaced to Availability Zone

Neutron Net replaced to Neutron Network

"snapshot list" replaced to "snapshots list"

and remove no need spaces

Change-Id: Iaae2465fb31da8bd3ee9e7b50db0e274e991d921
Signed-off-by: Ivan Anfimov <lazekteam@gmail.com>

manila_ui/dashboards/admin/share_group_types/tables.py

@@ -69,7 +69,7 @@ class ManageShareGroupTypeAccess(tables.LinkAction):
 
 class UpdateShareGroupType(tables.LinkAction):
     name = "update share group type"
-    verbose_name = _("Update Share group Type")
+    verbose_name = _("Update Share Group Type")
     url = "horizon:admin:share_group_types:update"
     classes = ("ajax-modal", "btn-create")
 

manila_ui/dashboards/admin/share_groups/templates/share_groups/_detail.html

@@ -17,7 +17,7 @@
     <dt>{% trans "Host" %}</dt>
     <dd>{{ share_group.host}}</dd>
     {% if share_group.source_share_group_snapshot_id %}
-    <dt>{% trans "Source share group snapshot" %}</dt>
+    <dt>{% trans "Source Share Group Snapshot" %}</dt>
     <dd>{{ share_group.source_share_group_snapshot_id}}</dd>
     {% endif %}
     <dt>{% trans "Capabilities" %}</dt>
@@ -70,7 +70,7 @@
               {{ st.name }}
           </div>
         <div>
-            {%  trans " Share Type Visibility:" %}
+            {%  trans "Share Type Visibility:" %}
             {% if st.is_public %}Public{% else %}Private{% endif %}
         </div>
         <div>

manila_ui/dashboards/admin/share_networks/tables.py

@@ -19,8 +19,8 @@ import manila_ui.dashboards.project.share_networks.tables as sn_tables
 class ShareNetworksFilterAction(tables.FilterAction):
     filter_type = "server"
     filter_choices = (
-        ('name', _("Name "), True),
+        ('name', _("Name") + " ", True),
-        ('description', _("Description "), True),
+        ('description', _("Description") + " ", True),
     )
 
 

manila_ui/dashboards/admin/share_snapshots/views.py

@@ -48,7 +48,7 @@ class ShareSnapshotsView(tables.MultiTableView):
             for snapshot in snapshots:
                 snapshot.share = share_names.get(snapshot.share_id)
         except Exception:
-            msg = _("Unable to retrieve share snapshot list.")
+            msg = _("Unable to retrieve share snapshots list.")
             exceptions.handle(self.request, msg)
 
         # Gather our projects to correlate against IDs

manila_ui/dashboards/admin/share_types/tables.py

@@ -84,8 +84,8 @@ class UpdateShareType(tables.LinkAction):
 class ShareTypesFilterAction(tables.FilterAction):
     filter_type = "server"
     filter_choices = (
-        ('name', _("Name "), True),
+        ('name', _("Name") + " ", True),
-        ('extra_specs', _("Extra Spec "), True),
+        ('extra_specs', _("Extra Spec") + " ", True),
     )
 
 

manila_ui/dashboards/admin/shares/forms.py

@@ -49,8 +49,8 @@ class MigrationStart(forms.SelfHandlingForm):
     force_host_assisted_migration = forms.BooleanField(
         label=_("Force Host Assisted Migration"),
         required=False, initial=False,
-        help_text=_("Enforces the use of the host-assisted migration approach,"
+        help_text=_("Enforces the use of the host-assisted migration "
-                    " which bypasses driver optimizations."))
+                    "approach, which bypasses driver optimizations."))
     nondisruptive = forms.BooleanField(
         label=_("Nondisruptive"),
         required=False, initial=True,
@@ -69,8 +69,8 @@ class MigrationStart(forms.SelfHandlingForm):
     preserve_snapshots = forms.BooleanField(
         label=_("Preserve Snapshots"), required=False, initial=True,
         help_text=_("Enforces migration of the share snapshots to the "
-                    "destination. If set to True, host-assisted migration will"
+                    "destination. If set to True, host-assisted migration "
-                    " not be attempted."))
+                    "will not be attempted."))
     new_share_network = forms.ChoiceField(
         label=_("New share network to be set in migrated share"),
         required=False,
@@ -143,7 +143,7 @@ class MigrationComplete(MigrationForms):
             messages.success(
                 request,
                 _('Successfully sent the request to complete migration of '
-                  ' share: %s.') % share_name)
+                  'share: %s.') % share_name)
             return True
         except Exception:
             exceptions.handle(request, _("Unable to complete migration "
@@ -180,11 +180,11 @@ class MigrationCancel(MigrationForms):
             messages.success(
                 request,
                 _('Successfully sent the request to cancel migration of '
-                  ' share: %s.') % share_name)
+                  'share: %s.') % share_name)
             return True
         except Exception:
-            exceptions.handle(request, _("Unable to cancel migration of share"
+            exceptions.handle(request, _("Unable to cancel migration of share "
-                                         " %s at this moment.") % share_name)
+                                         "%s at this moment.") % share_name)
         return False
 
 

manila_ui/dashboards/admin/shares/templates/shares/_detail.html

@@ -42,7 +42,7 @@
     {% else %}
     <dd>{{ 'private' }}</dd>
     {% endif %}
-    <dt>{% trans "Availability zone" %}</dt>
+    <dt>{% trans "Availability Zone" %}</dt>
     <dd>{{ share.availability_zone }}</dd>
     <dt>{% trans "Size" %}</dt>
     <dd>{{ share.size }} {% trans "GiB" %}</dd>

manila_ui/dashboards/admin/shares/templates/shares/replicas/_detail_overview.html

@@ -27,7 +27,7 @@
         {% endif %}
       </p></dd>
     {% endfor %}
-    <dt>{% trans "Availability zone" %}</dt>
+    <dt>{% trans "Availability Zone" %}</dt>
     <dd>{{ replica.availability_zone }}</dd>
 
     <dt>{% trans "Created" %}</dt>

manila_ui/dashboards/admin/shares/views.py

@@ -209,7 +209,7 @@ class MigrationGetProgressView(forms.ModalFormView):
     modal_header = _("Confirm Obtaining migration progress of Share")
     form_id = "migration_get_progress_share"
     modal_id = "migration_get_progress_share_modal"
-    submit_label = _("Obtain Progress")
+    submit_label = _("Obtain Migration Progress")
     success_url = reverse_lazy('horizon:admin:shares:index')
     submit_url = 'horizon:admin:shares:migration_get_progress'
     cancel_url = reverse_lazy('horizon:admin:shares:index')

manila_ui/dashboards/project/security_services/views.py

@@ -66,7 +66,7 @@ class UpdateView(forms.ModalFormView):
                 self._object = manila.security_service_get(
                     self.request, sec_service_id)
             except Exception:
-                msg = _('Unable to retrieve security_service.')
+                msg = _('Unable to retrieve security service.')
                 url = reverse('horizon:project:security_services:index')
                 exceptions.handle(self.request, msg, redirect=url)
         return self._object

manila_ui/dashboards/project/share_groups/templates/share_groups/_create.html

@@ -2,5 +2,5 @@
 {% load i18n %}
 {% block modal-body-right %}
 <h3>{% trans "Description" %}:</h3>
-<p>{% trans "Select parameters of share group you want to create. " %}</p>
+<p>{% trans "Select parameters of share group you want to create." %}</p>
 {% endblock %}

manila_ui/dashboards/project/share_groups/templates/share_groups/_detail.html

@@ -15,7 +15,7 @@
     <dt>{% trans "Created" %}</dt>
     <dd>{{ share_group.created_at|parse_date }}</dd>
     {% if share_group.source_share_group_snapshot_id %}
-    <dt>{% trans "Source SG Snapshot" %}</dt>
+    <dt>{% trans "Source Share Group Snapshot" %}</dt>
     {% url 'horizon:project:share_group_snapshots:detail' share_group.source_share_group_snapshot_id as ssgs_url%}
     <dd><a href="{{ ssgs_url }}">{{ share_group.source_share_group_snapshot_id }}</a></dd>
     {% endif %}

manila_ui/dashboards/project/share_networks/forms.py

@@ -39,7 +39,7 @@ class Create(forms.SelfHandlingForm):
                 choices=[(' ', ' ')] +
                         [(utils.transform_dashed_name(choice.id),
                           choice.name_or_id) for choice in net_choices],
-                label=_("Neutron Net"), widget=forms.Select(
+                label=_("Neutron Network"), widget=forms.Select(
                     attrs={'class': 'switchable', 'data-slug': 'net'}))
             for net in net_choices:
                 # For each network create switched choice field with

manila_ui/dashboards/project/share_networks/tables.py

@@ -97,8 +97,8 @@ class UpdateRow(tables.Row):
 class ShareNetworksFilterAction(tables.FilterAction):
     filter_type = "server"
     filter_choices = (
-        ('name', _("Name "), True),
+        ('name', _("Name") + " ", True),
-        ('description', _("Description "), True),
+        ('description', _("Description") + " ", True),
     )
 
 

manila_ui/dashboards/project/share_networks/templates/share_networks/_create.html

@@ -4,6 +4,7 @@
   <h3>{% trans "Description" %}:</h3>
   <p>{% blocktrans trimmed %}
     Share networks contain network data, that will be used
-    for creation of service VM, where will be hosted shares.
+    for creation of service instance, where will be
+    hosted shares.
     {% endblocktrans %}</p>
 {% endblock %}

manila_ui/dashboards/project/share_networks/workflows.py

@@ -49,11 +49,11 @@ class AddShareNetworkSubnetAction(workflows.MembershipAction):
 
     neutron_net_id = forms.ChoiceField(
         required=False,
-        label=_('Neutron Net'),
+        label=_('Neutron Network'),
         widget=forms.ThemableSelectWidget(attrs={
             'class': 'switchable',
             'data-slug': 'neutron_net_id',
-            'data-neutron_net_id': _('Neutron Net')}))
+            'data-neutron_net_id': _('Neutron Network')}))
 
     class Meta(object):
         name = _("Subnet")

manila_ui/dashboards/project/share_snapshots/templates/share_snapshots/_limits.html

@@ -2,7 +2,7 @@
 
 <h3>{% trans "Description" %}:</h3>
 
-<p>{% trans "Share Snapshots are used for storing share changes and creating shares. " %}</p>
+<p>{% trans "Share Snapshots are used for storing share changes and creating shares." %}</p>
 
 <h3>{% trans "Share Limits" %}</h3>
 

manila_ui/dashboards/project/shares/forms.py

@@ -385,7 +385,7 @@ class UpdateRuleMetadataForm(forms.SelfHandlingForm):
                 manila.share_rule_set_metadata(request, rule, set_dict)
             if unset_list:
                 manila.share_rule_unset_metadata(request, rule, unset_list)
-            message = _('Updating share access rule metadata ')
+            message = _('Updating share access rule metadata')
             messages.success(request, message)
             return True
         except ValidationError as e:
@@ -473,7 +473,7 @@ class ResizeForm(forms.SelfHandlingForm):
             messages.success(request, message)
             return True
         raise exceptions.WorkflowError(_(
-            "Unable to resize share. "))
+            "Unable to resize share."))
 
 
 class RevertForm(forms.SelfHandlingForm):

manila_ui/dashboards/project/shares/tables.py

@@ -66,7 +66,7 @@ class DeleteShare(tables.DeleteAction):
             manila.share_delete(
                 request, share.id, share_group_id=share.share_group_id)
         except Exception:
-            msg = _('Unable to delete share "%s". ') % obj_id
+            msg = _('Unable to delete share "%s".') % obj_id
             messages.error(request, msg)
 
     def allowed(self, request, share=None):

manila_ui/dashboards/project/shares/templates/shares/_detail.html

@@ -42,7 +42,7 @@
     {% else %}
     <dd>{{ 'private' }}</dd>
     {% endif %}
-    <dt>{% trans "Availability zone" %}</dt>
+    <dt>{% trans "Availability Zone" %}</dt>
     <dd>{{ share.availability_zone }}</dd>
     <dt>{% trans "Size" %}</dt>
     <dd>{{ share.size }} {% trans "GiB" %}</dd>

manila_ui/dashboards/project/shares/templates/shares/_limits.html

@@ -2,7 +2,7 @@
 
 <h3>{% trans "Description" %}:</h3>
 
-<p>{% trans "Select parameters of share you want to create. " %}</p>
+<p>{% trans "Select parameters of share you want to create." %}</p>
 
 <h3>{% trans "Metadata" %}:</h3>
   <p>

manila_ui/dashboards/project/shares/templates/shares/_resize_limits.html

@@ -2,7 +2,7 @@
 
 <h3>{% trans "Description" %}:</h3>
 
-<p>{% trans "Resize the size of a share. " %}</p>
+<p>{% trans "Resize the size of a share." %}</p>
 
 <h3>{% trans "Share Limits" %}</h3>
 

manila_ui/dashboards/project/shares/templates/shares/replicas/_detail_overview.html

@@ -29,7 +29,7 @@
           </p></dd>
         {% endfor %}
     {% endif %}
-    <dt>{% trans "Availability zone" %}</dt>
+    <dt>{% trans "Availability Zone" %}</dt>
     <dd>{{ replica.availability_zone }}</dd>
 
     <dt>{% trans "Created" %}</dt>