Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Commit

Permalink
イベントアーカイブリストのパンくずとかh1のローカライズとか文言がおかしかったの直した
Browse files Browse the repository at this point in the history
  • Loading branch information
@tunacook
tunacook committed Nov 30, 2014
1 parent 9d42c47 commit 7861ca0
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 46 deletions.
38 changes: 21 additions & 17 deletions src/locale/ja/LC_MESSAGES/django.po
View file
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-11-30 16:46+0900\n"
"POT-Creation-Date: 2014-11-30 17:52+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -1451,23 +1451,16 @@ msgid "Venue unfixed"
msgstr "開催場所未定"

#: src/templates/events/event_archive_month.html:8
#: src/templates/events/event_archive_month.html:16
#: src/templates/events/event_archive_month.html:22
#, python-format
msgid "Events on %(month)s"
msgstr "%(month)s月のイベント"

#: src/templates/events/event_archive_month.html:16
#: src/templates/events/event_archive_month.html:22
#: src/templates/events/event_archive_month.html:58
#: src/templates/events/event_archive_year.html:15
#: src/templates/events/event_archive_year.html:21
#: src/templates/events/event_archive_year.html:51
msgid "Event archives"
msgstr "過去のイベント"

#: src/templates/events/event_archive_month.html:29
#: src/templates/events/event_archive_month.html:44
#: src/templates/events/event_archive_year.html:29
#: src/templates/events/event_archive_year.html:42
#: src/templates/events/event_archive_year.html:44
#: src/templates/events/event_form.html:9
#: src/templates/events/event_form.html:20
#: src/templates/events/event_form.html:31
Expand All @@ -1477,16 +1470,28 @@ msgid "Create a new event"
msgstr "イベントを作成する"

#: src/templates/events/event_archive_month.html:42
#: src/templates/events/event_archive_year.html:27
#: src/templates/events/event_archive_year.html:42
#: src/templates/events/event_list.html:42
msgid "Matching events can not be found"
msgstr "該当するイベントは見つかりませんでした"

#: src/templates/events/event_archive_month.html:58
#: src/templates/events/event_archive_year.html:58
#: src/templates/events/event_list.html:68
msgid "Event archives"
msgstr "過去のイベント"

#: src/templates/events/event_archive_month.html:69
#: src/templates/events/event_archive_year.html:62
#: src/templates/events/event_archive_year.html:69
msgid "Back to upcoming events"
msgstr "開催予定イベント一覧に戻る"

#: src/templates/events/event_archive_year.html:8
#: src/templates/events/event_archive_year.html:16
#: src/templates/events/event_archive_year.html:22
msgid "Events on %(year)s"
msgstr "%(year)s年のイベント"

#: src/templates/events/event_detail.html:42
msgid "unfixed"
msgstr "未定"
Expand Down Expand Up @@ -1575,10 +1580,6 @@ msgstr "イベント「%(title)s」の編集"
msgid "Upcoming events"
msgstr "開催予定のイベント"

#: src/templates/events/event_list.html:68
msgid "Archived events"
msgstr "アーカイブされたイベント"

#: src/templates/personas/persona_detail.html:6
#, python-format
msgid "%(nickname)s's Profile"
Expand Down Expand Up @@ -1894,6 +1895,9 @@ msgstr "ようこそKawazへ！"
msgid "Published articles"
msgstr "掲載情報"

#~ msgid "Archived events"
#~ msgstr "アーカイブされたイベント"

#, fuzzy
#~| msgid "Archived events"
#~ msgid "Archive events"
Expand Down
6 changes: 3 additions & 3 deletions src/templates/events/event_archive_month.html
View file
Expand Up @@ -5,21 +5,21 @@
{% load i18n %}
{% load events_tags %}

{% block title %}{% blocktrans with month=month|date:"Y年m月" %}Events on {{ month }}{% endblocktrans %}{% endblock %}
{% block title %}{% blocktrans with month=month|date:"Y年m" %}Events on {{ month }}{% endblocktrans %}{% endblock %}
{% block pre_css %}
{{ block.super }}
<link type="text/less" rel="stylesheet" href="{% static "less/events.less" %}" media="screen">
{% endblock %}

{% block breadcrumb %}
{{ block.super }}
<li><a href="{% url 'events_event_list' %}">{% blocktrans with month=month|date:"Y年m月" %}Events on {{ month }}{% endblocktrans %}</a></li>
<li><a href="{% url 'events_event_list' %}">{% blocktrans with month=month|date:"Y年m" %}Events on {{ month }}{% endblocktrans %}</a></li>
{% endblock %}

{% block content-header %}
<div class="page-header event-list-header row">
<div class="col col-lg-9 col-xs-12">
<h1>{% trans "Event archives" %}</h1>
<h1>{% blocktrans with month=month|date:"Y年m" %}Events on {{ month }}{% endblocktrans %}</h1>
</div>
<div class="col col-lg-3 col-xs-12 header-right">
{% if user has 'events.add_event' %}
Expand Down
57 changes: 32 additions & 25 deletions src/templates/events/event_archive_year.html
View file
Expand Up @@ -5,45 +5,52 @@
{% load i18n %}
{% load events_tags %}

{% block title %}{% blocktrans with year=year|date:"Y年m" %}Events on {{ year }}{% endblocktrans %}{% endblock %}
{% block pre_css %}
{{ block.super }}
<link type="text/less" rel="stylesheet" href="{% static "less/events.less" %}" media="screen">
{% endblock %}

{% block breadcrumb %}
{{ block.super }}
<li><a href="{% url 'events_event_list' %}">{% blocktrans with year=year|date:"Y年" %}Events on {{ year }}{% endblocktrans %}</a></li>
<li><a href="{% url 'events_event_list' %}">{% blocktrans with year=year|date:"Y" %}Events on {{ year }}{% endblocktrans %}</a></li>
{% endblock %}

{% block content-header %}
<div class="page-header event-list-header row">
<div class="col col-lg-9 col-xs-12">
<h1>{% blocktrans with year=year|date:"Y" %}Events on {{ year }}{% endblocktrans %}</h1>
</div>
<div class="col col-lg-3 col-xs-12 header-right">
{% if user has 'events.add_event' %}
<a href="{% url "events_event_create" %}"
class="btn btn-success btn-primary btn-lg">
<span class="glyphicon glyphicon-plus"></span>
<span>{% trans "Create a new event" %}</span>
</a>
{% endif %}
</div>
</div>
{% endblock %}

{% block content-main %}
<div class="event-list-wrap">
<div class="page-header event-list-header">
<h2>{% blocktrans with yaer=year|date:"Y年" %}Events on {{ year }}{% endblocktrans %}</h2>
<div class="event-list-wrap">
{% for event in object_list %}
{% include "events/components/list-item.html" %}
{% empty %}
<div class="alert alert-info">
<p>{% trans "Matching events can not be found" %}</p>
{% if user has 'events.add_event' %}
<a href="{% url "events_event_create" %}" class="btn btn-success btn-primary"><span class="glyphicon glyphicon-plus"></span> {% trans "Create a new event" %}</a>
{% endif %}
</div>
{% endfor %}
</div>
{% for event in object_list %}
{% include "events/components/list-item.html" %}
{% empty %}
<div class="alert alert-info">
<p>{% trans "Matching events can not be found" %}</p>
{% if user has 'events.add_event' %}
<a href="{% url "events_event_create" %}" class="btn btn-success btn-primary"><span class="glyphicon glyphicon-plus"></span> {% trans "Create a new event" %}</a>
{% endif %}
</div>
{% endfor %}
</div>

<iframe src="https://www.google.com/calendar/embed?src=kawaz.org_knp8k16jovqbodorkrkt45un0o%40group.calendar.google.com&ctz=Asia/Tokyo" style="border: 0" width="845" height="730" frameborder="0" scrolling="no"></iframe>
{% endblock %}

{% block content-aside %}
<div class="event-create-button event-detail-aside-item">
{# 参加できる状態 #}
{% if user has 'events.add_event' %}
<a href="{% url "events_event_create" %}"
class="btn btn-success event-join-btn btn-large">
<span class="glyphicon glyphicon-plus"></span><span>{% trans "Create a new event" %}</span>
</a>
{% endif %}
</div>

<div class="event-archive-list event-detail-aside-item">
{# 過去のイベントリスト #}
<div class="panel panel-default">
Expand Down
2 changes: 1 addition & 1 deletion src/templates/events/event_list.html
View file
Expand Up @@ -65,7 +65,7 @@ <h2 class="panel-title">{% trans "Categories" %}</h2>
{# 過去のイベントリスト #}
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{% trans "Archived events" %}</h3>
<h3 class="panel-title">{% trans "Event archives" %}</h3>
</div>

<div class="list-group">
Expand Down

0 comments on commit 7861ca0

Please sign in to comment.