openstack/horizon
Code Issues Proposed changes

Merge "Replace "tenant" with "project" in visible strings"

Browse Source
This commit is contained in:
Jenkins 2014-09-11 09:51:15 +00:00 committed by Gerrit Code Review
commit 354c0c1baa
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/metering/views.py
View File

@ -261,7 +261,7 @@ def query_data(request,
except Exception:
tenants = []
exceptions.handle(request,
_('Unable to retrieve tenant list.'))
_('Unable to retrieve project list.'))
queries = {}
for tenant in tenants:
tenant_query = [{

2
openstack_dashboard/dashboards/admin/networks/agents/tables.py
View File

@ -74,7 +74,7 @@ def get_agent_state(agent):
class DHCPAgentsTable(tables.DataTable):
id = tables.Column('id', verbose_name=_('Id'), hidden=True)
id = tables.Column('id', verbose_name=_('ID'), hidden=True)
host = tables.Column('host', verbose_name=_('Host'))
status = tables.Column(get_agent_status, verbose_name=_('Status'))
state = tables.Column(get_agent_state, verbose_name=_('Admin State'))

2
openstack_dashboard/dashboards/project/data_processing/data_sources/templates/data_processing.data_sources/_details.html
View File

@ -10,7 +10,7 @@
<dd>{{ data_source.type }}</dd>
<dt>{% trans "URL" %}</dt>
<dd>{{ data_source.url }}</dd>
<dt>{% trans "Tenant id" %}</dt>
<dt>{% trans "Project ID" %}</dt>
<dd>{{ data_source.tenant_id }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ data_source.description|default:_("None") }}</dd>

2
openstack_dashboard/dashboards/project/data_processing/job_binaries/templates/data_processing.job_binaries/_details.html
View File

@ -10,7 +10,7 @@
<dd>{{ job_binary.url }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ job_binary.description|default:_("None") }}</dd>
<dt>{% trans "Project id" %}</dt>
<dt>{% trans "Project ID" %}</dt>
<dd>{{ job_binary.tenant_id }}</dd>
<dt>{% trans "Create time" %}</dt>
<dd>{{ job_binary.created_at }}</dd>

14
openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/_details.html
View File

@ -4,15 +4,15 @@
<dl>
<dt>{% trans "Status" %}</dt>
<dd>{{ job_execution.info.status }}</dd>
<dt>{% trans "Id" %}</dt>
<dt>{% trans "ID" %}</dt>
<dd>{{ job_execution.id }}</dd>
<dt>{% trans "Job Id" %}</dt>
<dt>{% trans "Job ID" %}</dt>
<dd>{{ job_execution.job_id }} ({{ object_names.job_name }})</dd>
<dt>{% trans "Input Id" %}</dt>
<dt>{% trans "Input ID" %}</dt>
<dd>{{ job_execution.input_id }} ({{ object_names.input_name }})</dd>
<dt>{% trans "Output Id" %}</dt>
<dt>{% trans "Output ID" %}</dt>
<dd>{{ job_execution.output_id }} ({{ object_names.output_name }})</dd>
<dt>{% trans "Cluster Id" %}</dt>
<dt>{% trans "Cluster ID" %}</dt>
<dd>{{ job_execution.cluster_id }} ({{ object_names.cluster_name }})</dd>
<dt>{% trans "Last Updated" %}</dt>
<dd>{{ job_execution.updated_at }}</dd>
@ -22,11 +22,11 @@
<dd>{{ job_execution.end_time }}</dd>
<dt>{% trans "Return Code" %}</dt>
<dd>{{ job_execution.return_code }}</dd>
<dt>{% trans "Oozie Job Id" %}</dt>
<dt>{% trans "Oozie Job ID" %}</dt>
<dd>{{ job_execution.oozie_job_id }}</dd>
<dt>{% trans "Created" %}</dt>
<dd>{{ job_execution.created_at }}</dd>
<dt>{% trans "Tenant Id" %}</dt>
<dt>{% trans "Project ID" %}</dt>
<dd>{{ job_execution.tenant_id }}</dd>
<dt>{% trans "Job Configuration" %}</dt>
<dd>{% for group, vals in job_execution.job_configs.iteritems %}

2
openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/_details.html
View File

@ -20,7 +20,7 @@
{% empty %}
<dd>{% trans "None" %}</dd>
{% endfor %}
<dt>{% trans "Tenant id" %}</dt>
<dt>{% trans "Project ID" %}</dt>
<dd>{{ job.tenant_id }}</dd>
<dt>{% trans "Create time" %}</dt>
<dd>{{ job.created_at }}</dd>

2
openstack_dashboard/dashboards/project/data_processing/jobs/workflows/launch.py
View File

@ -370,7 +370,7 @@ class SelectHadoopPluginAction(t_flows.SelectPluginAction):
job_ex_id = request.REQUEST.get("job_execution_id")
if job_ex_id is not None:
self.fields["job_execution_id"] = forms.ChoiceField(
label=_("Job Execution Id"),
label=_("Job Execution ID"),
initial=request.REQUEST.get("job_execution_id"),
widget=forms.HiddenInput(
attrs={"class": "hidden_create_field"}))

2
openstack_dashboard/dashboards/project/loadbalancers/templates/loadbalancers/_updatepool.html
View File

@ -15,7 +15,7 @@
</div>
<div class="right">
<h3>{% trans "Description:" %}</h3>
<p>{% trans "You may update pool for current tenant here: edit name, description, load balancing method or admin state." %}</p>
<p>{% trans "You may update pool attributes here: edit name, description, load balancing method or admin state." %}</p>
</div>
{% endblock %}

2
openstack_dashboard/dashboards/router/nexus1000v/forms.py
View File

@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__)
def get_tenant_choices(request):
tenant_choices = [('', _("Select a tenant"))]
tenant_choices = [('', _("Select a project"))]
tenants = []
try:
tenants, has_more = api.keystone.tenant_list(request)