{% load i18n %}

<div class="detail">
  <dl class="dl-horizontal">
    {% if domain_id %}
      <dt>{% trans "Domain ID" %}</dt>
      <dd>{{ domain_id }}</dd>
    {% endif %}
    {% if domain_name %}
      <dt>{% trans "Domain Name" %}</dt>
      <dd>{{ domain_name }}</dd>
    {% endif %}
    <dt>{% trans "User Name" %}</dt>
    <dd>{{ user.name }}</dd>
    {% if description %}
      <dt>{% trans "Description" %}</dt>
      <dd>{{ description }}</dd>
    {% endif %}
    <dt>{% trans "ID" %}</dt>
    <dd>{{ user.id }}</dd>
    <dt>{% trans "Email" %}</dt>
    <dd>{{ user.email|default:_("None") }}</dd>
    <dt>{% trans "Enabled" %}</dt>
    <dd>{{ user.enabled|yesno|capfirst }}</dd>
    <dt>{% trans "Project ID" %}</dt>
    <dd>{{ user.project_id }}</dd>
    {% if tenant_name %}
      <dt>{% trans "Project Name" %}</dt>
      <dd>{{ tenant_name }}</dd>
    {% endif %}
  </dl>
</div>


{% load i18n %}

<div class="detail">
  <dl class="dl-horizontal">
    {% if domain_id %}
      <dt>{% trans "Domain ID" %}</dt>
      <dd>{{ domain_id }}</dd>
    {% endif %}
    {% if domain_name %}
      <dt>{% trans "Domain Name" %}</dt>
      <dd>{{ domain_name }}</dd>
    {% endif %}
    <dt>{% trans "User Name" %}</dt>
    <dd>{{ user.name }}</dd>
    {% if description %}
      <dt>{% trans "Description" %}</dt>
      <dd>{{ description }}</dd>
    {% endif %}
    <dt>{% trans "ID" %}</dt>
    <dd>{{ user.id }}</dd>
    <dt>{% trans "Email" %}</dt>
    <dd>{{ user.email|default:_("None") }}</dd>
    <dt>{% trans "Enabled" %}</dt>
    <dd>{{ user.enabled|yesno|capfirst }}</dd>
    <dt>{% trans "Primary Project ID" %}</dt>
    <dd>{{ user.project_id }}</dd>
    {% if tenant_name %}
      <dt>{% trans "Primary Project Name" %}</dt>
      <dd>{{ tenant_name }}</dd>
    {% endif %}
  </dl>
</div>


Improve field name in User Detail
Improve field name in User Detail

At the moment, User Detail page has 'Project Name' and 'Project ID'
fields. However, these field express the info of "Primary Project".
Actually, when user does't have it, this field will display 'None'
even though user belong some projects.
Therefore, this patch will change to proper field name.

Change-Id: I0062f94fc6c48ce4370c6cf8bea07337ab658d6c
Closes-Bug: #1582737
