From c6597a12886d6c69af0b28fddabe70417f420295 Mon Sep 17 00:00:00 2001 From: clubdego974 Date: Fri, 14 Jul 2023 09:45:54 +0400 Subject: [PATCH 1/9] add translation tags Only for first two files, before all others --- league/templates/league/account.html | 50 +++++++++---------- league/templates/league/account_activity.html | 4 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/league/templates/league/account.html b/league/templates/league/account.html index 93209991..4e989b3a 100644 --- a/league/templates/league/account.html +++ b/league/templates/league/account.html @@ -28,7 +28,7 @@ {% block body_class %}user{% endblock %} -{% block title %}{% if user == request.user %}My{% else %}{{user.username}}{% endif %} profile{% endblock %} +{% block title %}{% if user == request.user %}{% trans "My profile" %}{% else %}{% blocktrans with username=user.username %}{{username}} profile{% endblocktrans %}{% endif %}{% endblock %} {% block heading %} {% get_meijin as meijin %} @@ -37,7 +37,7 @@

{% if user == meijin %} {% endif %} - {% if user == request.user %}My{% else %}{{user.username}}{% endif %} profile + {% if user == request.user %}{% trans "My profile" %}{% else %}{% blocktrans with username=user.username %}{{username}} profile{% endblocktrans %}{% endif %}

@@ -49,8 +49,8 @@

{% if user == meijin %}
-

{{user.username}} is OSR Meijin!

- He earned respect from all Open Study Room and a teaching game with Alexander Dinerchtein (3p). +

{% blocktrans with username=user.username %}{{username}} is OSR Meijin !{% endblocktrans %}

+ {% trans "He earned respect from all Open Study Room and a teaching game with Alexander Dinerchtein (3p)." %}"
{% endif %}
@@ -59,7 +59,7 @@

{% if user.profile.country %} {% endif %} - {{user.username}} infos + {% blocktrans with username=user.username %}{{username}} infos{% endblocktrans %} {% if request.user == user %} {% endif %} @@ -75,23 +75,23 @@

{% if won_divisions or won_tournaments %}
-

Trophys

+

{% trans "Trophys" %}

{% if won_divisions %}
-

Leagues

+

{% trans "Leagues" %}

{% for division in won_divisions %} -

{{division.league_event.end_time|date}}: Winner of {{division|division_link}}

+

{{division.league_event.end_time|date}}: {% blocktrans with division=division|division_link %}Winner of {{division}}{% endblocktrans %}

{% endfor %}
{% endif %} {% if won_tournaments %}
-

Tournaments

+

{% trans "Tournaments" %}

{% for tournament in won_tournaments %} -

{{tournament.end_time|date}}: Winner of {{tournament.name}}

+

{{tournament.end_time|date}}: {% trans "Winner of tournament" %} {{tournament.name}}

{% endfor %}
{% endif %} @@ -102,11 +102,11 @@

Tournaments

{% if players %}
-

{{user.username}} results of passed and open leagues

+

{% blocktrans with username=user.username %}{{username}} results of passed and open leagues{% endblocktrans %}

    -
  • Archives
    • +
  • {% trans "Archives" %}
    • {% for event in open_events %} {% if event.is_in %}
  • {{event.name}}
    • @@ -118,11 +118,11 @@

    Tournaments

    - - - - - + + + + + {% for player in players %} @@ -144,10 +144,10 @@

    Tournaments

    EventDivisionwinlossgames {% trans "Event" %}{% trans "Division" %}{% trans "win" %}{% trans "Loss" %}{% trans "Games" %}
    - - - - + + + + @@ -197,14 +197,14 @@

    Tournaments

    -

    {{user}} Games +

    {% blocktrans %}{{user}} games{% endblocktrans %} - +

    {% if sgfs is None %}
    - {{user}} didn't play any league game yet. + {% blocktrans %}{{user}} didn't play any league game yet.{% endblocktrans %}
    {% else %}
    @@ -215,7 +215,7 @@

    Tournaments

    - Click a game result to see it. + {% trans "Click a game result to see it." %}
    diff --git a/league/templates/league/account_activity.html b/league/templates/league/account_activity.html index b2fe628c..cc8b6823 100644 --- a/league/templates/league/account_activity.html +++ b/league/templates/league/account_activity.html @@ -16,8 +16,8 @@ {% endblock %} -{% block title %}{{user.username}}'s activity{% endblock %} -{% block heading %}

    {{user.username}}'s activity

    {%endblock%} +{% block title %}{% blocktrans with username=user.username %}{{username}}'s activity{% endblocktrans %}{% endblock %} +{% block heading %}

    {% blocktrans with username=user.username %}{{username}}'s activity{% endblocktrans %}

    {%endblock%} {% block content %} {% include 'league/includes/user_nav.html' with active='activity' %} From ff85e3bc2f8c5252b072adc804c9753aac03ac86 Mon Sep 17 00:00:00 2001 From: clubdego974 Date: Tue, 15 Aug 2023 08:09:24 +0400 Subject: [PATCH 2/9] Translation tags in "community\templates" --- .../community/admin/community_create.html | 6 ++--- .../community/admin/community_list.html | 24 ++++++++++--------- .../templates/community/admin/user_list.html | 6 ++--- .../templates/community/calendar_iframe.html | 2 +- .../community/community_admin_update.html | 4 ++-- .../templates/community/community_list.html | 14 +++++------ .../templates/community/community_page.html | 24 ++++++++++--------- .../community/community_ranking.html | 8 +++---- .../templates/community/community_update.html | 6 ++--- .../templates/community/create_league.html | 8 +++---- .../community/includes/members_table.html | 10 ++++---- .../community/includes/new_user_table.html | 4 ++-- .../templates/community/ranking_table.html | 4 ++-- 13 files changed, 62 insertions(+), 58 deletions(-) diff --git a/community/templates/community/admin/community_create.html b/community/templates/community/admin/community_create.html index f4b2671e..a8e0ad8e 100644 --- a/community/templates/community/admin/community_create.html +++ b/community/templates/community/admin/community_create.html @@ -1,8 +1,8 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} +{% load bootstrap3 league_tags i18n %} {% block heading %}
    -

    Create a new Guest Community

    +

    {% trans "Create a new Guest Community" %}

    {%endblock%} {% block content %} @@ -12,7 +12,7 @@

    Create a new Guest Community

    {% bootstrap_button "Save" button_type="submit" button_class="btn-primary" %} -Cancel +{% trans "Cancel" %} {% endblock %} {% block extra_css %} {{ form.media.css }} diff --git a/community/templates/community/admin/community_list.html b/community/templates/community/admin/community_list.html index 760d9a37..ac818c54 100644 --- a/community/templates/community/admin/community_list.html +++ b/community/templates/community/admin/community_list.html @@ -1,8 +1,8 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} +{% load bootstrap3 league_tags i18n %} {% block heading %}
    -

    Guest Communitys

    +

    {% trans "Guest Communitys" %}

    {%endblock%} {% block content %} @@ -10,10 +10,10 @@

    Guest Communitys

    -

    List of Communitys +

    {% trans "List of Communitys" %}

    @@ -21,12 +21,14 @@

    List of Communitys

    RankPlayerscore {{user.profile.kgs_username}}'s results{% trans "Rank" %}{% trans "Player" %}{% trans "Score" %} {% blocktrans with kgs_username=user.profile.kgs_username %}{{kgs_username}}'s results{% endblocktrans %}
    - - - - - - + + {% comment %}Translators : CLOSE community{% endcomment %} + + {% comment %}Translators : PRIVATE community{% endcomment %} + + + + {% for community in communitys%} @@ -48,7 +50,7 @@

    List of Communitys {% csrf_token %} diff --git a/community/templates/community/admin/user_list.html b/community/templates/community/admin/user_list.html index 76953903..e698fa11 100644 --- a/community/templates/community/admin/user_list.html +++ b/community/templates/community/admin/user_list.html @@ -1,5 +1,5 @@ {% extends 'full_width.html' %} -{% load bootstrap3 league_tags community_tags i18n%} +{% load bootstrap3 league_tags community_tags i18n %} {% block heading %}

    {{community|community_link}} {% trans "members" %}

    @@ -26,7 +26,7 @@

    {{community|community_link}} {% trans "members" %}

    - {% blocktrans with name=community.name %}All {{community.name}} members {% endblocktrans %} + {% blocktrans with community_name=community.name %}All {{community_name}} members {% endblocktrans %}

    NameClosePrivateAdminsEditDelete{% trans "Name" %}{% trans "Close" %}{% trans "Private" %}{% trans "Admins" %}{% trans "Edit" %}{% trans "Delete" %}
    @@ -46,7 +46,7 @@

    {{community|community_link}} {% trans "members" %}

    diff --git a/community/templates/community/calendar_iframe.html b/community/templates/community/calendar_iframe.html index b437755f..52a8d364 100644 --- a/community/templates/community/calendar_iframe.html +++ b/community/templates/community/calendar_iframe.html @@ -17,7 +17,7 @@ - {{community.name}} calendar + {% blocktrans with community_name=community.name %}{{community_name}} calendar{% endblocktrans %} diff --git a/community/templates/community/community_admin_update.html b/community/templates/community/community_admin_update.html index d3ed4451..b4821027 100644 --- a/community/templates/community/community_admin_update.html +++ b/community/templates/community/community_admin_update.html @@ -1,8 +1,8 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} +{% load bootstrap3 league_tags i18n %} {% block heading %}
    -

    Edit the {{community.name}} community

    +

    {% blocktrans with community_name=community.name %}Edit the {{community_name}} community{% endblocktrans %}

    {%endblock%} {% block content %} diff --git a/community/templates/community/community_list.html b/community/templates/community/community_list.html index a03cb322..68d0e4b2 100644 --- a/community/templates/community/community_list.html +++ b/community/templates/community/community_list.html @@ -1,18 +1,18 @@ {% extends 'full_width.html' %} -{% load bootstrap3 community_tags forum_markup_tags%} -{% block title %}OSR - Communities {% endblock %} +{% load bootstrap3 community_tags forum_markup_tags i18n %} +{% block title %}OSR - {% trans "Communities" %} {% endblock %} {% block heading %}
    -

    List of all OSR communities

    +

    {% trans "List of all OSR communities" %}

    {%endblock%} {% block content %}
    -

    The Open Study Room have and always will be a project to help online go community organising and setting up go leagues. -With that in mind, we are very happy to host some league for other friendly go community.

    -

    Below is the list of the public communities OSR is hosting. Joining a community will allow you to play in their leagues.

    -

    If you want your community to run some leagues using the OSR league system, contact us at openstudyroom@gmail.com.

    +

    {% trans "The Open Study Room have and always will be a project to help online go community organising and setting up go leagues. " %} +{% trans "With that in mind, we are very happy to host some league for other friendly go community." %}

    +

    {% trans "Below is the list of the public communities OSR is hosting. Joining a community will allow you to play in their leagues." %}

    +

    {% trans "If you want your community to run some leagues using the OSR league system, contact us at openstudyroom@gmail.com." %}

    {% for community in communitys %}
    diff --git a/community/templates/community/community_page.html b/community/templates/community/community_page.html index b43fef55..12f5848b 100644 --- a/community/templates/community/community_page.html +++ b/community/templates/community/community_page.html @@ -1,5 +1,5 @@ {% extends 'full_width.html' %} -{% load bootstrap3 league_tags static forum_markup_tags i18n tz%} +{% load bootstrap3 league_tags static forum_markup_tags i18n tz %} {% block title %}OSR - {{community.name}}{% endblock %} {% block extra_head_js %} {% get_current_language as LANGUAGE_CODE %} @@ -79,7 +79,7 @@

    {{community.name}} ({{community.slug}})

    @@ -90,8 +90,10 @@

    {{community.name}} ({{community.slug}})
    -
    @@ -114,7 +116,7 @@

    {{community.name}} ({{community.slug}})

    - - + + {% if admin %} - + {% endif %} diff --git a/community/templates/community/includes/new_user_table.html b/community/templates/community/includes/new_user_table.html index a3ea6324..9e40fa97 100644 --- a/community/templates/community/includes/new_user_table.html +++ b/community/templates/community/includes/new_user_table.html @@ -7,8 +7,8 @@
    {% trans "username" %}OGS {% trans "username" %}KGS {% trans "username" %} {% trans "OGS username" %}{% trans "KGS username" %} EGF ID FFG ID Discord {% trans "leagues" %} {% trans "kick out" %}admin{% trans "admin" %}
    - - + + diff --git a/community/templates/community/ranking_table.html b/community/templates/community/ranking_table.html index 26222189..3b57b806 100644 --- a/community/templates/community/ranking_table.html +++ b/community/templates/community/ranking_table.html @@ -2,10 +2,10 @@ {% load tz static league_tags bootstrap3 i18n %} {% load datatable_tags %} -{% block title %}Ranking{% endblock %} +{% block title %}{% trans "Ranking" %}{% endblock %} {% block content %} -

    {{community.slug}} player's rankings

    +

    {% blocktrans with community_slug=community.slug %}{{community_slug}} player's rankings{% endblocktrans %}

    {% get_meijin as meijin %}
    From b5f7410f1ab3c38976a892643c89e517b0c96212 Mon Sep 17 00:00:00 2001 From: clubdego974 Date: Tue, 15 Aug 2023 08:10:11 +0400 Subject: [PATCH 3/9] Translation tags in "fullcalendar\templates" --- .../fullcalendar/admin_cal_event_list.html | 10 ++--- .../fullcalendar/calendar_main_view.html | 4 +- .../fullcalendar/calevent_create_form.html | 10 ++--- .../fullcalendar/calevent_update_form.html | 12 +++--- .../fullcalendar/category_create_form.html | 6 +-- .../fullcalendar/category_update_form.html | 6 +-- .../fullcalendar/event_list_sidebar.html | 6 +-- .../includes/admin_category_table.html | 10 ++--- .../includes/admin_event_table.html | 16 +++---- .../fullcalendar/includes/cal-modal.html | 11 ++--- .../fullcalendar/includes/event_list.html | 6 +-- .../fullcalendar/includes/modal.html | 42 ++++++++++--------- .../messages/game_appointment.txt | 6 +-- .../fullcalendar/messages/game_cancel.txt | 2 +- .../fullcalendar/messages/game_request.txt | 3 +- .../messages/game_request_accepted.txt | 3 +- .../fullcalendar/publicevent_create_form.html | 10 ++--- .../fullcalendar/publicevent_update_form.html | 12 +++--- 18 files changed, 90 insertions(+), 85 deletions(-) diff --git a/fullcalendar/templates/fullcalendar/admin_cal_event_list.html b/fullcalendar/templates/fullcalendar/admin_cal_event_list.html index d28d926a..8b47fb79 100644 --- a/fullcalendar/templates/fullcalendar/admin_cal_event_list.html +++ b/fullcalendar/templates/fullcalendar/admin_cal_event_list.html @@ -1,9 +1,9 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags static tz%} -{% block title %}OSR league admin - Events list{% endblock %} +{% load bootstrap3 league_tags static tz l10n i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Events list" %}{% endblock %} {% block heading %}
    -

    Events list

    +

    {% trans "Events list" %}

    {%endblock%} @@ -12,7 +12,7 @@

    Events list

    Categories @@ -23,7 +23,7 @@

    Events list

    Events diff --git a/fullcalendar/templates/fullcalendar/calendar_main_view.html b/fullcalendar/templates/fullcalendar/calendar_main_view.html index ee0650ea..f6d505ac 100644 --- a/fullcalendar/templates/fullcalendar/calendar_main_view.html +++ b/fullcalendar/templates/fullcalendar/calendar_main_view.html @@ -16,12 +16,12 @@ {% endblock %} -{% block title %}Calendar{% endblock %} +{% block title %}{% trans "Calendar" %}{% endblock %} {% block heading %} {% get_current_timezone as TIME_ZONE %}
    -

    Calendar ({{TIME_ZONE}})

    +

    {% trans "Calendar" %} ({{TIME_ZONE}})

    {%endblock%} diff --git a/fullcalendar/templates/fullcalendar/calevent_create_form.html b/fullcalendar/templates/fullcalendar/calevent_create_form.html index f9d51006..dd92da02 100644 --- a/fullcalendar/templates/fullcalendar/calevent_create_form.html +++ b/fullcalendar/templates/fullcalendar/calevent_create_form.html @@ -1,18 +1,18 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags static tz %} -{% block title %}OSR league admin - Create new Event{% endblock %} +{% load bootstrap3 league_tags static tz i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Create new event" %}{% endblock %} {% block heading %}
    -

    Create new Event

    +

    {% trans "Create new event" %}

    {%endblock%} {% block content %} {% timezone "UTC" %}
    - Create new Event -
    Please enter times in UTC/GMT time
    + {% trans "Create new event" %} +
    {% trans "Please enter times in UTC/GMT time" %}
    {% csrf_token %} {%bootstrap_form form %} diff --git a/fullcalendar/templates/fullcalendar/calevent_update_form.html b/fullcalendar/templates/fullcalendar/calevent_update_form.html index adea0d26..d2258cd9 100644 --- a/fullcalendar/templates/fullcalendar/calevent_update_form.html +++ b/fullcalendar/templates/fullcalendar/calevent_update_form.html @@ -1,18 +1,18 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags static tz%} -{% block title %}OSR league admin - Edit an event{% endblock %} +{% load bootstrap3 league_tags static tz i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Edit an event" %}{% endblock %} {% block heading %}
    -

    Edit the event {{object.title}}

    +

    {% blocktrans with object_title=object.title %}Edit the event {{object_title}}{% endblocktrans %}

    {%endblock%} {% block content %} {% timezone "UTC" %}
    - Edit the event {{object.title}} -
    Please enter times in UTC/GMT time with the format dd/mm/yyy hh:mm
    + {% blocktrans with object_title=object.title %}Edit the event {{object_title}}{% endblocktrans %} +
    {% trans "Please enter times in UTC/GMT time with the format dd/mm/yyyy hh:mm" %}
    {% csrf_token %} {%bootstrap_form form %} @@ -22,7 +22,7 @@

    Edit the event {{object.title}}

    {% csrf_token %}
    diff --git a/fullcalendar/templates/fullcalendar/category_create_form.html b/fullcalendar/templates/fullcalendar/category_create_form.html index b2f879f5..cd8502a3 100644 --- a/fullcalendar/templates/fullcalendar/category_create_form.html +++ b/fullcalendar/templates/fullcalendar/category_create_form.html @@ -1,10 +1,10 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 %} -{% block title %}OSR league admin - Create new Category{% endblock %} +{% load bootstrap3 i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Create new category" %}{% endblock %} {% block heading %}
    -

    Create new category

    +

    {% trans "Create new category" %}

    {%endblock%} {% block content %} diff --git a/fullcalendar/templates/fullcalendar/category_update_form.html b/fullcalendar/templates/fullcalendar/category_update_form.html index e49d3dbe..f0bca648 100644 --- a/fullcalendar/templates/fullcalendar/category_update_form.html +++ b/fullcalendar/templates/fullcalendar/category_update_form.html @@ -1,10 +1,10 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 %} -{% block title %}OSR league admin - Edit a Category{% endblock %} +{% load bootstrap3 i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Edit a category" %}{% endblock %} {% block heading %}
    -

    Edit {{object.name}} category

    +

    {% blocktrans with object_name=object.name %}Edit {{object_name}} category{% endblocktrans %}

    {%endblock%} {% block content %} diff --git a/fullcalendar/templates/fullcalendar/event_list_sidebar.html b/fullcalendar/templates/fullcalendar/event_list_sidebar.html index 20dfc225..a1ccec0e 100644 --- a/fullcalendar/templates/fullcalendar/event_list_sidebar.html +++ b/fullcalendar/templates/fullcalendar/event_list_sidebar.html @@ -1,10 +1,10 @@ -{%load tz calendar_tags%} +{%load tz calendar_tags l10n i18n %} {% get_current_timezone as TIME_ZONE %}

      - OSR Events ({{TIME_ZONE}}) + {% blocktrans with TIME_ZONE=TIME_ZONE %}OSR Events ({{TIME_ZONE}}){% endblocktrans %}

      {% get_now as now %} @@ -18,7 +18,7 @@

      {% if cal_event.start.date == now.date %} - Today ! + {% trans "Today !" %}" {% else %} {{cal_event.start|date:"d, M"}} {% endif %} diff --git a/fullcalendar/templates/fullcalendar/includes/admin_category_table.html b/fullcalendar/templates/fullcalendar/includes/admin_category_table.html index 50d15727..d86d7a73 100644 --- a/fullcalendar/templates/fullcalendar/includes/admin_category_table.html +++ b/fullcalendar/templates/fullcalendar/includes/admin_category_table.html @@ -1,10 +1,10 @@ -{% load bootstrap3 %} +{% load bootstrap3 i18n %}

    {% trans "username" %} OGS {% trans "username" %} KGS {% trans "username" %} {% trans "OGS username" %} {% trans "KGS username" %} {% trans "reject" %} {% trans "accept" %}
    - - - - + + + + diff --git a/fullcalendar/templates/fullcalendar/includes/admin_event_table.html b/fullcalendar/templates/fullcalendar/includes/admin_event_table.html index 94f74cc1..19df4105 100644 --- a/fullcalendar/templates/fullcalendar/includes/admin_event_table.html +++ b/fullcalendar/templates/fullcalendar/includes/admin_event_table.html @@ -1,16 +1,16 @@ -{% load bootstrap3 league_tags static tz%} +{% load bootstrap3 league_tags static tz %} {% load l10n i18n %} {% localize off %} {% timezone "UTC" %} {% language 'en' %}
    NameColor EditDelete{% trans "Name" %}{% trans "Color" %} {% trans "Edit" %}{% trans "Delete" %}
    - - - - - - + + + + + + @@ -31,7 +31,7 @@ {% csrf_token %} diff --git a/fullcalendar/templates/fullcalendar/includes/cal-modal.html b/fullcalendar/templates/fullcalendar/includes/cal-modal.html index 4bb1098a..44978e51 100644 --- a/fullcalendar/templates/fullcalendar/includes/cal-modal.html +++ b/fullcalendar/templates/fullcalendar/includes/cal-modal.html @@ -1,3 +1,4 @@ +{% load i18n %} diff --git a/fullcalendar/templates/fullcalendar/includes/event_list.html b/fullcalendar/templates/fullcalendar/includes/event_list.html index 760e79d1..df8552a7 100644 --- a/fullcalendar/templates/fullcalendar/includes/event_list.html +++ b/fullcalendar/templates/fullcalendar/includes/event_list.html @@ -1,6 +1,6 @@ -{%load tz calendar_tags%} +{%load tz calendar_tags l10n i18n %} {% get_current_timezone as TIME_ZONE %} -

    OSR Events ({{TIME_ZONE}})

    +

    {% blocktrans with TIME_ZONE=TIME_ZONE %}OSR Events ({{TIME_ZONE}}){% endblocktrans %}

    {% get_now as now %} {% public_events as public_events%}
    3 %} class="pre-scrollable" {% endif %}> @@ -11,7 +11,7 @@

    OSR Events ({{TIME_ZONE}})

    {% if cal_event.start.date == now.date %} - Today ! + {% trans "Today !" %} {% else %} {{cal_event.start|date:"d, M"}} {% endif %} diff --git a/fullcalendar/templates/fullcalendar/includes/modal.html b/fullcalendar/templates/fullcalendar/includes/modal.html index 1d737ebf..2c7e73e8 100644 --- a/fullcalendar/templates/fullcalendar/includes/modal.html +++ b/fullcalendar/templates/fullcalendar/includes/modal.html @@ -1,22 +1,24 @@ -{% load calendar_tags %} +{% load calendar_tags i18n %}

    TitleBegin Time (UTC/24h)End Time (UTC/24h)Category EditDelete{% trans "Title" %}{% trans "Begin Time (UTC/24h)" %}{% trans "End Time (UTC/24h)" %}{% trans "Category" %} {% trans "Edit" %}{% trans "Delete" %}
    - + {% comment %}Translators : start date and time of the event{% endcomment %} + - + {% comment %}Translators : end date and time of the event{% endcomment %} +
    START :{% trans "START :" %}
    END :{% trans "END :" %}
    @@ -24,7 +26,7 @@

    Create new event

    From a22bb5d17c1eed8c2d8799c28ab4d7f65ad37e45 Mon Sep 17 00:00:00 2001 From: clubdego974 Date: Tue, 15 Aug 2023 08:10:43 +0400 Subject: [PATCH 4/9] Translation tags in "home\templates" --- home/templates/home/home_page.html | 19 ++++++----- home/templates/home/includes/front_boxes.html | 19 ++++++----- .../home/includes/front_boxes_members.html | 33 ++++++++++--------- .../home/includes/homepage_intro.html | 23 ++++++------- home/templates/home/includes/prev_next.html | 6 ++-- .../home/includes/related_links.html | 3 +- home/templates/home/includes/search_box.html | 3 +- home/templates/home/includes/we_provide.html | 20 ++++++----- 8 files changed, 68 insertions(+), 58 deletions(-) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index fe386d58..53ba2155 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load static i18n wagtailcore_tags wagtailimages_tags puput_tags compress wagtailroutablepage_tags league_tags osr_tags tz%} +{% load static l10n i18n wagtailcore_tags wagtailimages_tags puput_tags compress wagtailroutablepage_tags league_tags osr_tags tz %} {% load comments comments_xtd %} {% block extra_css %} @@ -20,12 +20,14 @@
    {{discord_presence_count}} - + {% comment %}Translators : the sentence that appears at the top left of the home page{% endcomment %} +
    {{games.total}} - + {% comment %}Translators : the sentence that appears at the top left of the home page +
{% endblock %} @@ -76,8 +78,8 @@
- -

Latest news in our blog

+{% comment %}Translators : Latest news in our ... blog{% endcomment %} +

{% trans "Latest news in our" %} blog

{% for entry in entries %} @@ -137,7 +139,8 @@

-

In our forums

+ {% comment %}Translators : In our ... forums (plural) {% endcomment %} +

{% trans "In our" %} forums

{% last_topics request as topics %} {% for topic in topics %} @@ -170,12 +173,12 @@
-

OSR is made possible thanks to the support from friends and partners

+

{% trans "OSR is made possible thanks to the support from friends and partners" %}

{% sponsors %}
-

You can help OSR too!

+

{% trans "You can help OSR too!" %}

diff --git a/home/templates/home/includes/front_boxes.html b/home/templates/home/includes/front_boxes.html index 63ec2c9b..2b5515a3 100644 --- a/home/templates/home/includes/front_boxes.html +++ b/home/templates/home/includes/front_boxes.html @@ -1,36 +1,37 @@ +{% load i18n %}

- Study Go

+ {% trans "Study Go" %}
-

We provide a place to study go together. Review your games, study pro games, attend lectures, and more

- Join now ! +

{% trans "We provide a place to study go together. Review your games, study pro games, attend lectures, and more." %}

+ {% trans "Join now !" %}
-

Play Go

+

{% trans "Play Go" %}

-

Our league system allow you to play long serious games in a friendly yet competitive environement.

- Check out our league +

{% trans "Our league system allow you to play long serious games in a friendly yet competitive environement." %}

+ {% trans "Check out our league" %}
-

Together

+

{% trans "Together" %}

-

Run by and for an international go community. We would be delighted to hear your ideas or feedback.

- Visit our forums +

{% trans "Run by and for an international go community. We would be delighted to hear your ideas or feedback." %}

+ {% trans "Visit our forums" %}
diff --git a/home/templates/home/includes/front_boxes_members.html b/home/templates/home/includes/front_boxes_members.html index 2b48abef..f1f5d5fb 100644 --- a/home/templates/home/includes/front_boxes_members.html +++ b/home/templates/home/includes/front_boxes_members.html @@ -1,23 +1,23 @@ -{% load league_tags %} +{% load league_tags l10n i18n %}
{% if should_join %} -

Join a league

+

{% trans "Join a league" %}

{% else %} -

Play, chat and study now in our discord!

+

{% blocktrans %}Play, chat and study now in our discord!{% endblocktrans %}

{% endif %}
{% if should_join %} -

You can easily join a league in the league pages.

-

See how our leagues works here.

+

{% blocktrans %}You can easily join a league in the league pages.{% endblocktrans %}

+

{% blocktrans %}See how our leagues works here.{% endblocktrans %}

{% else %} {% if online_opponents %}

- Join the motivated OSR-community in our discord channel. Chat, arrange games and get your games reviewed. + {% blocktrans %}Join the motivated OSR-community in our discord channel. Chat, arrange games and get your games reviewed.{% endblocktrans %}

-

Your opponents online now:

+

{% trans "Your opponents online now:" %}

{% for user in online_opponents %} @@ -31,7 +31,7 @@

Play, chat and study now in our
-

Plan your games

+

{% trans "Plan your games" %}

{% if availables %} {% for available in availables %} -

{{available.user|user_link}} wants to play on the {{available.start|date:"j b"}} {{available.start|time}} -> {{available.end|time}}

+

{% blocktrans with available_user=available.user|user_link available_start_date=available.start|date:"j b" available_start_time=available.start|time available_end_time=available.end|time %}{{available_user}} wants to play on the {{available_start_date}} {{available_start_time}} -> {{available_end_time}}{% endblocktrans %}

{% endfor %} {% endif %} {% if not me_available %} -

Tell others when you are available so they can schedule games with you.

+

{% trans "Tell others when you are available so they can schedule games with you." %}

{% endif %} {% if game_requests > 0 %} -

You have {{game_requests}} game requests.

+

{% blocktrans with game_requests=game_requests %}You have {{game_requests}} game requests.{% endblocktrans %}

{% endif %} -

Manage all this here

+ {% comment %}Translators : this sentence append just after 'You have 'game_requests' game requests'{% endcomment %} +

{% blocktrans %}Manage all this here {% endblocktrans %}

-

Support the OSR project

+

{% trans "Support the OSR project" %}

-

Click here to see various way you can help OSR.

-

You can also just push the donate button.

+

{% blocktrans %}Click here to see various way you can help OSR.{% endblocktrans %}

+

{% trans "You can also just push the donate button." %}

diff --git a/home/templates/home/includes/homepage_intro.html b/home/templates/home/includes/homepage_intro.html index 3fbd6301..50045c6e 100644 --- a/home/templates/home/includes/homepage_intro.html +++ b/home/templates/home/includes/homepage_intro.html @@ -1,30 +1,31 @@ +{% load i18n %}
-

Let's get better together

+

{% trans "Let's get better together" %}

Study Go

-

Ask stronger players to help review your games, study pro games or tsumego. We also organise lectures with strong teachers. The global idea is you get taught by the stronger while you teach the weaker.

-

See our study schedule in our calendar

+

{% trans "Ask stronger players to help review your games, study pro games or tsumego. We also organise lectures with strong teachers. The global idea is you get taught by the stronger while you teach the weaker." %}

+

{% trans "See our study schedule in our calendar" %}

-

Play Go

-

Playing long serious games is very important to improve. Our league system encourages you to do so in a friendly yet competitive environment. On top of that we reward our winners with cool prizes every month.

-

Check out our leagues

+

{% trans "Play Go" %}

+

{% trans "Playing long serious games is very important to improve. Our league system encourages you to do so in a friendly yet competitive environment. On top of that we reward our winners with cool prizes every month." %}

+

{% trans "Check out our leagues" %}

-

Together

-

We are a friendly active online community of Go players from all around the world. OSR is run by volunteers, community driven and all free for everyone to come enjoy the beautiful game of Go.

-

Come chat with us in our Discord

+

{% trans "Together" %}

+

{% trans "We are a friendly active online community of Go players from all around the world. OSR is run by volunteers, community driven and all free for everyone to come enjoy the beautiful game of Go." %}

+

{% trans "Come chat with us in our Discord" %}

@@ -33,7 +34,7 @@

Together

-Whether you are a beginner just learning the rules or a strong player, OSR can help your Go. + {% trans "Whether you are a beginner just learning the rules or a strong player, OSR can help your Go." %}"

-

Join now !

+

{% trans "Join now !" %}

diff --git a/home/templates/home/includes/prev_next.html b/home/templates/home/includes/prev_next.html index 34100151..5ed7d0d8 100644 --- a/home/templates/home/includes/prev_next.html +++ b/home/templates/home/includes/prev_next.html @@ -1,4 +1,4 @@ -{% load wagtailcore_tags %} +{% load wagtailcore_tags i18n %} {% if self.depth > 3 %}{# Previous and next buttons are not relevant for the home page and categories #} {% with prev=self.get_prev_siblings.live.first next=self.get_next_siblings.live.first %} @@ -7,13 +7,13 @@ diff --git a/home/templates/home/includes/related_links.html b/home/templates/home/includes/related_links.html index 467b880c..873776a3 100644 --- a/home/templates/home/includes/related_links.html +++ b/home/templates/home/includes/related_links.html @@ -1,10 +1,11 @@ +{% load i18n %} {% if related_links %}
-

Related links

+

{% trans "Related links" %}

    diff --git a/home/templates/home/includes/search_box.html b/home/templates/home/includes/search_box.html index 568f4bb4..ce614d4f 100644 --- a/home/templates/home/includes/search_box.html +++ b/home/templates/home/includes/search_box.html @@ -1,3 +1,4 @@ +{% load i18n %}
    @@ -5,7 +6,7 @@
    diff --git a/home/templates/home/includes/we_provide.html b/home/templates/home/includes/we_provide.html index 6d8a0d9f..6e821441 100644 --- a/home/templates/home/includes/we_provide.html +++ b/home/templates/home/includes/we_provide.html @@ -1,4 +1,6 @@ -

    We provide

    +{% load i18n %} +{% comment %}Translators : 'we provide' section, on the home page{% endcomment %} +

    {% trans "We provide" %}

    @@ -7,8 +9,8 @@

    We provide

    -

    OGS/KGS/Discord integration

    -

    See what opponents are online on those platform to find a game. Play your league games, write #OSR during the chat and that's it. Our website will collect it automatically.

    +

    {% trans "OGS/KGS/Discord integration" %}

    +

    {% blocktrans %}See what opponents are online on those platform to find a game. Play your league games, write #OSR during the chat and that's it. Our website will collect it automatically.{% endblocktrans %}

    @@ -19,8 +21,8 @@

    OGS/KGS/Discord integration

-

Teaching for everyone

-

Do you prefer a simul game with a strong dan? A lecture on a topic of your choosing? A teaching game? Let us know! We set it up with our teachers, record it and upload to our youtube channel.

+

{% trans "Teaching for everyone" %}

+

{% blocktrans %}Do you prefer a simul game with a strong dan? A lecture on a topic of your choosing? A teaching game? Let us know! We set it up with our teachers, record it and upload to our youtube channel.{% endblocktrans %}

@@ -35,8 +37,8 @@

Teaching for everyone

-

Prizes

-

Win a teaching game with a professional player, a game review by a strong dan or 10€ gift certificate at Guo Juan's internet go school. All that just by playing go!

+

{% trans "Prizes" %}

+

{% blocktrans %}Win a teaching game with a professional player, a game review by a strong dan or 10€ gift certificate at Guo Juan's internet go school. All that just by playing go!{% endblocktrans %}

@@ -47,8 +49,8 @@

Prizes

-

Plan your games

-

Plan your game in advance with your opponent using our game planner. It's easy to use and it adapts to timezones automatically.

+

{% trans "Plan your games" %}

+

{% blocktrans %}Plan your game in advance with your opponent using our game planner. It's easy to use and it adapts to timezones automatically.{% endblocktrans %}

From b5178cdbfd17c96cd4e49bdd1bbd80f22b579702 Mon Sep 17 00:00:00 2001 From: clubdego974 Date: Tue, 15 Aug 2023 08:12:13 +0400 Subject: [PATCH 5/9] Translation tags in "league\templates" --- league/templates/emails/email_confirm.txt | 5 +++ league/templates/emails/no_games.txt | 6 +++- league/templates/emails/welcome.txt | 6 +++- league/templates/league/admin/base.html | 15 ++++---- .../league/admin/create_all_profiles.html | 18 +++++----- .../league/admin/create_forfeit.html | 12 +++---- league/templates/league/admin/dashboard.html | 30 ++++++++-------- .../league/admin/download_ffg_tou.html | 6 ++-- league/templates/league/admin/event_list.html | 33 ++++++++++-------- league/templates/league/admin/events.html | 12 +++---- league/templates/league/admin/populate.html | 34 +++++++++---------- league/templates/league/admin/sgf_edit.html | 28 +++++++-------- league/templates/league/admin/sgf_list.html | 26 +++++++------- .../league/admin/update_all_profiles.html | 20 +++++------ .../admin/update_all_sgf_check_code.html | 22 ++++++------ .../league/admin/update_wont_play.html | 8 ++--- league/templates/league/admin/upload_sgf.html | 28 +++++++-------- .../league/admin/user_send_mail.html | 6 ++-- league/templates/league/admin/users.html | 20 +++++------ league/templates/league/archive.html | 30 ++++++++-------- league/templates/league/archives_games.html | 2 +- league/templates/league/archives_players.html | 29 ++++++++-------- league/templates/league/base.html | 4 +-- .../league/division_update_form.html | 6 ++-- league/templates/league/event.html | 15 ++++---- league/templates/league/games.html | 8 ++--- .../league/includes/admin_edit_divisions.html | 16 ++++----- .../league/includes/admin_league_form.html | 10 +++--- .../templates/league/includes/admin_nav.html | 11 +++--- league/templates/league/includes/event.html | 9 ++--- .../templates/league/includes/game_info.html | 4 +-- .../league/includes/game_table_view.html | 8 ++--- league/templates/league/includes/games.html | 2 +- .../league/includes/games_iframe.html | 10 +++--- league/templates/league/includes/league.html | 7 ++-- .../includes/no_profile_users_table.html | 14 ++++---- league/templates/league/includes/results.html | 5 +-- .../league/includes/results_ladder.html | 6 ++-- .../league/includes/results_league.html | 16 ++++----- .../templates/league/includes/sgf_errors.html | 10 +++--- .../templates/league/includes/user_infos.html | 10 +++--- .../league/includes/user_infos_member.html | 12 +++---- .../templates/league/includes/user_nav.html | 10 +++--- league/templates/league/includes/vs.html | 4 +-- .../league/leagueevent_create_form.html | 12 +++---- .../league/leagueevent_update_form.html | 24 ++++++------- league/templates/league/players.html | 2 +- league/templates/league/profile.html | 4 +-- league/templates/league/profile_update.html | 8 ++--- league/templates/league/random_game.html | 8 ++--- league/templates/league/results.html | 10 +++--- league/templates/league/results_iframe.html | 16 ++++----- league/templates/league/timezone_update.html | 16 ++++----- 53 files changed, 359 insertions(+), 334 deletions(-) diff --git a/league/templates/emails/email_confirm.txt b/league/templates/emails/email_confirm.txt index bb83e702..9bc7415e 100644 --- a/league/templates/emails/email_confirm.txt +++ b/league/templates/emails/email_confirm.txt @@ -1,3 +1,6 @@ +{% load l10n i18n tz %} +{% localize off %} +{% language 'en' %} Hello {{user.username}}, You registered on Open Study Room website on the {{user.date_joined | date:"d/m/Y"}} but you didn't confirm your email since then. @@ -9,3 +12,5 @@ You are more than welcome to register again. If you do, please don't forget to c Feel free to contact us at openstudyroom@gmail.com if you have any issue or question. openstudyroom.org +{% endlanguage %} +{% endlocalize %} diff --git a/league/templates/emails/no_games.txt b/league/templates/emails/no_games.txt index 72cf9fec..f3b40faf 100644 --- a/league/templates/emails/no_games.txt +++ b/league/templates/emails/no_games.txt @@ -1,8 +1,12 @@ +{% load i18n tz %} +{% localize off %} +{% language 'en' %} Hello {{user.username}}, - We noticed your registration, however we require that each user has played at least one game on KGS or OGS. We can see that you have not yet played any games there under the handle '{{user.kgs_username}}'(KGS) {%if user.profile.ogs_id > 0%} or '{{user.profile.ogs_username}}'(OGS){% endif %}. We do this to make sure that you are really a go player and not a robot. Please feel free to register again when you have played a game. openstudyroom.org +{% endlanguage %} +{% endlocalize %} diff --git a/league/templates/emails/welcome.txt b/league/templates/emails/welcome.txt index 1a8db77b..2890c7c3 100644 --- a/league/templates/emails/welcome.txt +++ b/league/templates/emails/welcome.txt @@ -1,4 +1,6 @@ -{% load i18n %} +{% load i18n tz %} +{% localize off %} +{% language 'en' %} Hello and welcome to the Open Study Room, {{user.username}}! You have just been accepted as an OSR member, and we are glad to have you onboard. @@ -11,3 +13,5 @@ You can now also use our forums and join our Discord server at https://discord.g Looking forward to see you there! openstudyroom.org +{% endlanguage %} +{% endlocalize %} diff --git a/league/templates/league/admin/base.html b/league/templates/league/admin/base.html index cdf508f3..c38ae1be 100644 --- a/league/templates/league/admin/base.html +++ b/league/templates/league/admin/base.html @@ -1,6 +1,7 @@ +{% load i18n %} {% extends "full_width.html" %} -{% block title %}OSR league admin{% endblock %} +{% block title %}{% trans "OSR league admin" %}{% endblock %} {%block page_intro %} {% if request.user.is_league_admin %} @@ -9,13 +10,13 @@ diff --git a/league/templates/league/admin/create_all_profiles.html b/league/templates/league/admin/create_all_profiles.html index 27e6a432..c9d72e00 100644 --- a/league/templates/league/admin/create_all_profiles.html +++ b/league/templates/league/admin/create_all_profiles.html @@ -2,24 +2,24 @@ {% load wagtailcore_tags %} {% load league_tags %} {% load bootstrap3 %} - -{% block title %}Update all sgfs{% endblock %} +{% load i18n %} +{% block title %}{% trans "Update all sgfs" %}{% endblock %} {% block heading %}
-

Create all profiles

+

{% trans "Create all profiles" %}

{%endblock%} {% block content %}
-

Dear admin.

-

Please pay attention to this message and don't proceed before reading

-

In this page, you will create a profile for all users that don't have one.

-

If you don't understand what this is about, you should just leave this page.

-

If you have any doubt what so ever about wether you should continue or not, you should leave this page.

+

{% trans "Dear admin," %}

+

{% trans "Please pay attention to this message and don't proceed before reading." %}

+

{% trans "In this page, you will create a profile for all users that don't have one." %}

+

{% trans "If you don't understand what this is about, you should just leave this page." %}

+

{% trans "If you have any doubt what so ever about wether you should continue or not, you should leave this page." %}

- Back to admin + {% trans "Back to admin" %}
diff --git a/league/templates/league/admin/create_forfeit.html b/league/templates/league/admin/create_forfeit.html index 575b53b6..4ccb47f5 100644 --- a/league/templates/league/admin/create_forfeit.html +++ b/league/templates/league/admin/create_forfeit.html @@ -1,10 +1,10 @@ {% extends 'full_width.html' %} -{% load bootstrap3 league_tags %} +{% load bootstrap3 league_tags i18n %} {% block title %} {{division.name}} edit {% endblock %} {% block heading %}
-

{{division.name}} - create forfeit

- Go back to division's page +

{% blocktrans with division_name=division.name %}{{division_name}} - create forfeit{% endblocktrans %}

+ {% trans "Go back to division's page" %}
{%endblock%} @@ -14,7 +14,7 @@

{{division.name}} - create forfeit

{% csrf_token %}
- + {% for player in division.get_results %} {% endfor %}
- +
diff --git a/league/templates/league/admin/dashboard.html b/league/templates/league/admin/dashboard.html index 7761fe3c..778a590f 100644 --- a/league/templates/league/admin/dashboard.html +++ b/league/templates/league/admin/dashboard.html @@ -1,9 +1,9 @@ {% extends "league/admin/base.html" %} -{% load wagtailcore_tags bootstrap3 community_tags %} -{% block title %}OSR league admin{% endblock %} +{% load wagtailcore_tags bootstrap3 community_tags l10n i18n %} +{% block title %}{% trans "OSR league admin" %}{% endblock %} {% block heading %}
-

Dashboard

+

{% trans "Dashboard" %}

{%endblock%} {% block content %} @@ -13,20 +13,20 @@

Dashboard

{% include 'league/includes/no_profile_users_table.html' %} {% endif %}
-

List of new users

+

{% trans "List of new users" %}

- - - - - - - - - - + + + + + + + + + + {% for new_user in new_users %} @@ -87,7 +87,7 @@

Dashboard

-

Admin board Create new blog post

+

{% trans "Admin board" %} {% trans "Create new blog post" %}

diff --git a/league/templates/league/admin/download_ffg_tou.html b/league/templates/league/admin/download_ffg_tou.html index e4c5ac14..511f6319 100644 --- a/league/templates/league/admin/download_ffg_tou.html +++ b/league/templates/league/admin/download_ffg_tou.html @@ -1,12 +1,12 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags i18n l10n tz%} +{% load bootstrap3 league_tags i18n l10n tz %} -{% block title %}OSR league admin - Leagues{% endblock %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Leagues" %}{% endblock %} {% block heading %}
-

League "{{ league.name }}" - download FFG .tou

+

{% blocktrans with league_name=league.name %}League "{{ league_name }}" - download FFG .tou{% endblocktrans %}

{%endblock%} {% block content %} diff --git a/league/templates/league/admin/event_list.html b/league/templates/league/admin/event_list.html index 6f311e38..38c6be7d 100644 --- a/league/templates/league/admin/event_list.html +++ b/league/templates/league/admin/event_list.html @@ -3,25 +3,28 @@ {% language 'en' %}
usernameemaildate joinedkgs_usernameogs_usernameCommunities interestDeleteemailNo gamesAccept{% trans "username" %}{% trans "email" %}{% trans "date joined" %}{% trans "KGS username" %}{% trans "OGS username" %}{% trans "Communities interest" %}{% trans "Delete" %}{% trans "email" %}{% trans "No games" %}{% trans "Accept" %}
- - - - - - - - - - - - - + + {% comment %}Translators : public (league) {% endcomment %} + + + + + + + + + + + + {% for event in events %} - - + {% comment %}Translators : OPEN / CLOSED (league) {% endcomment %} + + {% comment %}Translators : PUBLIC / PRIVATE (league) {% endcomment %} + diff --git a/league/templates/league/admin/events.html b/league/templates/league/admin/events.html index 8426e15e..537d5ad3 100644 --- a/league/templates/league/admin/events.html +++ b/league/templates/league/admin/events.html @@ -1,22 +1,22 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} -{% block title %}OSR league admin - league{% endblock %} +{% load bootstrap3 league_tags l10n i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "League" %}{% endblock %} {% block heading %}
-

League manager

+

{% trans "League manager" %}

{%endblock%} {% block content %}

- List of OSR leagues + {% trans "List of OSR leagues" %}

- Community leagues are blue
+ {% trans "Community leagues are blue" %}
{% include "league/admin/event_list.html" with events=events %}
diff --git a/league/templates/league/admin/populate.html b/league/templates/league/admin/populate.html index 1ffe58a3..e79870a3 100644 --- a/league/templates/league/admin/populate.html +++ b/league/templates/league/admin/populate.html @@ -1,27 +1,27 @@ {% extends "full_width.html" %} -{% load bootstrap3 league_tags%} -{% block title %}OSR league admin{% endblock %} +{% load bootstrap3 league_tags i18n %} +{% block title %}{% trans "OSR league admin" %}{% endblock %} {% block content %} {% csrf_token %}
-

Rollover overview

+

{% trans "Rollover overview" %}"/h4>

-

You are populating {{to_event}} with players from {{from_event}}

-

Out of {{from_event.number_players}} players, {{from_event.number_actives_players}} were active and {{from_event.number_inactives_players}} will get drop.

-

The minimum number of games to stay in the league is set to {{from_event.min_matchs}}

+

{% blocktrans with to_event=to_event from_event=from_event %}You are populating {{to_event}} with players from {{from_event}} {% endblocktrans %}

+

{% blocktrans with from_event_number_players=from_event.number_players from_event_number_actives_players=from_event.number_actives_players from_event_number_inactives_players=from_event.number_inactives_players %}Out of {{from_event_number_players}} players, {{from_event_number_actives_players}} were active and {{from_event_number_inactives_players}} will get drop.{% endblocktrans %}

+

{% blocktrans with from_event_min_matchs=from_event.min_matchs %} The minimum number of games to stay in the league is set to {{from_event_min_matchs}}.{% endblocktrans %}

{%if preview%} {%endif%}
@@ -38,18 +38,18 @@ {% for division in divisions %}
{{division.name}} -
{{division.number_players}} players | {{division.number_games}} games
+
{{division.number_players}} players | {{division.number_games}} {% trans "games" %}
StatusPublic?NameBeginEndCommunityPlayers#Divisions#Gamesppwpplmin matchcopy{% trans "Status" %}{% trans "Public?" %}{% trans "Name" %}{% trans "Begin" %}{% trans "End" %}{% trans "Community" %}{% trans "Players" %}{% trans "#Divisions" %}{% trans "#Games" %}{% trans "ppw" %}{% trans "ppl" %}{% trans "min match" %}{% trans "copy" %}
{% if event.is_open %} Open {% else %} Closed {% endif %}{% if event.is_public %} public {% else %} Private {% endif %} {% if event.is_open %} {% trans "Open" %} {% else %} {% trans "Closed" %} {% endif %}{% if event.is_public %} {% trans "Public" %} {% else %} {% trans "Private" %} {% endif %} {{ event.name }} {{ event.begin_time | date:"M d, Y" }} {{ event.end_time | date:"M d, Y" }}
- - - - - + + + + + @@ -79,7 +79,7 @@
- {{to_event}} preview + {{to_event}} {% trans "preview" %} {% for division, players in new_players.items %}
{{division}} @@ -89,8 +89,8 @@
RankPlayerScoreGamesNext{% trans "Rank" %}{% trans "Player" %}{% trans "Score" %}{% trans "Games" %}{% trans "Next" %}
- - + + diff --git a/league/templates/league/admin/sgf_edit.html b/league/templates/league/admin/sgf_edit.html index d2d7f327..c230ae67 100644 --- a/league/templates/league/admin/sgf_edit.html +++ b/league/templates/league/admin/sgf_edit.html @@ -1,10 +1,10 @@ {% extends "league/admin/base.html" %} -{% load bootstrap3 wgo_tags league_tags%} +{% load bootstrap3 wgo_tags league_tags l10n i18n %} {% block title %}Edit a sgf{% endblock %} {% block heading %}
-

{{sgf.wplayer}} vs {{sgf.bplayer}} the {{sgf.date |date:"M d, Y"}}

+

{% blocktrans with sgf_wplayer=sgf.wplayer sgf_bplayer=sgf.bplayer sgf_date=sgf.date |date:"M d, Y" %}{{sgf_wplayer}} vs {{sgf_bplayer}} the {{sgf_date}}{% endblocktrans %}

{%endblock%} {% block content %} @@ -13,7 +13,7 @@

{{sgf.wplayer}} vs {{sgf.bplayer}} the {{sgf.date |date:"M d, Y"}}

@@ -22,16 +22,16 @@

{{sgf.wplayer}} vs {{sgf.bplayer}} the {{sgf.date |date:"M d, Y"}}

{% csrf_token %} {% if preview %}
- +
{% endif %}
@@ -46,31 +46,31 @@

{{sgf.wplayer}} vs {{sgf.bplayer}} the {{sgf.date |date:"M d, Y"}}

- + - + - + - + - + - + - + diff --git a/league/templates/league/admin/sgf_list.html b/league/templates/league/admin/sgf_list.html index be780f1e..d53e446a 100644 --- a/league/templates/league/admin/sgf_list.html +++ b/league/templates/league/admin/sgf_list.html @@ -1,41 +1,41 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} +{% load bootstrap3 league_tags l10n i18n %} {% block heading %}
-

All sgfs

+

{% trans "All sgfs" %}"/h1>

{%endblock%} {% block content %}
- Upload a sgf + {% trans "Upload a sgf" %}
{% csrf_token %}
- List of all OSR sgfs + {% trans "List of all OSR sgfs" %}
PlayerPrevious division{% trans "Player" %}{% trans "Previous division" %}
{{sgf.pk}}
White{% trans "White" %} {{sgf.wplayer}}
Black{% trans "Black" %} {{sgf.bplayer}}
Date{% trans "Date" %} {{sgf.date |date:"M d, Y"}}
Result{% trans "Result" %} {{sgf.result}}
Type{% trans "Type" %} {{sgf.game_type}}
p_status{% trans "p_status" %} {{sgf.p_status | p_status}}
Download {% trans "Download" %} {% bootstrap_icon 'save' %}
- - - - - - - - + + + + + + + + {% for sgf in sgfs%} diff --git a/league/templates/league/admin/update_all_profiles.html b/league/templates/league/admin/update_all_profiles.html index 6352b857..d5328a97 100644 --- a/league/templates/league/admin/update_all_profiles.html +++ b/league/templates/league/admin/update_all_profiles.html @@ -1,25 +1,25 @@ {% extends "full_width.html" %} -{% load wagtailcore_tags %} +{% load wagtailcore_tags i18n %} {% load league_tags %} {% load bootstrap3 %} {% block body_class %}user{% endblock %} -{% block title %}Update all sgfs check code{% endblock %} +{% block title %}{% trans "Update all sgfs check code" %}{% endblock %} {% block heading %}
-

Update all sgfs check code

+

{% trans "Update all sgfs check code" %}

{%endblock%} {% block content %}
-

Dear admin.

-

Please pay attention to this message and don't proceed before reading

-

In this page, can update some profiles datas.

-

If you don't understand what this is about, you should just leave this page.

-

If you have any doubt what so ever about wether you should continue or not, you should leave this page.

-

If you just did read the code of views.update_all_profiles and understand what you are doing, you may proceed

+

{% trans "Dear admin," %}

+

{% trans "Please pay attention to this message and don't proceed before reading." %}

+

{% trans "In this page, can update some profiles datas." %}

+

{% trans "If you don't understand what this is about, you should just leave this page." %}

+

{% trans "If you have any doubt what so ever about wether you should continue or not, you should leave this page." %}

+

{% trans "If you just did read the code of views.update_all_profiles and understand what you are doing, you may proceed." %}

Back to admin @@ -30,7 +30,7 @@

Update all sgfs check code

diff --git a/league/templates/league/admin/update_all_sgf_check_code.html b/league/templates/league/admin/update_all_sgf_check_code.html index 3df6bf27..08431b3c 100644 --- a/league/templates/league/admin/update_all_sgf_check_code.html +++ b/league/templates/league/admin/update_all_sgf_check_code.html @@ -1,28 +1,28 @@ {% extends "full_width.html" %} -{% load wagtailcore_tags %} +{% load wagtailcore_tags i18n %} {% load league_tags %} {% load bootstrap3 %} {% block body_class %}user{% endblock %} -{% block title %}Update all sgfs check code{% endblock %} +{% block title %}{% trans "Update all sgfs check code" %}{% endblock %} {% block heading %}
-

Update all sgfs check code

+

{% trans "Update all sgfs check code" %}

{%endblock%} {% block content %}
-

Dear admin.

-

Please pay attention to this message and don't proceed before reading

-

In this page, you can rescan all sgf in our db and update their check_code.

-

If you don't understand what this is about, you should just leave this page.

-

If you have any doubt what so ever about wether you should continue or not, you should leave this page.

-

If you just changed our check_code and positively want to update all sgf check code, you may proceed.

+

{% trans "Dear admin," %

+

{% trans "Please pay attention to this message and don't proceed before reading." %

+

{% trans "In this page, you can rescan all sgf in our db and update their check_code." %

+

{% trans "If you don't understand what this is about, you should just leave this page." %

+

{% trans "If you have any doubt what so ever about wether you should continue or not, you should leave this page." %

+

{% trans "If you just changed our check_code and positively want to update all sgf check code, you may proceed." %

- Back to admin + {% trans "Back to admin" %
@@ -30,7 +30,7 @@

Update all sgfs check code

diff --git a/league/templates/league/admin/update_wont_play.html b/league/templates/league/admin/update_wont_play.html index 1ff04e30..28391dce 100644 --- a/league/templates/league/admin/update_wont_play.html +++ b/league/templates/league/admin/update_wont_play.html @@ -1,10 +1,10 @@ {% extends 'full_width.html' %} -{% load bootstrap3 league_tags %} -{% block title %} {{division.name}} edit {% endblock %} +{% load bootstrap3 league_tags i18n %} +{% block title %} {% blocktrans with division_name=division.name %}{{division_name}} edit{% endblocktrans %} {% endblock %} {% block heading %}
-

{{division.name}} - Manage WontPlay results

- Go back to division's page +

{{division.name}} - {% trans "Manage WontPlay results" %}

+ {% trans "Go back to division's page" %}
{%endblock%} diff --git a/league/templates/league/admin/upload_sgf.html b/league/templates/league/admin/upload_sgf.html index f5a0fec3..c30624f7 100644 --- a/league/templates/league/admin/upload_sgf.html +++ b/league/templates/league/admin/upload_sgf.html @@ -1,37 +1,37 @@ {% extends "league/admin/base.html" %} -{% load bootstrap3 wgo_tags league_tags %} -{% block title %}Upload a sgf{% endblock %} +{% load bootstrap3 wgo_tags league_tags l10n i18n %} +{% block title %}{% trans "Upload a sgf" %}{% endblock %} {% block heading%}
-

Upload a sgf

+

{% trans "Upload a sgf" %}

{%endblock%} {% block content %}
- Back to admin + {% trans "Back to admin" %}
{%if sgf.league_valid %} {% endif %}
{%if sgf.league_valid %} -

Your sgf is valid !

-

Check details below and click save sgf to add it to the database

+

{% trans "Your sgf is valid!" %}

+

{% trans "Check details below and click save sgf to add it to the database." %}

{% else %} -

Your sgf didn't pass the test. Check details below.

+

{% trans "Your sgf didn't pass the test. Check details below." %}

{% endif %}
@@ -42,23 +42,23 @@

Your sgf didn't pass the test. Check details below.

Id Date WhiteBLackResult Type League valid?p_statusEdit {% trans "Date" %} {% trans "White" %}{% trans "Black" %}{% trans "Result" %} {% trans "Type" %} {% trans "League valid?" %}{% trans "p_status" %}{% trans "Edit" %}
- + - + - + - + - + diff --git a/league/templates/league/admin/user_send_mail.html b/league/templates/league/admin/user_send_mail.html index 19e2f71a..f9e81b67 100644 --- a/league/templates/league/admin/user_send_mail.html +++ b/league/templates/league/admin/user_send_mail.html @@ -1,9 +1,9 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} -{% block title %}OSR league admin - send mail{% endblock %} +{% load bootstrap3 league_tags i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Send mail" %}{% endblock %} {% block heading %}
-

Send an email to {{user}}

+

{% blocktrans with user=user %}Send an email to {{user}}{% endblocktrans %}

{%endblock%} {% block content %} diff --git a/league/templates/league/admin/users.html b/league/templates/league/admin/users.html index 62291d77..e93e73b4 100644 --- a/league/templates/league/admin/users.html +++ b/league/templates/league/admin/users.html @@ -1,15 +1,15 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags%} +{% load bootstrap3 league_tags %} {% load l10n i18n tz %} -{% block title %}OSR league admin - Users{% endblock %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Users" %}{% endblock %} {% block heading %}
{% if event is None %}

All OSR users

{% elif division is None %} -

All OSR users from {{event}}

+

{% blocktrans with event=event %}All OSR users from {{event}}{% endblocktrans %}

{% else %} -

All OSR users from {{event}} in {{division}}

+

{% blocktrans with event=event division=division %}All OSR users from {{event}} in {{division}}{% endblocktrans %}

{% endif %}
{%endblock%} @@ -24,12 +24,12 @@

All OSR users from {{event}} in {{division}}

White{% trans "White" %} {{sgf.wplayer}}
Black{% trans "Black" %} {{sgf.bplayer}}
Date{% trans "Date" %} {{sgf.date |date:"M d, Y"}}
Result{% trans "Result" %} {{sgf.result}}
Type{% trans "Type" %} {{sgf.game_type}}
- - - - - - + + + + + + {% for user in users %} diff --git a/league/templates/league/archive.html b/league/templates/league/archive.html index ecb4390e..0c7b1892 100644 --- a/league/templates/league/archive.html +++ b/league/templates/league/archive.html @@ -1,36 +1,38 @@ {% extends "league/base.html" %} {% load league_tags l10n i18n %} -{% block title %}OSR league - Archives{% endblock %} +{% block title %}{% trans "OSR league" %} - {% trans "Archives" %}{% endblock %} {% block content %} -
This table show all leagues (past and present) of the Open Study Room. Open leagues are green, primary leagues are higlighted.
+
{% blocktrans %}This table show all leagues (past and present) of the Open Study Room. Open leagues are green, primary leagues are higlighted.{% endblocktrans %}
{% localize off %} {% language 'en' %}
UserKGS usernameOGS usernameSend emailSet meijinDate joined{% trans "User" %}{% trans "KGS username" %}{% trans "OGS username" %}{% trans "Send email" %}{% trans "Set meijin" %}{% trans "Date joined" %}
- - - - - - - + {% comment %}Translators: Begin time is a date{% endcomment %} + + {% comment %}Translators: End time is a date{% endcomment %} + + + + + + {% for event in events %} diff --git a/league/templates/league/archives_games.html b/league/templates/league/archives_games.html index 4ce2f1c9..826cc44c 100644 --- a/league/templates/league/archives_games.html +++ b/league/templates/league/archives_games.html @@ -1,7 +1,7 @@ {% extends "league/base.html" %} {% load league_tags wgo_tags l10n i18n static %} -{% block title %}Archives - Games {% if sgf %}- {{sgf.black.username}} vs {{sgf.white.username}} {%endif %}{% endblock %} +{% block title %}{% trans "Archives" %} - {% trans "Games" %} {% if sgf %}- {{sgf.black.username}} vs {{sgf.white.username}} {%endif %}{% endblock %} {% block extra_head_js %} diff --git a/league/templates/league/includes/games_iframe.html b/league/templates/league/includes/games_iframe.html index 183699d1..46df4438 100644 --- a/league/templates/league/includes/games_iframe.html +++ b/league/templates/league/includes/games_iframe.html @@ -1,14 +1,14 @@ -{% load wagtailcore_tags league_tags%} +{% load wagtailcore_tags league_tags l10n i18n %} {# generate a table from a game queryset #} {# don't forget to add the extrajs when including this ! #}
Begin timeEnd timeNameType# Divisions# Players# games {% trans "Begin time" %}{% trans "End time" %}{% trans "Name" %}{% trans "Type" %}# {% trans "Divisions" %}# {% trans "Players" %}# {% trans "Games" %}
- - - - + + + + {% for game in games %} diff --git a/league/templates/league/includes/league.html b/league/templates/league/includes/league.html index a0c15d16..036e3fe4 100644 --- a/league/templates/league/includes/league.html +++ b/league/templates/league/includes/league.html @@ -1,3 +1,4 @@ +{% load l10n i18n %}
  • Overview
  • Results
    • @@ -7,9 +8,9 @@

    Infos

    -

    The {{event.name}} started on {{event.begin_time |date:"M d, Y" }} and {% if close %} stoped{% else %}will stop{%endif%} on {{event.end_time |date:"M d, Y" }}.

    -

    {{event.number_players}} players played {{event.number_games}} games in {{event.number_divisions}} divisions. That is {{event.percent_game_played}} % of {{event.possible_games}} possible games.

    +

    {% blocktrans with event_name=event.name event_begin=event.begin_time |date:"M d, Y" %}The {{event_name}} started on {{event_begin}} and {% endblocktrans %}{% if close %}{% trans "stopped" %}{% else %}{% trans "will stop" %}{%endif%} {% blocktrans with event_end=event.end_time |date:"M d, Y" %}on {{event_end}}.{% endblocktrans %}

    +

    {% blocktrans with event_number_players=event.number_players event_number_games=event.number_games event_number_divisions=event.number_divisions event_percent_game_played=event.percent_game_played event_possible_games=event.possible_games %}{{event_number_players}} players played {{event_number_games}} games in {{event_number_divisions}} divisions. That is {{event_percent_game_played}} % of {{event_possible_games}} possible games.{% endblocktrans %}

    {% if close %} -

    winners

    +

    {% trans "winners" %}

    {% endif %} diff --git a/league/templates/league/includes/no_profile_users_table.html b/league/templates/league/includes/no_profile_users_table.html index 1ac6263a..13d21b37 100644 --- a/league/templates/league/includes/no_profile_users_table.html +++ b/league/templates/league/includes/no_profile_users_table.html @@ -1,16 +1,16 @@ -{% load bootstrap3 community_tags %} +{% load bootstrap3 community_tags i18n %}
    -

    Users with no profiles

    +

    {% trans "Users with no profiles" %}

datewhiteblackresult{% trans "date" %}{% trans "white" %}{% trans "black" %}{% trans "result" %}
- - - - - + + + + + {% for u in no_profile_users %} diff --git a/league/templates/league/includes/results.html b/league/templates/league/includes/results.html index 10b94120..ad8a2f15 100644 --- a/league/templates/league/includes/results.html +++ b/league/templates/league/includes/results.html @@ -1,3 +1,4 @@ +{% load i18n %}
usernameemailCommunities interestDeleteCreate profile{% trans "username" %{% trans "email" %{% trans "Communities interest" %{% trans "Delete" %{% trans "Create profile" %
- - + + {% for player in players %} {% endfor %} diff --git a/league/templates/league/includes/results_ladder.html b/league/templates/league/includes/results_ladder.html index 1da06d5e..76a09af4 100644 --- a/league/templates/league/includes/results_ladder.html +++ b/league/templates/league/includes/results_ladder.html @@ -1,12 +1,12 @@ -{% load league_tags %} +{% load league_tags i18n %} {% get_meijin as meijin %}
player score{% trans "player" %} {% trans "score" %} {{ player.kgs_username }}
- - + + {% for player in results %}
playerscore{% trans "player" %}{% trans "score" %}
{{ player.user.username }}
diff --git a/league/templates/league/includes/results_league.html b/league/templates/league/includes/results_league.html index f51aff18..3436d4a5 100644 --- a/league/templates/league/includes/results_league.html +++ b/league/templates/league/includes/results_league.html @@ -1,17 +1,17 @@ -{% load league_tags %} +{% load league_tags i18n %} {% get_meijin as meijin %}
- - - - - - - + + + + + + + diff --git a/league/templates/league/includes/sgf_errors.html b/league/templates/league/includes/sgf_errors.html index a1ce327d..fecbab8c 100644 --- a/league/templates/league/includes/sgf_errors.html +++ b/league/templates/league/includes/sgf_errors.html @@ -1,9 +1,9 @@ -{% load league_tags%} +{% load league_tags i18n %} {% if sgf.league_valid %}
- This SGF is valid for those events: + {% trans "This SGF is valid for those events:" %}
rankplayerscorewinslossgamesResults{% trans "rank" %}{% trans "player" %}{% trans "score" %}{% trans "wins" %}{% trans "loss" %}{% trans "games" %}{% trans "results" %}
{% for event in valid_events %} @@ -14,7 +14,7 @@ {% else %}
- This SGF is valid for no events + {% trans "This SGF is valid for no events." %}
{% endif %} @@ -22,13 +22,13 @@
- Not valid events + {% trans "Not valid events." %}
{% for dict in errors %} {% if dict.errors %} {% if dict.league is None %} - + {% else %} {% endif %} diff --git a/league/templates/league/includes/user_infos.html b/league/templates/league/includes/user_infos.html index efbe6e07..5645b5cc 100644 --- a/league/templates/league/includes/user_infos.html +++ b/league/templates/league/includes/user_infos.html @@ -10,14 +10,14 @@ {% endif %} {% if user.profile.kgs_username %} -

KGS Username: +

{% trans "KGS Username:" %} {{user.profile.kgs_username}} {% if user.profile.kgs_rank %}({{user.profile.kgs_rank}}){% endif %}

{% endif %} {% if user.profile.ogs_id > 0 %} -

OGS Username: +

{% trans "OGS Username:" %} {{user.profile.ogs_username}} {% if user.profile.ogs_rank %}({{user.profile.ogs_rank}}){% endif %} @@ -25,11 +25,11 @@ {% endif %} {% if user.profile.go_quest_username %} -

Go Quest Username: {{user.profile.go_quest_username}}

+

{% trans "Go Quest Username:" %} {{user.profile.go_quest_username}}

{% endif %} {% if discord_user %} -

Discord username : +

{% trans "Discord username:" %} {% if discord_user.avatar %} {% endif %} @@ -39,7 +39,7 @@ {% endif %}

{% elif request.user == user %} -

Click this button to link your discord account with your OSR account: {% bootstrap_icon "user"%} +

{% trans "Click this button to link your discord account with your OSR account:" %} {% bootstrap_icon "user"%} {% endif %} {% if user.profile.egf_id %} diff --git a/league/templates/league/includes/user_infos_member.html b/league/templates/league/includes/user_infos_member.html index ae4069f4..ce5f080b 100644 --- a/league/templates/league/includes/user_infos_member.html +++ b/league/templates/league/includes/user_infos_member.html @@ -9,13 +9,13 @@

{{user.profile.bio|safe|rendered}}

{% endif %} {% if user.profile.kgs_username %} -

KGS Username: +

{% trans "KGS Username:" %} {{user.profile.kgs_username}} {% if user.profile.kgs_rank %}({{user.profile.kgs_rank}}){% endif %}

{% endif %} {% if user.profile.ogs_id > 0 %} -

OGS Username: +

{% trans "OGS Username:" %} {{user.profile.ogs_username}} {% if user.profile.ogs_rank %}({{user.profile.ogs_rank}}){% endif %} @@ -23,7 +23,7 @@ {% endif %} {% if discord_user %} -

Discord username : +

{% trans "Discord username:" %} {% if discord_user.avatar %} {% endif %} @@ -33,7 +33,7 @@ {% endif %}

{% elif request.user == user %} -

Click this button to link your discord account with your OSR account: {% bootstrap_icon "user"%} +

{% trans "Click this button to link your discord account with your OSR account:" %} {% bootstrap_icon "user"%} {% endif %} @@ -42,7 +42,7 @@ {% if user != request.user %} -

Your results against {{user.username}}.

+

{% blocktrans with username=user.username %}Your results against {{username}}.{% endblocktrans %}

{% if sgfs_links %} @@ -68,7 +68,7 @@

Your results against {{user.username}}.

{% else %} -
You didn't play any games against each other yet.
+
{% trans "You didn't play any games against each other yet." %}
{% endif %} {% endif %} diff --git a/league/templates/league/includes/user_nav.html b/league/templates/league/includes/user_nav.html index 5a89e03e..af89b646 100644 --- a/league/templates/league/includes/user_nav.html +++ b/league/templates/league/includes/user_nav.html @@ -3,7 +3,7 @@ {% if request.user.is_authenticated %} {% if user == request.user%} @@ -23,16 +23,16 @@ {% else %} {% endif %} {% endif %} diff --git a/league/templates/league/includes/vs.html b/league/templates/league/includes/vs.html index 24260ed6..bdd3097c 100644 --- a/league/templates/league/includes/vs.html +++ b/league/templates/league/includes/vs.html @@ -2,7 +2,7 @@ {% if user != request.user %} -

Your results against {{user.username}}.

+

{% blocktrans with username=user.username %}Your results against {{username}}.{% endblocktrans %}

{% if sgfs_links %} @@ -28,7 +28,7 @@

Your results against {{user.username}}.

{% else %} -
You didn't play any games against each other yet.
+
{% trans "You didn't play any games against each other yet." %}
{% endif %} {% endif %} diff --git a/league/templates/league/leagueevent_create_form.html b/league/templates/league/leagueevent_create_form.html index 4c420434..3c79444e 100644 --- a/league/templates/league/leagueevent_create_form.html +++ b/league/templates/league/leagueevent_create_form.html @@ -1,13 +1,13 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags tz%} -{% block title %}OSR league admin - Create new Event{% endblock %} +{% load bootstrap3 league_tags tz i18n %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Create new event" %}{% endblock %} {% block heading %}

{% if copy_from%} - Copy {{copy_from}} league + {% blocktrans with league_copy_from=copy_from %}Copy {{league_copy_from}} league{% endblocktrans %} {% else %} - Create new Event + {% trans "Create new event" %} {% endif %}

@@ -17,9 +17,9 @@

{% if copy_from%} - Copy {{copy_from}} league + {% blocktrans with league_copy_from=copy_from %}Copy {{league_copy_from}} league{% endblocktrans %} {% else %} - Create new League + {% trans "Create new league" %} {% endif %} {% include 'league/includes/admin_league_form.html' %} diff --git a/league/templates/league/leagueevent_update_form.html b/league/templates/league/leagueevent_update_form.html index 47712574..77c1bee0 100644 --- a/league/templates/league/leagueevent_update_form.html +++ b/league/templates/league/leagueevent_update_form.html @@ -1,12 +1,12 @@ {% extends 'league/admin/base.html' %} -{% load bootstrap3 league_tags i18n l10n tz%} +{% load bootstrap3 league_tags i18n l10n tz %} -{% block title %}OSR league admin - Leagues{% endblock %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Leagues" %}{% endblock %} {% block heading %}
-

Edit League "{{ object.name }}"

+

{% trans "Edit league" %} "{{ object.name }}"

{%endblock%} {% block content %} @@ -18,18 +18,18 @@

Edit League "{{ object.name }}"

{% if object.number_players == 0 and object.number_divisions > 0%}
-

Populate empty event

+

{% trans "Populate empty event" %}

- This event has no player in it. You can populate it easily from a previous event : + {% trans "This event has no player in it. You can populate it easily from a previous event:" %}"
- + {% endif %}
{% csrf_token %} {% include 'league/includes/admin_league_form.html' %} diff --git a/league/templates/league/players.html b/league/templates/league/players.html index b24489a0..b50f80b7 100644 --- a/league/templates/league/players.html +++ b/league/templates/league/players.html @@ -33,7 +33,7 @@ {% include 'league/includes/league_nav.html' with active='players' %}
- {% trans "This table show all users who" %} {% if not event.is_open %}{% trans "played" %}{% else %} {% trans "play" %}{% endif %} {% trans "in the" %} {{event.name}}. + {% trans "This table show all users who" %} {% if not event.is_open %}{% trans "played" %}{% else %}{% trans "play" %}{% endif %} {% blocktrans with event_name=event.name %}in the {{event_name}}{% endblocktrans %}.
diff --git a/league/templates/league/profile.html b/league/templates/league/profile.html index 4c9511ad..b042a216 100644 --- a/league/templates/league/profile.html +++ b/league/templates/league/profile.html @@ -1,12 +1,12 @@ {% extends "board_base.html" %} -{% load i18n bootstrap3%} +{% load i18n bootstrap3 %} {% block sub_title %}{% trans "Edit forum profile" %}{% endblock sub_title %} {% block breadcrumb %}{%endblock%} {% block heading %}
-

{{user.username}} profile

+

{% blocktrans with username=user.username %}{{username}} profile{% endblocktrans %}

{%endblock%} diff --git a/league/templates/league/profile_update.html b/league/templates/league/profile_update.html index 4dceae7c..4453c81b 100644 --- a/league/templates/league/profile_update.html +++ b/league/templates/league/profile_update.html @@ -1,12 +1,12 @@ {% extends 'full_width.html' %} -{% load bootstrap3 league_tags%} +{% load bootstrap3 league_tags i18n %} -{% block title %}OSR league admin - Leagues{% endblock %} +{% block title %}{% trans "OSR league admin" %} - {% trans "Leagues" %}{% endblock %} {% block heading %}
-

Edit your profile

+

{% trans "Edit your profile" %}

{%endblock%} {% block content %} @@ -22,7 +22,7 @@

Edit your profile

-Please make sure all the league games you have played so far are on the results before changing your KGS or OGS usernames. +{% trans "Please make sure all the league games you have played so far are on the results before changing your KGS or OGS usernames." %}
{%bootstrap_field form.ogs_username %} {%bootstrap_field form.kgs_username %} diff --git a/league/templates/league/random_game.html b/league/templates/league/random_game.html index 9f72054b..41429ad3 100644 --- a/league/templates/league/random_game.html +++ b/league/templates/league/random_game.html @@ -1,6 +1,6 @@ {% extends 'full_width.html' %} -{% load bootstrap3 league_tags tz static%} -{% block title %}OSR league - random game{% endblock %} +{% load bootstrap3 league_tags tz static l10n i18n %} +{% block title %}{% trans "OSR league" %} - {% trans "Random game" %}{% endblock %} {% block extra_head_js%} @@ -11,7 +11,7 @@ {% block heading %}

- Random game + {% trans "Random game" %}

{% endblock %} @@ -34,7 +34,7 @@

{% if sgf %}
- {{sgf.white | user_link:meijin}} vs {{sgf.black | user_link:meijin}} on {{sgf.date}} link + {% blocktrans with sgf_white=sgf.white | user_link:meijin sgf_black=sgf.black | user_link:meijin sgf_date=sgf.date %}{{sgf_white}} vs {{sgf_black}} on {{sgf_date}} {% endblocktrans %} link
{% endif %} {% endblock %} diff --git a/league/templates/league/results.html b/league/templates/league/results.html index 5a3a1663..e282ef17 100644 --- a/league/templates/league/results.html +++ b/league/templates/league/results.html @@ -1,6 +1,6 @@ {% extends "league/base.html" %} {% load tz static league_tags bootstrap3 i18n forum_markup_tags osr_tags %} -{% block title %}{{event}}- {% trans "results" %}{% endblock %} +{% block title %}{{event}} - {% trans "Results" %}{% endblock %} {% block content %} @@ -61,15 +61,15 @@

{% if can_edit_division_infos or admin %} - + {% endif %} {% if admin %} - + - + {% endif %}

@@ -79,7 +79,7 @@
{{division.informations|safe|rendered}}
{% endif %} {% if not event.community %} -

OSR is made possible thanks to the support from friends and partners

+

{% trans "OSR is made possible thanks to the support from friends and partners" %}

{% sponsors %} {% endif %} {% endblock %} diff --git a/league/templates/league/results_iframe.html b/league/templates/league/results_iframe.html index 99a81223..ca9bc8ef 100644 --- a/league/templates/league/results_iframe.html +++ b/league/templates/league/results_iframe.html @@ -68,12 +68,12 @@

- - - - - - + + + + + + @@ -106,8 +106,8 @@ - - + + {% for player in results %} {% endfor %} diff --git a/league/templates/league/timezone_update.html b/league/templates/league/timezone_update.html index 10dac3b1..51a438d0 100644 --- a/league/templates/league/timezone_update.html +++ b/league/templates/league/timezone_update.html @@ -1,7 +1,6 @@ {% extends "full_width.html" %} - -{% load bootstrap3 static calendar_tags %} -{% block title %} My profile - Timezone{% endblock %} +{% load bootstrap3 static calendar_tags i18n %} +{% block title %} {% trans "My profile" %} - {% trans "Timezone" %}{% endblock %} {% block extra_css %} @@ -9,7 +8,7 @@ {% block heading %}
-

My profile - Timezone

+

{% trans "My profile" %} - {% trans "Timezone" %}

{%endblock%} {% block content %} @@ -19,20 +18,21 @@

My profile - Timezone

-According to your setting your local time should be {{now}}. +{% trans "According to your setting your local time should be" %} {{now}}.

- Setting a timezone for your profile will allow our website to adapt the time to your local timezone everywhere: forum, messages, events... + {% trans "Setting a timezone for your profile will allow our website to adapt the time to your local timezone everywhere: forum, messages, events..." %}

- If no timezone is set, we show times in UTC. + {% comment %}Translators : If no timezone is set, we show times in ... UTC{% endcomment %} + {% trans "If no timezone is set, we show times in" %} UTC.

{% bootstrap_form form %}
From 86197bc54307e5dec96a4c2600d4643cdfc06edd Mon Sep 17 00:00:00 2001 From: clubdego974 Date: Tue, 15 Aug 2023 08:13:13 +0400 Subject: [PATCH 6/9] Translation tags in "openstudyroom\templates" --- openstudyroom/templates/404.html | 6 +++--- openstudyroom/templates/500.html | 7 ++++--- openstudyroom/templates/account/login.html | 8 ++++---- openstudyroom/templates/account/logout.html | 8 ++++---- .../templates/account/password_change.html | 10 +++++----- .../templates/account/password_reset.html | 8 ++++---- .../templates/account/password_reset_done.html | 8 ++++---- .../account/password_reset_from_key.html | 2 +- .../account/password_reset_from_key_done.html | 7 ++++--- .../templates/account/signup_closed.html | 6 +++--- .../templates/account/verification_sent.html | 14 +++++++------- openstudyroom/templates/base.html | 2 +- openstudyroom/templates/board_base.html | 2 +- openstudyroom/templates/menu.html | 18 +++++++++--------- openstudyroom/templates/sidebar.html | 2 +- 15 files changed, 55 insertions(+), 53 deletions(-) diff --git a/openstudyroom/templates/404.html b/openstudyroom/templates/404.html index 07086319..08bc7c20 100644 --- a/openstudyroom/templates/404.html +++ b/openstudyroom/templates/404.html @@ -1,9 +1,9 @@ {% extends "full_width.html" %} - +{% load i18n %} {% block body_class %}template-404{% endblock %} {% block content %} -

Page not found

+

{% trans "Page not found" %}

-

Sorry, this page could not be found.

+

{% trans "Sorry, this page could not be found." %}

{% endblock %} diff --git a/openstudyroom/templates/500.html b/openstudyroom/templates/500.html index 2a5be4cb..c72cf56a 100644 --- a/openstudyroom/templates/500.html +++ b/openstudyroom/templates/500.html @@ -1,3 +1,4 @@ +{% load i18n %} @@ -6,12 +7,12 @@ - Internal server error + {% trans "Internal server error" %} -

Internal server error

+

{% trans "Internal server error" %}

-

Sorry, there seems to be an error. Please try again soon.

+

{% trans "Sorry, there seems to be an error. Please try again soon." %}

diff --git a/openstudyroom/templates/account/login.html b/openstudyroom/templates/account/login.html index e513e68e..c438cba6 100644 --- a/openstudyroom/templates/account/login.html +++ b/openstudyroom/templates/account/login.html @@ -2,11 +2,11 @@ {% load account %} -{% load bootstrap3 %} -{% block title %}Log in {% endblock %} +{% load bootstrap3 i18n %} +{% block title %}{% trans "Log in" %} {% endblock %} {% block heading %}
-

Log in to an existing account

+

{% trans "Log in to an existing account" %}

{% endblock %} @@ -20,7 +20,7 @@

Log in to an existing account

{% endif %} - Forgot your password? + {% trans "Forgot your password?" %}
diff --git a/openstudyroom/templates/account/logout.html b/openstudyroom/templates/account/logout.html index 7dafd52e..ea76d764 100644 --- a/openstudyroom/templates/account/logout.html +++ b/openstudyroom/templates/account/logout.html @@ -1,10 +1,10 @@ {% extends "full_width.html" %} -{% load bootstrap3 %} +{% load bootstrap3 i18n %} {% block heading %}
-

Log out

+

{% trans "Log out" %}

{% endblock %} {% block content %} @@ -13,8 +13,8 @@

Log out

{% csrf_token %} -

Are you sure you want to log out?

- +

{% trans "Are you sure you want to log out?" ?}

+
diff --git a/openstudyroom/templates/account/password_change.html b/openstudyroom/templates/account/password_change.html index eb975a34..9582c56f 100644 --- a/openstudyroom/templates/account/password_change.html +++ b/openstudyroom/templates/account/password_change.html @@ -1,14 +1,14 @@ {% extends "full_width.html" %} -{% load bootstrap3 %} +{% load bootstrap3 i18n %} {% block body_class %}account account-password{% endblock %} -{% block title %} Change password{% endblock %} +{% block title %} {% trans "Change password" %}{% endblock %} {% block heading %}
-

{{user.username}} profile

+

{% trans "{% blocktrans with user_username=user.username %}{{user_username}} profile{% endblocktrans %}

{%endblock%} {% block content %} @@ -19,11 +19,11 @@

{{user.username}} profile

- Change password + {% trans "Change password" %}
{% csrf_token %} {% bootstrap_form form %} - +
diff --git a/openstudyroom/templates/account/password_reset.html b/openstudyroom/templates/account/password_reset.html index ef416913..e1720375 100644 --- a/openstudyroom/templates/account/password_reset.html +++ b/openstudyroom/templates/account/password_reset.html @@ -5,10 +5,10 @@ {% load account %} {% user_display request.user as user_display %} -{% block title %}Reset your password{% endblock %} +{% block title %}{% trans "Reset your password" %}{% endblock %} {% block heading %}
-

Reset your password

+

{% trans "Reset your password" %}

{%endblock%} {% block content %} @@ -16,14 +16,14 @@

Reset your password

-

Forgotten your password? Enter your email address below, and we'll send you an email allowing you to reset it.

+

{% trans "Forgotten your password? Enter your email address below, and we'll send you an email allowing you to reset it." %}

{% csrf_token %} {% bootstrap_form form %}
diff --git a/openstudyroom/templates/account/password_reset_done.html b/openstudyroom/templates/account/password_reset_done.html index f08297a3..6e6a06a8 100644 --- a/openstudyroom/templates/account/password_reset_done.html +++ b/openstudyroom/templates/account/password_reset_done.html @@ -1,14 +1,14 @@ {% extends "full_width.html" %} -{% load account %} -{% block title %}Password reset email sent{% endblock %} +{% load account i18n %} +{% block title %}{% trans "Password reset email sent" %}{% endblock %} {% block heading %}
-

Password reset email sent

+

{% trans "Password reset email sent" %}

{%endblock%} {% block content %} -

We have sent you an email. If you do not receive it within a few minutes, you should contact us.

+

{% trans "We have sent you an email. If you do not receive it within a few minutes, you should contact us." %}

{% if user.is_authenticated %} {% include "account/snippets/already_logged_in.html" %} diff --git a/openstudyroom/templates/account/password_reset_from_key.html b/openstudyroom/templates/account/password_reset_from_key.html index 21a0143f..c82a5075 100644 --- a/openstudyroom/templates/account/password_reset_from_key.html +++ b/openstudyroom/templates/account/password_reset_from_key.html @@ -3,7 +3,7 @@ {% load bootstrap3 %} {% load i18n %} -{% block title %}{% if token_fail %}Bad token{% else %}{% trans "Change Password" %}{% endif %}{% endblock %} +{% block title %}{% if token_fail %}{% trans "Bad token" %}{% else %}{% trans "Change Password" %}{% endif %}{% endblock %} {% block heading %}

{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}

diff --git a/openstudyroom/templates/account/password_reset_from_key_done.html b/openstudyroom/templates/account/password_reset_from_key_done.html index d0a44a8e..262be289 100644 --- a/openstudyroom/templates/account/password_reset_from_key_done.html +++ b/openstudyroom/templates/account/password_reset_from_key_done.html @@ -3,13 +3,14 @@ {% load bootstrap3 %} {% load i18n %} -{% block title %}Password Changed{% endblock %} +{% block title %}{% trans "Password Changed" %}{% endblock %} {% block heading %}
-

Password changed

+ {% comment %}Translators : after a change password{% endcomment %} +

{% trans "Password changed" %}

{%endblock%} {% block content %} -

Your password is now changed. Feel free to Login

+

{% blocktrans %}Your password is now changed. Feel free to Login{% endblocktrans %}

{% endblock %} diff --git a/openstudyroom/templates/account/signup_closed.html b/openstudyroom/templates/account/signup_closed.html index c39230aa..bc0c036e 100644 --- a/openstudyroom/templates/account/signup_closed.html +++ b/openstudyroom/templates/account/signup_closed.html @@ -1,10 +1,10 @@ {% extends "full_width.html" %} - +{% load i18n %} {% block content %} -

This site is in private beta

-

If you have signup code you can enter it below.

+

{% trans "This site is in private beta" %}

+

{% trans "If you have signup code you can enter it below." %}

diff --git a/openstudyroom/templates/account/verification_sent.html b/openstudyroom/templates/account/verification_sent.html index 7b72a177..c6ea38ea 100644 --- a/openstudyroom/templates/account/verification_sent.html +++ b/openstudyroom/templates/account/verification_sent.html @@ -2,19 +2,19 @@ {% load i18n %} -{% block title %}Welcome{% endblock %} +{% block title %}{% trans "Welcome" %}{% endblock %} {% block content %} -

Welcome to the Open Study Room!

+

{% trans "Welcome to the Open Study Room!" %}

-

Your adventure now begins, as you just joined a young and enthusiastic online community dedicated to playing, studying and teaching Go.

-

Very soon, our team will add you as an OSR member. Then you will have your own profile page, you'll be able to play league games and use our forum. Make sure to verify your e-mail and check that you have either a valid KGS or OGS account. These two criteria are mandatory in order to join the OSR.

+

{% trans "Your adventure now begins, as you just joined a young and enthusiastic online community dedicated to playing, studying and teaching Go." %}

+

{% trans "Very soon, our team will add you as an OSR member. Then you will have your own profile page, you'll be able to play league games and use our forum. Make sure to verify your e-mail and check that you have either a valid KGS or OGS account. These two criteria are mandatory in order to join the OSR." %}

-

In the meantime, you might want to check out our FAQ to be sure you got a good grasp of what the OSR is about.

+

{% blocktrans %}In the meantime, you might want to check out our FAQ to be sure you got a good grasp of what the OSR is about.{% endblocktrans %}

-

You are also very welcome to meet us in our discord server, in the Open Study Room on KGS (Room list -> Social), and to join our OGS group.

+

{% blocktrans %}You are also very welcome to meet us in our discord server, in the Open Study Room on KGS (Room list -> Social), and to join our OGS group.{% endblocktrans %}

-

We have sent you an email to you for verification. Please follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at openstudyroom@gmail.com.

+

{% blocktrans %}We have sent you an email to you for verification. Please follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at openstudyroom@gmail.com.{% endblocktrans %}

{% endblock %} diff --git a/openstudyroom/templates/base.html b/openstudyroom/templates/base.html index d875a1ed..62023ea0 100644 --- a/openstudyroom/templates/base.html +++ b/openstudyroom/templates/base.html @@ -76,7 +76,7 @@ {% if request.user.is_authenticated and not request.user.is_league_member%}
  • × - Your account will be activated soon. Be sure you verify your email and you entered a valid KGS or OGS username. Contact us if it takes too long. Thanks for waiting ! + {% trans "Your account will be activated soon. Be sure you verify your email and you entered a valid KGS or OGS username. Contact us if it takes too long. Thanks for waiting !" %}
    • {% endif %}
    diff --git a/openstudyroom/templates/board_base.html b/openstudyroom/templates/board_base.html index c9450b0b..29a8b643 100644 --- a/openstudyroom/templates/board_base.html +++ b/openstudyroom/templates/board_base.html @@ -1,6 +1,6 @@ {% extends MACHINA_BASE_TEMPLATE_NAME %} {% load static %} -{% load i18n tz calendar_tags%} +{% load i18n tz calendar_tags %} {% load forum_permission_tags %} {% block title %}{{ MACHINA_FORUM_NAME|default:"Forum" }} — {% block sub_title %}{% endblock sub_title %}{% endblock title %} diff --git a/openstudyroom/templates/menu.html b/openstudyroom/templates/menu.html index 2fa63b57..6eb8f0c6 100644 --- a/openstudyroom/templates/menu.html +++ b/openstudyroom/templates/menu.html @@ -1,4 +1,4 @@ -{% load menu_tags osr_tags bootstrap3%} +{% load menu_tags osr_tags bootstrap3 i18n %}
    Global errors
    {% trans "Global errors" %}
    {{ dict.league |event_link}}
    playerscorewinslossgamesResults{% trans "player" %}{% trans "score" %}{% trans "wins" %}{% trans "loss" %}{% trans "games" %}{% trans "results" %}
    playerscore{% trans "player" %}{% trans "score" %}
    {{player.user}}