diff --git a/base/templates/merchandise/music/track_detail.html b/base/templates/merchandise/music/track_detail.html index f828d399..9ece3b03 100644 --- a/base/templates/merchandise/music/track_detail.html +++ b/base/templates/merchandise/music/track_detail.html @@ -104,7 +104,7 @@

Appearances {{ object.appearances. {% endif %} - + @@ -135,7 +135,7 @@

Appearances {{ object.appearances. {{ track.name }} {{ track.name_alternate }} - + diff --git a/base/templates/people/group_detail.html b/base/templates/people/group_detail.html index b51e9a71..cb8371da 100644 --- a/base/templates/people/group_detail.html +++ b/base/templates/people/group_detail.html @@ -151,7 +151,7 @@

Groups

({{ subgroup.age_in_days }} days) @@ -218,7 +218,7 @@

Subgroups

({{ subgroup.age_in_days }} days) diff --git a/base/templates/people/group_memberships.html b/base/templates/people/group_memberships.html index 5dc478e7..18ea67bd 100644 --- a/base/templates/people/group_memberships.html +++ b/base/templates/people/group_memberships.html @@ -6,8 +6,8 @@ {% with memberships.leader as member %} {{ member.idol.name }} {{ member.idol.romanized_name }} - - + + {% endwith %}
@@ -35,7 +35,7 @@ {% for member in memberships.leaders %} {{ member.idol.name }} {{ member.idol.romanized_name }} - + {% endfor %}
{% else %} @@ -43,8 +43,8 @@
  • - {{ object.started|date }} - {% if object.ended %}{{ object.ended|date }}{% else %}{% now "Y/m/d" %}{% endif %} + {{ object.started|date:"SHORT_DATE_FORMAT" }} + {% if object.ended %}{{ object.ended|date:"SHORT_DATE_FORMAT" }}{% else %}{% now "Y/m/d" %}{% endif %}
  • {% for member in memberships.leaders %} @@ -67,7 +67,7 @@ ">{{ member.leadership_tenure_in_days|intcomma }}
    - +
    {% endfor %} @@ -82,7 +82,7 @@
  • {{ member.idol.name }} {{ member.idol.romanized_name }} - +
  • {% endfor %}
diff --git a/base/templates/people/idol_detail.html b/base/templates/people/idol_detail.html index 5d3c6d03..5ef43b48 100644 --- a/base/templates/people/idol_detail.html +++ b/base/templates/people/idol_detail.html @@ -1,5 +1,6 @@ {% extends "layouts/site_base.html" %} -{% load music_tags static typogrify_tags %} +{% load i18n music_tags static typogrify_tags %} +{% get_current_language as LANGUAGE_CODE %} {% block title %}{{ object.romanized_name }} ({{ object.name }}) · Idols{% endblock %} {% block meta %} @@ -21,8 +22,13 @@ {% if object.photo_thumbnail %}{% else %}
{% endif %}

- {{ object.family_name }}{{ object.given_name }} - {{ object.romanized_family_name }} {{ object.romanized_given_name }} + {% if LANGUAGE_CODE == 'ja' %} + {# {{ object.romanized_family_name }} {{ object.romanized_given_name }} #} + {{ object.family_name }}{{ object.given_name }} + {% else %} + {{ object.family_name }}{{ object.given_name }} + {{ object.romanized_family_name }} {{ object.romanized_given_name }} + {% endif %} {% with object.primary_membership as primary %}

{{ primary.standing }}{% if primary.group.romanized_name != "Soloist" %} of {{ primary.group }}{% endif %}

{% endwith %}

@@ -40,7 +46,7 @@

{% if object.age >= 20 %}{% endif %} Age  {% firstof object.age "Unknown" %}