Skip to content

Internationalization #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions base/assets/stylesheets/components/_profiles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
}
}

%secondary-name {
font-size: 1.333rem;
font-weight: 300;
}
%primary-name {
color: #454D57;
font-family: $font-family-primary;
font-size: 2.369rem;
font-weight: 600;
letter-spacing: -1px;

b { color: $headings-font-color; }
}

// .profile-header (*)
// Classes tasked with styling the header section of a profile page.
.profile-header {
Expand Down Expand Up @@ -39,18 +53,14 @@
margin-top: 0; margin-bottom: 0;
padding: 3px 0;

.name {
font-size: 1.333rem;
font-weight: 300;
:lang(en) & {
.name { @extend %secondary-name; }
.romanized-name { @extend %primary-name; }

}
.romanized-name {
color: #454D57;
font-family: $font-family-primary;
font-size: 2.369rem;
font-weight: 600;
letter-spacing: -1px;

b { color: $headings-font-color; }
:lang(ja) & {
.name { @extend %primary-name; }
.romanized-name { @extend %secondary-name; }
}
}

Expand Down
16 changes: 13 additions & 3 deletions base/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
from djcelery import setup_loader
from postgresify import postgresify

ugettext = lambda s: s


class Base(Configuration):
# Path Configuration.
Expand Down Expand Up @@ -63,8 +65,9 @@ class Base(Configuration):
# --------------------------------------------------------------------------
MIDDLEWARE_CLASSES = (
'django.middleware.gzip.GZipMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
Expand Down Expand Up @@ -104,13 +107,20 @@ class Base(Configuration):

# General Configuration.
# --------------------------------------------------------------------------
DATE_FORMAT = 'Y/m/d'
LANGUAGE_CODE = 'en-us'
SITE_ID = 1
TIME_ZONE = 'UTC'
USE_TZ = True

# Internationalization Configuration.
# --------------------------------------------------------------------------
FORMAT_MODULE_PATH = 'settings.formats'
LANGUAGES = (
('en', ugettext('English')),
('ja', ugettext('Japanese')),
)
USE_I18N = True
USE_L10N = True
USE_TZ = True

# Template Configuration.
# --------------------------------------------------------------------------
Expand Down
Empty file.
Empty file.
3 changes: 3 additions & 0 deletions base/settings/formats/en/formats.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
DATE_FORMAT = u'F j, Y'
SHORT_DATE_FORMAT = u'Y/m/d'
Empty file.
3 changes: 3 additions & 0 deletions base/settings/formats/ja/formats.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
DATE_FORMAT = u'Y年m月d日'
SHORT_DATE_FORMAT = u'Y/m/d'
3 changes: 2 additions & 1 deletion base/settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ class Production(Settings):
MIDDLEWARE_CLASSES = (
'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.gzip.GZipMiddleware',
'django.middleware.common.CommonMiddleware',
'djangosecure.middleware.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
Expand Down
2 changes: 2 additions & 0 deletions base/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{% load i18n %}
{% load static from staticfiles %}
{% get_current_language as LANGUAGE_CODE %}

<!DOCTYPE html>
<html class="no-js" lang="{{ LANGUAGE_CODE|slice:"2" }}">
Expand Down
4 changes: 2 additions & 2 deletions base/templates/events/event_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h1 class="profile-name">
<ul class="vitals-list">
<li class="vital vital-span">
<span class="vital-label"><span class="ss-icon ss-calendar"></span> Run</span>&nbsp;
<time datetime="{{ object.start_date|date:"c" }}" itemprop="startDate">{{ object.start_date|date }}</time>&ndash;<time datetime="{{ object.end_date|date:"c" }}" itemprop="endDate">{{ object.end_date|date }}</time>
<time datetime="{{ object.start_date|date:"c" }}" itemprop="startDate">{{ object.start_date|date:"SHORT_DATE_FORMAT" }}</time>&ndash;<time datetime="{{ object.end_date|date:"c" }}" itemprop="endDate">{{ object.end_date|date:"SHORT_DATE_FORMAT" }}</time>
</li>
<li class="vital vital-nickname"><span class="vital-label"><span class="ss-icon ss-tag"></span> Nickname</span> {{ object.nickname }}</li>
<li class="vital vital-performances"><span class="vital-label"><span class="ss-icon ss-mic"></span> Performances</span> {{ object.schedule.count }}</li>
Expand Down Expand Up @@ -73,7 +73,7 @@ <h3 class="header">Schedule</h3>
{% for performance in object.schedule.all %}
<tr itemprop="subEvent" itemscope itemtype="http://schema.org/subEvent">
<time datetime="{{ performance.day|date:'c' }}T{{ performance.start_time|time:'H:i.u' }}" itemprop="startDate">
<td><span class="ss-icon ss-calendar"></span> {{ performance.day|date }}</td>
<td><span class="ss-icon ss-calendar"></span> {{ performance.day|date:"SHORT_DATE_FORMAT" }}</td>
<td><span class="ss-icon ss-clock"></span> {{ performance.start_time|time:"H:i" }}</td>
</time>
<td>
Expand Down
2 changes: 1 addition & 1 deletion base/templates/events/venue_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h3 class="header">Events</h3>
{% for event in object.performances.all %}
<li class="event" itemprop="event" itemscope itemtype="http://schema.org/MusicEvent">
<time datetime="{{ event.day|date:'c' }}T{{ event.start_time|time:'H:i.u' }}" itemprop="startDate">
<span class="ss-icon ss-calendar"></span> {{ event.day|date }}
<span class="ss-icon ss-calendar"></span> {{ event.day|date:"SHORT_DATE_FORMAT" }}
<span class="ss-icon ss-clock"></span> {{ event.start_time|time:"H:i" }}
</time>
<a href="{% url 'event-detail' event.event.slug %}" itemprop="name">
Expand Down
19 changes: 18 additions & 1 deletion base/templates/layouts/site_base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load admin_urls %}
{% load admin_urls i18n %}

{% block page %}
{% if request.user.is_staff %}
Expand Down Expand Up @@ -32,6 +32,23 @@
{# <a href="{% url "signin" %}">Sign in</a> #}
{% endif %}
</div>

<div class="languages">
<ul>
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<li>
<form action="{% url 'set_language' %}" method="post" name="setLang{{ language.name_local }}">
{% csrf_token %}
<input type="hidden" name="language" value="{{ language.code }}">
<input type="hidden" name="next" value="{{ redirect_to }}">
{# <button>{% blocktrans %}{{ lang.1 }}{% endblocktrans %}</button> #}
<button type="submit">{{ language.name_local }}</button>
</form>
</li>
{% endfor %}
</ul>
</div>
</div>
</header>
<main class="content" role="main">
Expand Down
4 changes: 2 additions & 2 deletions base/templates/merchandise/music/track_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h1 class="section-title">Appearances <span class="count">{{ object.appearances.
{% endif %}
</td>
<td class="appearance-data">
<time datetime="{{ release.released|date:"c" }}">{{ release.released|date:"F j, Y" }}</time>
<time datetime="{{ release.released|date:"c" }}">{{ release.released|date:"DATE_FORMAT" }}</time>
<time datetime="{{ release.released|date:"c" }}/{% now "c" %}" class="timesince">({{ release.released|timesince }} ago)</time>
</td>
</tr>
Expand Down Expand Up @@ -135,7 +135,7 @@ <h1 class="section-title">Appearances <span class="count">{{ object.appearances.
<span class="name">{{ track.name }} {{ track.name_alternate }}</span>
</td>
<td class="appearance-data">
<time datetime="{{ release.released|date:"c" }}">{{ release.released|date:"F j, Y" }}</time>
<time datetime="{{ release.released|date:"c" }}">{{ release.released|date:"DATE_FORMAT" }}</time>
<time datetime="{{ release.released|date:"c" }}/{% now "c" %}" class="timesince">({{ release.released|timesince }} ago)</time>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions base/templates/people/group_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ <h1 class="section-title">Groups</h1>
<span class="group-data tenure">
<span class="ss-icon ss-calendar"></span>
<time datetime="{{ subgroup.started|date:"c" }}/{% if subgroup.ended %}{{ subgroup.ended|date:"c" }}{% else %}{% now "c" %}{% endif %}">
<b>{{ subgroup.started|date }}&ndash;{% if subgroup.ended %}{{ subgroup.ended|date }}{% else %}Present{% endif %}</b>
<b>{{ subgroup.started|date:"SHORT_DATE_FORMAT" }}&ndash;{% if subgroup.ended %}{{ subgroup.ended|date:"SHORT_DATE_FORMAT" }}{% else %}Present{% endif %}</b>
</time>
<span class="tenure in-days">({{ subgroup.age_in_days }} days)</span>
</span>
Expand Down Expand Up @@ -218,7 +218,7 @@ <h1 class="section-title">Subgroups</h1>
<span class="group-data tenure">
<span class="ss-icon ss-calendar"></span>
<time datetime="{{ subgroup.started|date:"c" }}/{% if subgroup.ended %}{{ subgroup.ended|date:"c" }}{% else %}{% now "c" %}{% endif %}">
<b>{{ subgroup.started|date }}&ndash;{% if subgroup.ended %}{{ subgroup.ended|date }}{% else %}Present{% endif %}</b>
<b>{{ subgroup.started|date:"SHORT_DATE_FORMAT" }}&ndash;{% if subgroup.ended %}{{ subgroup.ended|date:"SHORT_DATE_FORMAT" }}{% else %}Present{% endif %}</b>
</time>
<span class="tenure in-days">({{ subgroup.age_in_days }} days)</span>
</span>
Expand Down
14 changes: 7 additions & 7 deletions base/templates/people/group_memberships.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
{% with memberships.leader as member %}
<span class="name">{{ member.idol.name }}</span>
<a href="{{ member.idol.get_absolute_url }}"><span class="romanized-name">{{ member.idol.romanized_name }}</span></a>
<span class="tenure"><time datetime="{{ member.started|date:"c"}}/{% now "c" %}">Since {{ member.started|date:"F j, Y" }}</time></span>
<span class="tenure leadership-tenure"><time datetime="{{ member.leadership_started|date:"c"}}/{% now "c" %}">Since {{ member.leadership_started|date:"F j, Y" }}</time></span>
<span class="tenure"><time datetime="{{ member.started|date:"c"}}/{% now "c" %}">Since {{ member.started|date:"DATE_FORMAT" }}</time></span>
<span class="tenure leadership-tenure"><time datetime="{{ member.leadership_started|date:"c"}}/{% now "c" %}">Since {{ member.leadership_started|date:"DATE_FORMAT" }}</time></span>
{% endwith %}
</div>
<div class="active-members">
Expand Down Expand Up @@ -35,16 +35,16 @@
{% for member in memberships.leaders %}
<span class="name">{{ member.idol.name }}</span>
<a href="{{ member.idol.get_absolute_url }}"><span class="romanized-name">{{ member.idol.romanized_name }}</span></a>
<span class="tenure"><time datetime="{{ member.started|date:"c" }}/{{ member.ended|date:"c" }}">{{ member.started|date:"F j, Y" }}&ndash;{{ member.ended|date:"F j, Y" }}</time></span>
<span class="tenure"><time datetime="{{ member.started|date:"c" }}/{{ member.ended|date:"c" }}">{{ member.started|date:"DATE_FORMAT" }}&ndash;{{ member.ended|date:"DATE_FORMAT" }}</time></span>
{% endfor %}
</div>
{% else %}
<div class="inactive-leaders">
<ul class="membership-list">
<li class="membership-header">
<div class="membership-graph">
<span class="graph-started">{{ object.started|date }}</span>
<span class="graph-ended">{% if object.ended %}{{ object.ended|date }}{% else %}{% now "Y/m/d" %}{% endif %}</span>
<span class="graph-started">{{ object.started|date:"SHORT_DATE_FORMAT" }}</span>
<span class="graph-ended">{% if object.ended %}{{ object.ended|date:"SHORT_DATE_FORMAT" }}{% else %}{% now "Y/m/d" %}{% endif %}</span>
</div>
</li>
{% for member in memberships.leaders %}
Expand All @@ -67,7 +67,7 @@
">{{ member.leadership_tenure_in_days|intcomma }}</span>
</div>
<div class="membership-stats">
<span class="tenure"><time datetime="{{ member.started|date:"c" }}/{{ member.ended|date:"c" }}">{{ member.started|date:"F j, Y" }}&ndash;{{ member.ended|date:"F j, Y" }}</time></span>
<span class="tenure"><time datetime="{{ member.started|date:"c" }}/{{ member.ended|date:"c" }}">{{ member.started|date:"DATE_FORMAT" }}&ndash;{{ member.ended|date:"DATE_FORMAT" }}</time></span>
</div>
</li>
{% endfor %}
Expand All @@ -82,7 +82,7 @@
<li class="membership">
<span class="name">{{ member.idol.name }}</span>
<a href="{{ member.idol.get_absolute_url }}"><span class="romanized-name">{{ member.idol.romanized_name }}</span></a>
<span class="tenure"><time datetime="{{ member.started|date:"c" }}/{{ member.ended|date:"c" }}">{{ member.started|date:"F j, Y" }}&ndash;{{ member.ended|date:"F j, Y" }}</time></span>
<span class="tenure"><time datetime="{{ member.started|date:"c" }}/{{ member.ended|date:"c" }}">{{ member.started|date:"DATE_FORMAT" }}&ndash;{{ member.ended|date:"DATE_FORMAT" }}</time></span>
</li>
{% endfor %}
</ul>
Expand Down
Loading