Merge "Rename Host to Allowed Host"

openstack_dashboard/dashboards/project/databases/tables.py

@@ -217,7 +217,7 @@ class InstancesTable(tables.DataTable):
 
 class UsersTable(tables.DataTable):
     name = tables.Column("name", verbose_name=_("User Name"))
-    host = tables.Column("host", verbose_name=_("Allowed Hosts"))
+    host = tables.Column("host", verbose_name=_("Allowed Host"))
     databases = tables.Column(get_databases, verbose_name=_("Databases"))
 
     class Meta:

openstack_dashboard/dashboards/project/databases/templates/databases/_launch_initialize_help.html

@@ -1,19 +1,18 @@
 {% load i18n horizon humanize %}
 
-<p>{% blocktrans %}Create an initial database and/or add initial users.{% endblocktrans %}</p>
-
-<h4>{% trans "Create Initial Databases" %}</h4>
+<h4>{% trans "Initial Databases" %}</h4>
 <p>{% trans "Optionally provide a comma separated list of databases to create:" %}</p>
 <pre>database1, database2, database3</pre>
 
-<h4>{% trans "Create Initial Admin User" %}</h4>
+<h4>{% trans "Initial Admin User" %}</h4>
 <p>{% blocktrans %}Create an optional initial user.
    This user will have access to all databases you create.{% endblocktrans %}</p>
+
 <ul>
   <li><strong>{% trans "Username (required)" %}</strong></li>
   <li><strong>{% trans "Password (required)" %}</strong></li>
-  <li><strong>{% trans "Host (optional)" %}</strong>
-    <em>{% blocktrans %}Allow the user to connect from this host
+  <li><strong>{% trans "Allowed Host (optional)" %}</strong>
+    {% blocktrans %}Allow the user to connect from this host
     only. If not provided this user will be allowed to connect from anywhere.
-    {% endblocktrans %}</em></li>
+    {% endblocktrans %}</li>
 </ul>

openstack_dashboard/dashboards/project/databases/workflows/create_instance.py

@@ -176,7 +176,7 @@ class AddDatabasesAction(workflows.Action):
     * TROVE_ADD_USER_PERMS = []
     * TROVE_ADD_DATABASE_PERMS = []
     """
-    databases = forms.CharField(label=_('Initial Database'),
+    databases = forms.CharField(label=_('Initial Databases'),
                                 required=False,
                                 help_text=_('Comma separated list of '
                                             'databases to create'))
@@ -186,7 +186,7 @@ class AddDatabasesAction(workflows.Action):
     password = forms.CharField(widget=forms.PasswordInput(),
                                label=_("Password"),
                                required=False)
-    host = forms.CharField(label=_("Host (optional)"),
+    host = forms.CharField(label=_("Allowed Host (optional)"),
                            required=False,
                            help_text=_("Host or IP that the user is allowed "
                                        "to connect through."))