diff --git a/accounting/migrations/0011_auto_20160718_1805.py b/accounting/migrations/0011_auto_20160718_1805.py
new file mode 100644
index 00000000..5c8e9ea8
--- /dev/null
+++ b/accounting/migrations/0011_auto_20160718_1805.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('accounting', '0010_remove_operation_type'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='operation',
+ name='mode',
+ field=models.CharField(max_length=255, verbose_name='payment method', choices=[('cheque', 'Check'), ('cash', 'Cash'), ('transfert', 'Transfert'), ('card', 'Credit card')]),
+ ),
+ ]
diff --git a/accounting/templates/accounting/accountingtype_list.jinja b/accounting/templates/accounting/accountingtype_list.jinja
index 0961289a..6c84529d 100644
--- a/accounting/templates/accounting/accountingtype_list.jinja
+++ b/accounting/templates/accounting/accountingtype_list.jinja
@@ -1,23 +1,20 @@
{% extends "core/base.jinja" %}
{% block title %}
- Accounting type list
+{% trans %}Accounting type list{% endtrans %}
{% endblock %}
{% block content %}
-
New accounting type
+ {% trans %}New accounting type{% endtrans %}
{% if accountingtype_list %}
- Accounting type list
-
- {% for a in accountingtype_list %}
- {{ a }}
- {% endfor %}
-
+ {% trans %}Accounting type list{% endtrans %}
+
+ {% for a in accountingtype_list %}
+ {{ a }}
+ {% endfor %}
+
{% else %}
- There is no types in this website.
+ {% trans %}There is no types in this website.{% endtrans %}
{% endif %}
{% endblock %}
-
-
-
diff --git a/accounting/templates/accounting/bank_account_details.jinja b/accounting/templates/accounting/bank_account_details.jinja
index 93d20581..434d7ef1 100644
--- a/accounting/templates/accounting/bank_account_details.jinja
+++ b/accounting/templates/accounting/bank_account_details.jinja
@@ -1,22 +1,17 @@
{% extends "core/base.jinja" %}
{% block content %}
-
-Accounting >
-{{ object.name }}
-
- View account
-
- {% for k,v in object.__dict__.items() %}
- {{ k }} - {{ v }}
- {% endfor %}
-
- New club account
+
+ {% trans %}Accounting{% endtrans %} >
+ {{ object.name }}
+
+ {% trans %}View account{% endtrans %}
+ {% trans %}New club account{% endtrans %}
diff --git a/accounting/templates/accounting/bank_account_list.jinja b/accounting/templates/accounting/bank_account_list.jinja
index 1ef7eadc..dde74d66 100644
--- a/accounting/templates/accounting/bank_account_list.jinja
+++ b/accounting/templates/accounting/bank_account_list.jinja
@@ -1,23 +1,23 @@
{% extends "core/base.jinja" %}
{% block title %}
- Bank account list
+{% trans %}Bank account list{% endtrans %}
{% endblock %}
{% block content %}
- Manage accounting types
- New bank account
+ {% trans %}Manage accounting types{% endtrans %}
+ {% trans %}New bank account{% endtrans %}
{% if bankaccount_list %}
- Bank account list
+ {% trans %}Bank account list{% endtrans %}
{% else %}
- There is no accounts in this website.
+ {% trans %}There is no accounts in this website.{% endtrans %}
{% endif %}
{% endblock %}
diff --git a/accounting/templates/accounting/club_account_details.jinja b/accounting/templates/accounting/club_account_details.jinja
index ebc0757f..c2bd5f13 100644
--- a/accounting/templates/accounting/club_account_details.jinja
+++ b/accounting/templates/accounting/club_account_details.jinja
@@ -1,53 +1,49 @@
{% extends "core/base.jinja" %}
{% block content %}
-
-Accounting >
-{{object.bank_account }} >
-{{ object }}
-
View account: {{ object.name }}
+
+ {% trans %}Accounting{% endtrans %} >
+ {{object.bank_account }} >
+ {{ object }}
+
{% trans %}View account:{% endtrans %} {{ object.name }}
- {% for k,v in object.__dict__.items() %}
+ {% for k,v in object.__dict__.items() %}
{{ k }} - {{ v }}
- {% endfor %}
+ {% endfor %}
{% if not object.has_open_journal() %}
- New journal
+ {% trans %}New journal{% endtrans %}
{% else %}
- You can not create new journal while you still have one opened
+ {% trans %}You can not create new journal while you still have one opened{% endtrans %}
{% endif %}
- Name
- Start
- End
- Amount
- Effective amount
- Closed
+ {% trans %}Name{% endtrans %}
+ {% trans %}Start{% endtrans %}
+ {% trans %}End{% endtrans %}
+ {% trans %}Amount{% endtrans %}
+ {% trans %}Effective amount{% endtrans %}
+ {% trans %}Closed{% endtrans %}
- {% for j in object.journals.all() %}
-
- {{ j.name }}
- {{ j.start_date }}
- {% if j.end_date %}
+ {% for j in object.journals.all() %}
+
+ {{ j.name }}
+ {{ j.start_date }}
+ {% if j.end_date %}
{{ j.end_date }}
- {% else %}
+ {% else %}
-
- {% endif %}
- {{ j.amount }} €
- {{ j.effective_amount }} €
- {% if j.closed %}
- Yes
- {% else %}
- No
- {% endif %}
- View
- Edit
-
- {% endfor %}
+ {% endif %}
+ {{ j.amount }} €
+ {{ j.effective_amount }} €
+ {% if j.closed %}
+ {% trans %}Yes{% endtrans %}
+ {% else %}
+ {% trans %}No{% endtrans %}
+ {% endif %}
+ {% trans %}View{% endtrans %}
+ {% trans %}Edit{% endtrans %}
+
+ {% endfor %}
-
{% endblock %}
-
-
-
diff --git a/accounting/templates/accounting/journal_details.jinja b/accounting/templates/accounting/journal_details.jinja
index ed77b62a..d08be1b6 100644
--- a/accounting/templates/accounting/journal_details.jinja
+++ b/accounting/templates/accounting/journal_details.jinja
@@ -1,33 +1,34 @@
{% extends "core/base.jinja" %}
{% block content %}
-
-Accounting >
-{{object.club_account.bank_account }} >
-{{ object.club_account }} >
-{{ object.name }}
-
- Amount: {{ object.amount }} € - Effective amount: {{ object.effective_amount }} €
+
+ {% trans %}Accounting{% endtrans %} >
+ {{object.club_account.bank_account }} >
+ {{ object.club_account }} >
+ {{ object.name }}
+
+ {% trans %}Amount: {% endtrans %} {{ object.amount }} € -
+ {% trans %}Effective amount: {% endtrans %} {{ object.effective_amount }} €
{% if object.closed %}
- Journal is closed, you can not create operation
+ {% trans %}Journal is closed, you can not create operation{% endtrans %}
{% else %}
- New operation
+ {% trans %}New operation{% endtrans %}
{% endif %}
- Nb
- Date
- Label
- Amount
- Payment mode
+ {% trans %}Nb{% endtrans %}
+ {% trans %}Date{% endtrans %}
+ {% trans %}Label{% endtrans %}
+ {% trans %}Amount{% endtrans %}
+ {% trans %}Payment mode{% endtrans %}
- Code
- Nature
- Done
- Comment
- Actions
+ {% trans %}Code{% endtrans %}
+ {% trans %}Nature{% endtrans %}
+ {% trans %}Done{% endtrans %}
+ {% trans %}Comment{% endtrans %}
+ {% trans %}Actions{% endtrans %}
- {% for o in object.operations.all() %}
+ {% for o in object.operations.all() %}
{{ o.id }}
{{ o.date }}
@@ -37,21 +38,17 @@
{{ o.accounting_type.code }}
{{ o.accounting_type.label }}
{% if o.done %}
- Yes
+ {% trans %}Yes{% endtrans %}
{% else %}
- No
+ {% trans %}No{% endtrans %}
{% endif %}
{{ o.remark }}
{% if not o.journal.closed %}
- Edit
+ {% trans %}Edit{% endtrans %}
{% endif %}
- {% endfor %}
+ {% endfor %}
-
{% endblock %}
-
-
-
diff --git a/club/migrations/0003_auto_20160718_1819.py b/club/migrations/0003_auto_20160718_1819.py
new file mode 100644
index 00000000..1eb03e84
--- /dev/null
+++ b/club/migrations/0003_auto_20160718_1819.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('club', '0002_auto_20160718_1456'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='membership',
+ name='club',
+ field=models.ForeignKey(to='club.Club', verbose_name='club', related_name='members'),
+ ),
+ migrations.AlterField(
+ model_name='membership',
+ name='user',
+ field=models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='user', related_name='membership'),
+ ),
+ ]
diff --git a/club/models.py b/club/models.py
index 0152bb63..f0dd07d0 100644
--- a/club/models.py
+++ b/club/models.py
@@ -74,7 +74,7 @@ class Club(models.Model):
Method to see if that object can be edited by the given user
"""
ms = self.get_membership_for(user)
- if ms is not None and ms.role >= 7:
+ if ms is not None:
return True
return False
@@ -104,8 +104,8 @@ class Membership(models.Model):
A User is currently member of all the Clubs where its Membership has an end_date set to null/None.
Otherwise, it's a past membership kept because it can be very useful to see who was in which Club in the past.
"""
- user = models.ForeignKey(User, related_name="membership", null=False, blank=False)
- club = models.ForeignKey(Club, related_name="members", null=False, blank=False)
+ user = models.ForeignKey(User, verbose_name=_('user'), related_name="membership", null=False, blank=False)
+ club = models.ForeignKey(Club, verbose_name=_('club'), related_name="members", null=False, blank=False)
start_date = models.DateField(_('start date'), auto_now=True)
end_date = models.DateField(_('end date'), null=True, blank=True)
role = models.IntegerField(_('role'), choices=sorted(settings.SITH_CLUB_ROLES.items()),
diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja
index fc3b8927..c5814da5 100644
--- a/club/templates/club/club_detail.jinja
+++ b/club/templates/club/club_detail.jinja
@@ -1,17 +1,17 @@
{% extends "core/base.jinja" %}
{% block content %}
- Club
- Back to list
+ {% trans %}Club{% endtrans %}
+ {% trans %}Back to list{% endtrans %}
{% if can_edit(club, user) %}
- Edit
+ {% trans %}Edit{% endtrans %}
{% endif %}
{% if can_edit_prop(club, user) %}
- Prop
-
+ {% trans %}Prop{% endtrans %}
+
{% endif %}
{% if can_view(club, user) %}
- Members
+ {% trans %}Members{% endtrans %}
{% endif %}
{{ club.name }}
{{ club.address }}
diff --git a/club/templates/club/club_edit.jinja b/club/templates/club/club_edit.jinja
index a7dcdf31..aa43bb20 100644
--- a/club/templates/club/club_edit.jinja
+++ b/club/templates/club/club_edit.jinja
@@ -1,11 +1,11 @@
{% extends "core/base.jinja" %}
{% block content %}
- Edit club
+ {% trans %}Edit club{% endtrans %}
{% endblock %}
diff --git a/club/templates/club/club_edit_prop.jinja b/club/templates/club/club_edit_prop.jinja
index 400be64d..80605f89 100644
--- a/club/templates/club/club_edit_prop.jinja
+++ b/club/templates/club/club_edit_prop.jinja
@@ -1,11 +1,11 @@
{% extends "core/base.jinja" %}
{% block content %}
- Edit club properties
+ {% trans %}Edit club properties{% endtrans %}
{% endblock %}
diff --git a/club/templates/club/club_list.jinja b/club/templates/club/club_list.jinja
index 9cbe2d43..4c880558 100644
--- a/club/templates/club/club_list.jinja
+++ b/club/templates/club/club_list.jinja
@@ -1,7 +1,7 @@
{% extends "core/base.jinja" %}
{% block title %}
- Club list
+{% trans %}Club list{% endtrans %}
{% endblock %}
{% macro display_club(club) -%}
@@ -18,17 +18,17 @@
{% block content %}
{% if user.is_superuser or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
- New club
+ {% trans %}New club{% endtrans %}
{% endif %}
{% if club_list %}
- Club list
-
- {%- for c in club_list if c.parent is none %}
- {{ display_club(c) }}
- {%- endfor %}
-
+ {% trans %}Club list{% endtrans %}
+
+ {%- for c in club_list if c.parent is none %}
+ {{ display_club(c) }}
+ {%- endfor %}
+
{% else %}
- There is no club in this website.
+ {% trans %}There is no club in this website.{% endtrans %}
{% endif %}
{% endblock %}
diff --git a/club/templates/club/club_members.jinja b/club/templates/club/club_members.jinja
index 2788d934..d9c9de11 100644
--- a/club/templates/club/club_members.jinja
+++ b/club/templates/club/club_members.jinja
@@ -1,7 +1,7 @@
{% extends "core/base.jinja" %}
{% block content %}
- Club members
+ {% trans %}Club members{% endtrans %}
{% for m in club.members.all() %}
{{ m }}
@@ -10,7 +10,7 @@
{% endblock %}
diff --git a/club/templates/club/club_tools.jinja b/club/templates/club/club_tools.jinja
index dd92f7ba..514c91b1 100644
--- a/club/templates/club/club_tools.jinja
+++ b/club/templates/club/club_tools.jinja
@@ -1,25 +1,25 @@
{% extends "core/base.jinja" %}
{% block content %}
- Club tools
- Back to club
-
- {% if object.counters.all()|count > 0 %}
- Counters:
-
- {% for c in object.counters.all() %}
- {{ c }}:
- View
- Edit
-
- {% endfor %}
-
+{% trans %}Club tools{% endtrans %}
+Back to club
+
+ {% if object.counters.all()|count > 0 %}
+ {% trans %}Counters:{% endtrans %}
+
+ {% for c in object.counters.all() %}
+ {{ c }}:
+ View
+ Edit
- {% endif %}
- {% if object.club_account %}
- Accouting: {{ object }}
- {% endif %}
-
+ {% endfor %}
+
+
+ {% endif %}
+ {% if object.club_account %}
+ Accouting: {{ object }}
+ {% endif %}
+
{% endblock %}
diff --git a/club/views.py b/club/views.py
index cab47673..3648065a 100644
--- a/club/views.py
+++ b/club/views.py
@@ -25,7 +25,7 @@ class ClubView(CanViewMixin, DetailView):
pk_url_kwarg = "club_id"
template_name = 'club/club_detail.jinja'
-class ClubToolsView(CanViewMixin, DetailView):
+class ClubToolsView(CanEditMixin, DetailView):
"""
Tools page of a Club
"""
diff --git a/core/templates/core/403.jinja b/core/templates/core/403.jinja
index 5e83a7b7..ec2ca620 100644
--- a/core/templates/core/403.jinja
+++ b/core/templates/core/403.jinja
@@ -2,7 +2,7 @@
{% block content %}
-403, Forbidden
+{% trans %}403, Forbidden{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/404.jinja b/core/templates/core/404.jinja
index 35755bfd..71894b2d 100644
--- a/core/templates/core/404.jinja
+++ b/core/templates/core/404.jinja
@@ -2,7 +2,7 @@
{% block content %}
-404, Not Found
+{% trans %}404, Not Found{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 9e99bc1a..3de29009 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -1,52 +1,53 @@
-
- {% block head %}
- {% block title %}Bienvenue sur le Sith de l'AE!{% endblock %}
-
-
-
-
-
- {% endblock %}
-
-
-
-
- {% block header %}
-
- {% endblock %}
-
- Users
- Pages
- Clubs
-
-
-
- {% if error %}
- {{ error }}
- {% endif %}
- {% block content %}{% endblock %}
-
-
-
- {% block footer %}
- Site réalisé par des gens biens
+
+ {% block head %}
+ {% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %}
+
+
+
+
{% endblock %}
-
-
-
+
+
+
+
+ {% block header %}
+
+ {% endblock %}
+
+ {% trans %}Users{% endtrans %}
+ {% trans %}Pages{% endtrans %}
+ {% trans %}Clubs{% endtrans %}
+
+
+
+ {% if error %}
+ {{ error }}
+ {% endif %}
+ {% block content %}
+ {% endblock %}
+
+
+
+ {% block footer %}
+ {% trans %}Site made by good people{% endtrans %}
+ {% endblock %}
+
+
+
diff --git a/core/templates/core/create.jinja b/core/templates/core/create.jinja
index 611f93ed..b175ede7 100644
--- a/core/templates/core/create.jinja
+++ b/core/templates/core/create.jinja
@@ -1,12 +1,12 @@
{% extends "core/base.jinja" %}
{% block content %}
- Create
-
+{% trans %}Create{% endtrans %}
+
{% endblock %}
diff --git a/core/templates/core/delete_confirm.jinja b/core/templates/core/delete_confirm.jinja
index 79b6d08d..9d0bee4c 100644
--- a/core/templates/core/delete_confirm.jinja
+++ b/core/templates/core/delete_confirm.jinja
@@ -1,12 +1,12 @@
{% extends "core/base.jinja" %}
{% block content %}
- Delete confirmation
-
+{% trans %}Delete confirmation{% endtrans %}
+
{% endblock %}
diff --git a/core/templates/core/edit.jinja b/core/templates/core/edit.jinja
index b44cdbbd..2c9c06c0 100644
--- a/core/templates/core/edit.jinja
+++ b/core/templates/core/edit.jinja
@@ -1,12 +1,12 @@
{% extends "core/base.jinja" %}
{% block content %}
- Edit {{ object }}
-
+{% trans obj=object %}Edit {{ obj }}{% endtrans %}
+
{% endblock %}
diff --git a/core/templates/core/group_edit.jinja b/core/templates/core/group_edit.jinja
index 257021f8..44ad2d1c 100644
--- a/core/templates/core/group_edit.jinja
+++ b/core/templates/core/group_edit.jinja
@@ -1,13 +1,13 @@
{% extends "core/base.jinja" %}
{% block content %}
-Back to list
- Edit group
-
+{% trans %}Back to list{% endtrans %}
+{% trans %}Edit group{% endtrans %}
+
{% endblock %}
diff --git a/core/templates/core/group_list.jinja b/core/templates/core/group_list.jinja
index 12e5b7d9..79bb5de4 100644
--- a/core/templates/core/group_list.jinja
+++ b/core/templates/core/group_list.jinja
@@ -1,16 +1,16 @@
{% extends "core/base.jinja" %}
{% block title %}
-Group list
+{% trans %}Group list{% endtrans %}
{% endblock %}
{% block content %}
-Group list
-New group
+{% trans %}Group list{% endtrans %}
+{% trans %}New group{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/index.jinja b/core/templates/core/index.jinja
index aa25fa80..880bdc44 100644
--- a/core/templates/core/index.jinja
+++ b/core/templates/core/index.jinja
@@ -3,5 +3,5 @@
{% block title %}{{ title }}{% endblock %}
{% block content %}
-Hello, world. You're at the core index using Jinja2.
+{% trans %}Hello, world. You're at the core index using Jinja2.{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/login.jinja b/core/templates/core/login.jinja
index 38407356..68397ae5 100644
--- a/core/templates/core/login.jinja
+++ b/core/templates/core/login.jinja
@@ -3,15 +3,15 @@
{% block content %}
{% if form.errors %}
-Your username and password didn't match. Please try again.
+{% trans %}Your username and password didn't match. Please try again.{% endtrans %}
{% endif %}
{% if next %}
{% if user.is_authenticated() %}
- Your account doesn't have access to this page. To proceed,
- please login with an account that has access.
+ {% trans %}Your account doesn't have access to this page. To proceed,
+ please login with an account that has access.{% endtrans %}
{% else %}
- Please login to see this page.
+ {% trans %}Please login to see this page.{% endtrans %}
{% endif %}
{% endif %}
@@ -28,11 +28,11 @@
-
+
{# Assumes you setup the password_reset view in your URLconf #}
-Lost password?
+{% trans %}Lost password?{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/page.jinja b/core/templates/core/page.jinja
index ac3021eb..70ebb636 100644
--- a/core/templates/core/page.jinja
+++ b/core/templates/core/page.jinja
@@ -1,23 +1,24 @@
{% extends "core/base.jinja" %}
{% block title %}
- {% if page %}
- {{ page.get_display_name() }}
- {% elif page_list %}
- Page list
- {% elif new_page %}
- Create page
- {% else %}
- Not found
- {% endif %}
+{% if page %}
+{{ page.get_display_name() }}
+{% elif page_list %}
+{% trans %}Page list{% endtrans %}
+{% elif new_page %}
+{% trans %}Create page{% endtrans %}
+{% else %}
+{% trans %}Not found{% endtrans %}
+{% endif %}
{% endblock %}
{% block content %}
- {% if page %}
- {% block page %}
- {% endblock %}
- {% else %}
- Page does not exist
- Create it?
- {% endif %}
+{% if page %}
+{% block page %}
+{% endblock %}
+{% else %}
+{% trans %}Page does not exist{% endtrans %}
+
+ {% trans %}Create it?{% endtrans %}
+{% endif %}
{% endblock %}
diff --git a/core/templates/core/page_detail.jinja b/core/templates/core/page_detail.jinja
index 5c3bb3d2..6d7dd638 100644
--- a/core/templates/core/page_detail.jinja
+++ b/core/templates/core/page_detail.jinja
@@ -1,25 +1,25 @@
{% extends "core/page.jinja" %}
{% block page %}
- Page
- Back to list
- {% if can_edit(page, user) %}
- Edit
- {% endif %}
- {% if can_edit_prop(page, user) %}
- Prop
- {% endif %}
- You're seeing the page {{ page.get_display_name() }} -
- History
-
- {% if rev %}
- This may not be the last update, you are seeing revision {{ rev.id }}!
- {{ rev.title }}
- {{ rev.content|markdown }}
- {% else %}
- {{ page.revisions.last().title }}
- {{ page.revisions.last().content|markdown }}
- {% endif %}
+{% trans %}Page{% endtrans %}
+{% trans %}Back to list{% endtrans %}
+{% if can_edit(page, user) %}
+{% trans %}Edit{% endtrans %}
+{% endif %}
+{% if can_edit_prop(page, user) %}
+{% trans %}Prop{% endtrans %}
+{% endif %}
+{% trans page_name=page.get_display_name() %}You're seeing the page {{ page_name }}{% endtrans %} -
+{% trans %}History{% endtrans %}
+
+{% if rev %}
+{% trans rev_id=rev.id %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}
+{{ rev.title }}
+{{ rev.content|markdown }}
+{% else %}
+{{ page.revisions.last().title }}
+{{ page.revisions.last().content|markdown }}
+{% endif %}
{% endblock %}
diff --git a/core/templates/core/page_hist.jinja b/core/templates/core/page_hist.jinja
index 6401da6e..529ec70d 100644
--- a/core/templates/core/page_hist.jinja
+++ b/core/templates/core/page_hist.jinja
@@ -1,17 +1,17 @@
{% extends "core/page.jinja" %}
{% block page %}
- Page history
- Back to page
- You're seeing the history of page {{ page.get_display_name() }}
-
{% endblock %}
diff --git a/core/templates/core/page_list.jinja b/core/templates/core/page_list.jinja
index 7862ffa0..0e382ecb 100644
--- a/core/templates/core/page_list.jinja
+++ b/core/templates/core/page_list.jinja
@@ -1,20 +1,20 @@
{% extends "core/base.jinja" %}
{% block title %}
- Page list
+{% trans %}Page list{% endtrans %}
{% endblock %}
{% block content %}
- {% if page_list %}
- Page list
-
- {% else %}
- There is no page in this website.
- {% endif %}
+{% if page_list %}
+{% trans %}Page list{% endtrans %}
+
+{% else %}
+{% trans %}There is no page in this website.{% endtrans %}
+{% endif %}
{% endblock %}
diff --git a/core/templates/core/page_prop.jinja b/core/templates/core/page_prop.jinja
index 302b1e67..9f144cbb 100644
--- a/core/templates/core/page_prop.jinja
+++ b/core/templates/core/page_prop.jinja
@@ -1,12 +1,12 @@
{% extends "core/page.jinja" %}
{% block content %}
- Page properties
-
+{% trans %}Page properties{% endtrans %}
+
{% endblock %}
diff --git a/core/templates/core/pagerev_edit.jinja b/core/templates/core/pagerev_edit.jinja
index 6b7b88dc..d17d27ce 100644
--- a/core/templates/core/pagerev_edit.jinja
+++ b/core/templates/core/pagerev_edit.jinja
@@ -16,15 +16,15 @@ function make_preview() {
{% endblock %}
{% block page %}
- Edit page
-
-
-
+{% trans %}Edit page{% endtrans %}
+
+
+
{% endblock %}
diff --git a/core/templates/core/password_change.jinja b/core/templates/core/password_change.jinja
index 166900ff..40266215 100644
--- a/core/templates/core/password_change.jinja
+++ b/core/templates/core/password_change.jinja
@@ -5,6 +5,6 @@
{% endblock %}
diff --git a/core/templates/core/password_change_done.jinja b/core/templates/core/password_change_done.jinja
index 160b4a44..fbb570da 100644
--- a/core/templates/core/password_change_done.jinja
+++ b/core/templates/core/password_change_done.jinja
@@ -1,6 +1,6 @@
{% extends "core/base.jinja" %}
{% block content %}
-You successfully changed your password!
+{% trans %}You successfully changed your password!{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/password_reset.jinja b/core/templates/core/password_reset.jinja
index d0e9e88a..f54a255d 100644
--- a/core/templates/core/password_reset.jinja
+++ b/core/templates/core/password_reset.jinja
@@ -4,6 +4,6 @@
{% endblock %}
diff --git a/core/templates/core/password_reset_complete.jinja b/core/templates/core/password_reset_complete.jinja
index f156a4b1..fdd79b48 100644
--- a/core/templates/core/password_reset_complete.jinja
+++ b/core/templates/core/password_reset_complete.jinja
@@ -1,8 +1,8 @@
{% extends "core/base.jinja" %}
{% block content %}
-You successfully reset your password!
-Login
+{% trans %}You successfully reset your password!{% endtrans %}
+{% trans %}Login{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/password_reset_confirm.jinja b/core/templates/core/password_reset_confirm.jinja
index 4c55c714..5c61925b 100644
--- a/core/templates/core/password_reset_confirm.jinja
+++ b/core/templates/core/password_reset_confirm.jinja
@@ -4,7 +4,7 @@
{% endblock %}
diff --git a/core/templates/core/password_reset_done.jinja b/core/templates/core/password_reset_done.jinja
index 73d621c7..2f56cac1 100644
--- a/core/templates/core/password_reset_done.jinja
+++ b/core/templates/core/password_reset_done.jinja
@@ -1,15 +1,15 @@
{% extends "core/base.jinja" %}
{% block content %}
-Password reset sent
+{% trans %}Password reset sent{% endtrans %}
-We've emailed you instructions for setting your password, if an account exists with the email you entered. You should
-receive them shortly.
+{% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should
+receive them shortly.{% endtrans %}
-If you don't receive an email, please make sure you've entered the address you registered with, and check your spam
-folder.
+{% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam
+folder.{% endtrans %}
{% endblock %}
diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja
index 3e59c973..04ec99cf 100644
--- a/core/templates/core/register.jinja
+++ b/core/templates/core/register.jinja
@@ -1,20 +1,20 @@
{% extends "core/base.jinja" %}
-{% block title %}{{ title }}{% endblock %}
+{% block title %}{% trans %}Register a user{% endtrans %}{% endblock %}
{% block content %}
-{{ title }}
+{% trans %}Register a user{% endtrans %}
{% if user_registered %}
-Welcome {{ user_registered.get_display_name() }}!
-You successfully registred and you will soon receive a confirmation mail.
+{% trans user_name=user_registered.get_display_name() %}Welcome {{ user_name }}!{% endtrans %}
+{% trans %}You successfully registred and you will soon receive a confirmation mail.{% endtrans %}
-Your username is {{ user_registered.username }}.
+{% trans username=user_registered.username %}Your username is {{ username }}.{% endtrans %}
{% endif %}
{% endblock %}
diff --git a/core/templates/core/user_base.jinja b/core/templates/core/user_base.jinja
index 5e373dfc..7a67cb0a 100644
--- a/core/templates/core/user_base.jinja
+++ b/core/templates/core/user_base.jinja
@@ -3,24 +3,24 @@
{% block content %}
{{ profile.get_display_name() }}
-{% block infos %}
-{% endblock %}
+ {% block infos %}
+ {% endblock %}
{% endblock %}
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index f70b995c..f3345238 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -1,25 +1,27 @@
{% extends "core/user_base.jinja" %}
{% block title %}
- {{ profile.get_display_name() }}'s profile
+{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
{% endblock %}
{% block infos %}
-User Profile
+{% trans %}User Profile{% endtrans %}
-
{{ profile.get_full_name() }}
-
{{ profile.nick_name }}
-
Born: {{ profile.date_of_birth|date("d/m/Y") }}
+
{{ profile.get_full_name() }}
+
{{ profile.nick_name }}
+
{% trans %}Born: {% endtrans %}{{ profile.date_of_birth|date("d/m/Y") }}
{% if user.membership.filter(end_date=None).exists() %}
{# if the user is member of a club, he can view the subscription state #}
{% if get_subscriber(profile).is_subscribed() %}
-User is subscriber until {{ get_subscriber(profile).subscriptions.last().subscription_end }}
+{% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}
+User is subscriber until {{ subscription_end }}{% endtrans %}
{% else %}
-User is not subscribed. New subscription
+{% trans %}User is not subscribed. {% endtrans %}
+{% trans %}New subscription{% endtrans %}
{% endif %}
{% endif %}
diff --git a/core/templates/core/user_edit.jinja b/core/templates/core/user_edit.jinja
index 87489a1b..c21e39eb 100644
--- a/core/templates/core/user_edit.jinja
+++ b/core/templates/core/user_edit.jinja
@@ -1,15 +1,15 @@
{% extends "core/base.jinja" %}
{% block content %}
- Edit user profile
-
- {% if form.instance == user %}
- Change my password
- {% endif %}
+{% trans %}Edit user profile{% endtrans %}
+
+{% if form.instance == user %}
+{% trans %}Change my password{% endtrans %}
+{% endif %}
{% endblock %}
diff --git a/core/templates/core/user_group.jinja b/core/templates/core/user_group.jinja
index f8cd12b4..b062cafb 100644
--- a/core/templates/core/user_group.jinja
+++ b/core/templates/core/user_group.jinja
@@ -1,12 +1,12 @@
{% extends "core/base.jinja" %}
{% block content %}
- Edit user groups for {{ profile.get_full_name() }}
-
+{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}
+
{% endblock %}
diff --git a/core/templates/core/user_list.jinja b/core/templates/core/user_list.jinja
index eaf4e93d..db8f1fce 100644
--- a/core/templates/core/user_list.jinja
+++ b/core/templates/core/user_list.jinja
@@ -1,11 +1,11 @@
{% extends "core/base.jinja" %}
{% block title %}
-User list
+{% trans %}User list{% endtrans %}
{% endblock %}
{% block content %}
-User list
+{% trans %}User list{% endtrans %}
+{% trans %}Edit counter{% endtrans %}
+
{% endblock %}
diff --git a/counter/templates/counter/counter_list.jinja b/counter/templates/counter/counter_list.jinja
index 422038c0..cf15129b 100644
--- a/counter/templates/counter/counter_list.jinja
+++ b/counter/templates/counter/counter_list.jinja
@@ -1,22 +1,22 @@
{% extends "core/base.jinja" %}
{% block title %}
- Counter admin list
+{% trans %}Counter admin list{% endtrans %}
{% endblock %}
{% block content %}
- New counter
- {% if counter_list %}
- Counter admin list
-
- {% for c in counter_list %}
- {{ c }} -
- Edit
- {% endfor %}
-
- {% else %}
- There is no counters in this website.
- {% endif %}
+{% trans %}New counter{% endtrans %}
+{% if counter_list %}
+{% trans %}Counter admin list{% endtrans %}
+
+{% else %}
+{% trans %}There is no counters in this website.{% endtrans %}
+{% endif %}
{% endblock %}
diff --git a/counter/templates/counter/counter_main.jinja b/counter/templates/counter/counter_main.jinja
index 7c01f0d9..743ec0b1 100644
--- a/counter/templates/counter/counter_main.jinja
+++ b/counter/templates/counter/counter_main.jinja
@@ -9,37 +9,37 @@
{% endmacro %}
{% block content %}
- Counter
+{% trans %}Counter{% endtrans %}
{{ counter }}
- Club: {{ counter.club }}
- Products: {{ counter.products.all() }}
+ {% trans %}Club: {% endtrans %} {{ counter.club }}
+ {% trans %}Products: {% endtrans %} {{ counter.products.all() }}
-
Sellings
+
{% trans %}Sellings{% endtrans %}
{% if last_basket %}
-
Last selling:
-
Client: {{ last_customer }}, new amount: {{ new_customer_amount }} €.
+
{% trans %}Last selling: {% endtrans %}
+
{% trans %}Client: {% endtrans %}{{ last_customer }} - {% trans %}New amount: {% endtrans %}{{ new_customer_amount }} €.
{% for s in last_basket %}
{{ s }}
{% endfor %}
-
Total: {{ last_total }} €
+
{% trans %}Total: {% endtrans %}{{ last_total }} €
{% endif %}
{% if barmen %}
-
Enter client code:
+
{% trans %}Enter client code:{% endtrans %}
{% else %}
-
Please, login
+
{% trans %}Please, login{% endtrans %}
{% endif %}
-
Barman:
+
{% trans %}Barman: {% endtrans %}
{% for b in barmen %}
{{ barman_logout_link(b) }}
@@ -48,7 +48,7 @@
{% endblock %}
diff --git a/counter/templates/counter/user_account.jinja b/counter/templates/counter/user_account.jinja
index edfaef2e..7d96d872 100644
--- a/counter/templates/counter/user_account.jinja
+++ b/counter/templates/counter/user_account.jinja
@@ -1,15 +1,13 @@
{% extends "core/user_base.jinja" %}
{% block title %}
- {{ profile.get_display_name() }}'s account
+{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
{% endblock %}
{% block infos %}
-User account
+{% trans %}User account{% endtrans %}
{{ customer.refillings.all() }}
{{ customer.buyings.all() }}
-
-
{% endblock %}
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index d02b7fe3..8bdda6e8 100644
Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 39a481de..1651f549 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-18 15:44+0000\n"
+"POT-Creation-Date: 2016-07-19 17:00+0000\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia \n"
"Language-Team: AE info \n"
@@ -84,6 +84,172 @@ msgstr "code"
msgid "movement type"
msgstr "type de mouvement"
+#: accounting/templates/accounting/accountingtype_list.jinja:4
+#: accounting/templates/accounting/accountingtype_list.jinja:10
+msgid "Accounting type list"
+msgstr "Liste des types comptable"
+
+#: accounting/templates/accounting/accountingtype_list.jinja:8
+msgid "New accounting type"
+msgstr "Nouveau type comptable"
+
+#: accounting/templates/accounting/accountingtype_list.jinja:17
+msgid "There is no types in this website."
+msgstr "Il n'y a pas de types comptable dans ce site web."
+
+#: accounting/templates/accounting/bank_account_details.jinja:5
+#: accounting/templates/accounting/club_account_details.jinja:5
+#: accounting/templates/accounting/journal_details.jinja:5
+#: core/templates/core/user_tools.jinja:19
+msgid "Accounting"
+msgstr "Comptabilité"
+
+#: accounting/templates/accounting/bank_account_details.jinja:8
+msgid "View account"
+msgstr "Voir le compte"
+
+#: accounting/templates/accounting/bank_account_details.jinja:9
+msgid "New club account"
+msgstr "Nouveau compte club"
+
+#: accounting/templates/accounting/bank_account_details.jinja:13
+#: accounting/templates/accounting/bank_account_list.jinja:15
+#: accounting/templates/accounting/club_account_details.jinja:45
+#: accounting/templates/accounting/journal_details.jinja:48
+#: club/templates/club/club_detail.jinja:7
+#: core/templates/core/page_detail.jinja:7
+#: core/templates/core/user_base.jinja:8
+#: core/templates/core/user_tools.jinja:31
+#: counter/templates/counter/counter_list.jinja:14
+msgid "Edit"
+msgstr "Éditer"
+
+#: accounting/templates/accounting/bank_account_details.jinja:14
+#: accounting/templates/accounting/bank_account_list.jinja:16
+#: core/templates/core/group_list.jinja:13
+msgid "Delete"
+msgstr "Supprimer"
+
+#: accounting/templates/accounting/bank_account_list.jinja:4
+#: accounting/templates/accounting/bank_account_list.jinja:11
+msgid "Bank account list"
+msgstr "Liste des comptes en banque"
+
+#: accounting/templates/accounting/bank_account_list.jinja:8
+msgid "Manage accounting types"
+msgstr "Gérer les types comptable"
+
+#: accounting/templates/accounting/bank_account_list.jinja:9
+msgid "New bank account"
+msgstr "Nouveau compte en banque"
+
+#: accounting/templates/accounting/bank_account_list.jinja:20
+msgid "There is no accounts in this website."
+msgstr "Il n'y a pas de comptes dans ce site web."
+
+#: accounting/templates/accounting/club_account_details.jinja:8
+msgid "View account:"
+msgstr "Voir le compte:"
+
+#: accounting/templates/accounting/club_account_details.jinja:15
+msgid "New journal"
+msgstr "Nouveau classeur"
+
+#: accounting/templates/accounting/club_account_details.jinja:17
+msgid "You can not create new journal while you still have one opened"
+msgstr "Vous ne pouvez pas créer de journal tant qu'il y en a un d'ouvert"
+
+#: accounting/templates/accounting/club_account_details.jinja:21
+msgid "Name"
+msgstr "Nom"
+
+#: accounting/templates/accounting/club_account_details.jinja:22
+msgid "Start"
+msgstr "Début"
+
+#: accounting/templates/accounting/club_account_details.jinja:23
+msgid "End"
+msgstr "Fin"
+
+#: accounting/templates/accounting/club_account_details.jinja:24
+#: accounting/templates/accounting/journal_details.jinja:22
+msgid "Amount"
+msgstr "Montant"
+
+#: accounting/templates/accounting/club_account_details.jinja:25
+msgid "Effective amount"
+msgstr "Montant effectif"
+
+#: accounting/templates/accounting/club_account_details.jinja:26
+msgid "Closed"
+msgstr "Fermé"
+
+#: accounting/templates/accounting/club_account_details.jinja:40
+#: accounting/templates/accounting/journal_details.jinja:41
+msgid "Yes"
+msgstr "Oui"
+
+#: accounting/templates/accounting/club_account_details.jinja:42
+#: accounting/templates/accounting/journal_details.jinja:43
+msgid "No"
+msgstr "Non"
+
+#: accounting/templates/accounting/club_account_details.jinja:44
+msgid "View"
+msgstr "Voir"
+
+#: accounting/templates/accounting/journal_details.jinja:10
+msgid "Amount: "
+msgstr "Montant: "
+
+#: accounting/templates/accounting/journal_details.jinja:11
+msgid "Effective amount: "
+msgstr "Montant effectif: "
+
+#: accounting/templates/accounting/journal_details.jinja:13
+msgid "Journal is closed, you can not create operation"
+msgstr "Le classeur est fermé, vous ne pouvez pas créer d'opération"
+
+#: accounting/templates/accounting/journal_details.jinja:15
+msgid "New operation"
+msgstr "Nouvelle opération"
+
+#: accounting/templates/accounting/journal_details.jinja:19
+msgid "Nb"
+msgstr "No"
+
+#: accounting/templates/accounting/journal_details.jinja:20
+msgid "Date"
+msgstr "Date"
+
+#: accounting/templates/accounting/journal_details.jinja:21
+msgid "Label"
+msgstr "Intitulé"
+
+#: accounting/templates/accounting/journal_details.jinja:23
+msgid "Payment mode"
+msgstr "Méthode de paiement"
+
+#: accounting/templates/accounting/journal_details.jinja:25
+msgid "Code"
+msgstr "Code"
+
+#: accounting/templates/accounting/journal_details.jinja:26
+msgid "Nature"
+msgstr "Nature"
+
+#: accounting/templates/accounting/journal_details.jinja:27
+msgid "Done"
+msgstr "Effectué"
+
+#: accounting/templates/accounting/journal_details.jinja:28
+msgid "Comment"
+msgstr "Commentaire"
+
+#: accounting/templates/accounting/journal_details.jinja:29
+msgid "Actions"
+msgstr "Actions"
+
#: club/models.py:20
msgid "unix name"
msgstr "nom unix"
@@ -108,6 +274,14 @@ msgstr "Adresse"
msgid "You can not make loops in clubs"
msgstr "Vous ne pouvez pas faire de boucles dans les clubs"
+#: club/models.py:107
+msgid "user"
+msgstr "nom d'utilisateur"
+
+#: club/models.py:108
+msgid "club"
+msgstr "club"
+
#: club/models.py:111
msgid "role"
msgstr "rôle"
@@ -129,9 +303,74 @@ msgstr "L'utilisateur est déjà membre de ce club"
msgid "past member"
msgstr "Anciens membres"
+#: club/templates/club/club_detail.jinja:4
+msgid "Club"
+msgstr "Club"
+
+#: club/templates/club/club_detail.jinja:5
+#: core/templates/core/group_edit.jinja:4
+#: core/templates/core/page_detail.jinja:5
+msgid "Back to list"
+msgstr "Retour à la liste"
+
+#: club/templates/club/club_detail.jinja:10
+#: core/templates/core/page_detail.jinja:10
+msgid "Prop"
+msgstr "Propriétés"
+
+#: club/templates/club/club_detail.jinja:14
+msgid "Members"
+msgstr "Membres"
+
+#: club/templates/club/club_edit.jinja:4
+msgid "Edit club"
+msgstr "Éditer le club"
+
+#: club/templates/club/club_edit.jinja:8
+#: club/templates/club/club_edit_prop.jinja:8
+#: core/templates/core/create.jinja:8 core/templates/core/edit.jinja:8
+#: core/templates/core/page_prop.jinja:8
+#: core/templates/core/pagerev_edit.jinja:24
+#: counter/templates/counter/counter_edit.jinja:8
+#: subscription/templates/subscription/subscription.jinja:12
+msgid "Save"
+msgstr "Sauver"
+
+#: club/templates/club/club_edit_prop.jinja:4
+msgid "Edit club properties"
+msgstr "Éditer les propriétés du club"
+
+#: club/templates/club/club_list.jinja:4 club/templates/club/club_list.jinja:24
+msgid "Club list"
+msgstr "Liste des clubs"
+
+#: club/templates/club/club_list.jinja:21
+msgid "New club"
+msgstr "Nouveau club"
+
+#: club/templates/club/club_list.jinja:31
+msgid "There is no club in this website."
+msgstr "Il n'y a pas de club dans ce site web."
+
+#: club/templates/club/club_members.jinja:4
+msgid "Club members"
+msgstr "Membres du club"
+
+#: club/templates/club/club_members.jinja:13
+msgid "Add"
+msgstr "Ajouter"
+
+#: club/templates/club/club_tools.jinja:4
+msgid "Club tools"
+msgstr "Outils du club"
+
+#: club/templates/club/club_tools.jinja:8
+msgid "Counters:"
+msgstr "Comptoirs:"
+
#: core/models.py:23
msgid "meta group status"
-msgstr "Status du meta-groupe"
+msgstr "status du meta-groupe"
#: core/models.py:25
msgid "Whether a group is a meta group or not"
@@ -239,14 +478,249 @@ msgstr "titre de la page"
msgid "page content"
msgstr "contenu de la page"
+#: core/templates/core/403.jinja:5
+msgid "403, Forbidden"
+msgstr "403. Non autorisé"
+
+#: core/templates/core/404.jinja:5
+msgid "404, Not Found"
+msgstr "404. Non trouvé"
+
+#: core/templates/core/base.jinja:5
+msgid "Welcome!"
+msgstr "Bienvenue!"
+
+#: core/templates/core/base.jinja:15
+msgid "Logo"
+msgstr "Logo"
+
+#: core/templates/core/base.jinja:19
+#: core/templates/core/password_reset_complete.jinja:5
+msgid "Login"
+msgstr "Connexion"
+
+#: core/templates/core/base.jinja:20 core/templates/core/register.jinja:18
+msgid "Register"
+msgstr "S'enregister"
+
+#: core/templates/core/base.jinja:23
+msgid "Tools"
+msgstr "Outils"
+
+#: core/templates/core/base.jinja:24
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: core/templates/core/base.jinja:29
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: core/templates/core/base.jinja:30
+msgid "Pages"
+msgstr "Pages"
+
+#: core/templates/core/base.jinja:31 core/templates/core/user_tools.jinja:36
+msgid "Clubs"
+msgstr "Clubs"
+
+#: core/templates/core/base.jinja:44
+msgid "Site made by good people"
+msgstr "Site réalisé par des gens biens"
+
+#: core/templates/core/create.jinja:4
+msgid "Create"
+msgstr "Créer"
+
+#: core/templates/core/delete_confirm.jinja:4
+msgid "Delete confirmation"
+msgstr "Confirmation de suppression"
+
+#: core/templates/core/delete_confirm.jinja:6
+#, python-format
+msgid "Are you sure you want to delete \"%(obj)s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer \"%(obj)s\" ?"
+
+#: core/templates/core/delete_confirm.jinja:7
+msgid "Confirm"
+msgstr "Confirmation"
+
+#: core/templates/core/delete_confirm.jinja:8
+#: counter/templates/counter/counter_click.jinja:65
+msgid "Cancel"
+msgstr "Annuler"
+
+#: core/templates/core/edit.jinja:4
+#, python-format
+msgid "Edit %(obj)s"
+msgstr "Éditer %(obj)s"
+
+#: core/templates/core/group_edit.jinja:5
+msgid "Edit group"
+msgstr "Éditer le groupe"
+
+#: core/templates/core/group_edit.jinja:9 core/templates/core/user_edit.jinja:8
+#: core/templates/core/user_group.jinja:8
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: core/templates/core/group_list.jinja:4
+#: core/templates/core/group_list.jinja:8
+msgid "Group list"
+msgstr "Liste des groupes"
+
+#: core/templates/core/group_list.jinja:9
+msgid "New group"
+msgstr "Nouveau groupe"
+
+#: core/templates/core/index.jinja:6
+msgid "Hello, world. You're at the core index using Jinja2."
+msgstr "Hello, world! Vous êtes sur la page d'accueil utilisant Jinja2."
+
+#: core/templates/core/login.jinja:6
+msgid "Your username and password didn't match. Please try again."
+msgstr ""
+"Votre nom d'utilisateur et votre mot de passe ne correspondent pas. Merci de "
+"réessayer."
+
+#: core/templates/core/login.jinja:11
+msgid ""
+"Your account doesn't have access to this page. To proceed,\n"
+" please login with an account that has access."
+msgstr ""
+"Votre compte n'a pas accès à cette page. Merci de vous identifier avec un "
+"compte qui a accès."
+
+#: core/templates/core/login.jinja:14
+msgid "Please login to see this page."
+msgstr "Merci de vous identifier pour voir cette page."
+
+#: core/templates/core/login.jinja:31
+#: counter/templates/counter/counter_main.jinja:51
+msgid "login"
+msgstr "login"
+
+#: core/templates/core/login.jinja:36
+msgid "Lost password?"
+msgstr "Mot de passe perdu ?"
+
+#: core/templates/core/page.jinja:7 core/templates/core/page_list.jinja:4
+#: core/templates/core/page_list.jinja:9
+msgid "Page list"
+msgstr "Liste des pages"
+
+#: core/templates/core/page.jinja:9
+msgid "Create page"
+msgstr "Créer une page"
+
+#: core/templates/core/page.jinja:11
+msgid "Not found"
+msgstr "Non trouvé"
+
+#: core/templates/core/page.jinja:20
+msgid "Page does not exist"
+msgstr "La page n'existe pas."
+
+#: core/templates/core/page.jinja:22
+msgid "Create it?"
+msgstr "La créer ?"
+
+#: core/templates/core/page_detail.jinja:4
+msgid "Page"
+msgstr "Page"
+
+#: core/templates/core/page_detail.jinja:12
+#, python-format
+msgid "You're seeing the page %(page_name)s"
+msgstr "Vous consultez la page %(page_name)s"
+
+#: core/templates/core/page_detail.jinja:13
+msgid "History"
+msgstr "Historique"
+
+#: core/templates/core/page_detail.jinja:16
+#, python-format
+msgid "This may not be the last update, you are seeing revision %(rev_id)s!"
+msgstr ""
+"Ceci n'est peut-être pas la dernière version de la page. Vous consultez la "
+"version %(rev_id)s."
+
+#: core/templates/core/page_hist.jinja:4
+msgid "Page history"
+msgstr "Historique de la page"
+
+#: core/templates/core/page_hist.jinja:5
+msgid "Back to page"
+msgstr "Retour à la page"
+
+#: core/templates/core/page_hist.jinja:6
+msgid "You're seeing the history of page %(page_name)s"
+msgstr "Vous consultez l'historique de la page %(page_name)s"
+
+#: core/templates/core/page_list.jinja:16
+msgid "There is no page in this website."
+msgstr "Il n'y a pas de page sur ce site web."
+
+#: core/templates/core/page_prop.jinja:4
+msgid "Page properties"
+msgstr "Propriétés de la page"
+
+#: core/templates/core/pagerev_edit.jinja:19
+msgid "Edit page"
+msgstr "Éditer la page"
+
+#: core/templates/core/pagerev_edit.jinja:23
+msgid "Preview"
+msgstr "Prévisualiser"
+
+#: core/templates/core/password_change.jinja:8
+msgid "Change"
+msgstr "Changer"
+
+#: core/templates/core/password_change_done.jinja:4
+msgid "You successfully changed your password!"
+msgstr "Vous avez correctement changé votre mot de passe !"
+
+#: core/templates/core/password_reset.jinja:7
+#: core/templates/core/password_reset_confirm.jinja:7
+msgid "Reset"
+msgstr "Reset"
+
+#: core/templates/core/password_reset_complete.jinja:4
+msgid "You successfully reset your password!"
+msgstr "Vous avez correctement réinitialisé votre mot de passe !"
+
+#: core/templates/core/password_reset_done.jinja:4
+msgid "Password reset sent"
+msgstr "Réinitialisation de mot de passe envoyée"
+
+#: core/templates/core/password_reset_done.jinja:7
+msgid ""
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should\n"
+"receive them shortly."
+msgstr ""
+"Nous vous avons envoyé les instructions pour réinitialiser votre mot de "
+"passe par email, si un compte avec l'email entré existe effectivement.\n"
+"Vous devriez les recevoir rapidement."
+
+#: core/templates/core/password_reset_done.jinja:12
+msgid ""
+"If you don't receive an email, please make sure you've entered the address "
+"you registered with, and check your spam\n"
+"folder."
+msgstr ""
+"Si vous ne recevez pas d'email, assurez-vous d'avoir correctement entré "
+"l'adresse email avec laquelle vous vous êtes inscrit, et vérifiez votre "
+"dossier de spam."
+
#: core/templates/core/password_reset_email.jinja:2
#, python-format
-# msgid ""
-# "You're receiving this email because you requested a password reset for your "
-# "user account at %(site_name)s."
-# msgstr ""
-# "Vous avez reçu cet email parce que vous avez demandé une réinitialisation du "
-# "mot de passe pour votre compte sur le site %(site_name)."
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+"Vous avez reçu cet email parce que vous avez demandé une réinitialisation du "
+"mot de passe pour votre compte sur le site %(site_name)s."
#: core/templates/core/password_reset_email.jinja:4
msgid "Please go to the following page and choose a new password:"
@@ -260,13 +734,121 @@ msgstr "Votre nom d'utilisateur, en cas d'oubli :"
#: core/templates/core/password_reset_email.jinja:10
msgid "Thanks for using our site! "
-msgstr "Merci d'utiliser notre site!"
+msgstr "Merci d'utiliser notre site !"
#: core/templates/core/password_reset_email.jinja:12
#, python-format
msgid "The %(site_name)s team"
msgstr "L'équipe de %(site_name)s"
+#: core/templates/core/register.jinja:3 core/templates/core/register.jinja:6
+msgid "Register a user"
+msgstr "Enregistrer un utilisateur"
+
+#: core/templates/core/register.jinja:9
+#, python-format
+msgid "Welcome %(user_name)s!"
+msgstr "Bienvenue, %(user_name)s!"
+
+#: core/templates/core/register.jinja:10
+msgid ""
+"You successfully registred and you will soon receive a confirmation mail."
+msgstr ""
+"Vous vous êtes correctement enregistré, et vous devriez recevoir rapidement "
+"un email de confirmation."
+
+#: core/templates/core/register.jinja:12
+#, python-format
+msgid "Your username is %(username)s."
+msgstr "Votre nom d'utilisateur est %(username)s."
+
+#: core/templates/core/user_base.jinja:6
+msgid "Infos"
+msgstr "Infos"
+
+#: core/templates/core/user_base.jinja:11
+#: core/templates/core/user_tools.jinja:13
+msgid "Groups"
+msgstr "Groupes"
+
+#: core/templates/core/user_base.jinja:16
+msgid "Account"
+msgstr "Compte"
+
+#: core/templates/core/user_detail.jinja:4
+#, python-format
+msgid "%(user_name)s's profile"
+msgstr "Profil de %(user_name)s"
+
+#: core/templates/core/user_detail.jinja:8
+msgid "User Profile"
+msgstr "Profil de l'utilisateur"
+
+#: core/templates/core/user_detail.jinja:13
+msgid "Born: "
+msgstr "Né le : "
+
+#: core/templates/core/user_detail.jinja:20
+#, python-format
+msgid ""
+"\n"
+"User is subscriber until %(subscription_end)s"
+msgstr ""
+"\n"
+"L'utilisateur est cotisant jusqu'au %(subscription_end)s"
+
+#: core/templates/core/user_detail.jinja:23
+msgid "User is not subscribed. "
+msgstr "L'utilisateur n'est pas cotisant."
+
+#: core/templates/core/user_detail.jinja:24
+#: subscription/templates/subscription/subscription.jinja:4
+#: subscription/templates/subscription/subscription.jinja:8
+msgid "New subscription"
+msgstr "Nouvelle cotisation"
+
+#: core/templates/core/user_edit.jinja:4
+msgid "Edit user profile"
+msgstr "Éditer le profil de l'utilisateur"
+
+#: core/templates/core/user_edit.jinja:11
+msgid "Change my password"
+msgstr "Changer mon mot de passe"
+
+#: core/templates/core/user_group.jinja:4
+#, python-format
+msgid "Edit user groups for %(user_name)s"
+msgstr "Éditer les groupes pour %(user_name)s"
+
+#: core/templates/core/user_list.jinja:4 core/templates/core/user_list.jinja:8
+msgid "User list"
+msgstr "Liste d'utilisateurs"
+
+#: core/templates/core/user_tools.jinja:4
+#, python-format
+msgid "%(user_name)s's tools"
+msgstr "Outils de %(user_name)s"
+
+#: core/templates/core/user_tools.jinja:8
+msgid "User Tools"
+msgstr "Outils utilisateurs"
+
+#: core/templates/core/user_tools.jinja:10
+msgid "Sith management"
+msgstr "Gestion de Sith"
+
+#: core/templates/core/user_tools.jinja:16
+msgid "Counters management"
+msgstr "Gestion des comptoirs"
+
+#: core/templates/core/user_tools.jinja:22
+msgid "Subscriptions"
+msgstr "Cotisations"
+
+#: core/templates/core/user_tools.jinja:26
+msgid "Counters"
+msgstr "Comptoirs"
+
#: counter/models.py:20
msgid "account id"
msgstr "numéro de compte"
@@ -315,6 +897,113 @@ msgstr "prix unitaire"
msgid "quantity"
msgstr "quantité"
+#: counter/templates/counter/counter_click.jinja:20
+#: counter/templates/counter/counter_main.jinja:12
+msgid "Counter"
+msgstr "Comptoir"
+
+#: counter/templates/counter/counter_click.jinja:22
+#: counter/templates/counter/counter_main.jinja:14
+msgid "Club: "
+msgstr "Club : "
+
+#: counter/templates/counter/counter_click.jinja:25
+msgid "Customer"
+msgstr "Client"
+
+#: counter/templates/counter/counter_click.jinja:29
+msgid "Refilling"
+msgstr "Rechargement"
+
+#: counter/templates/counter/counter_click.jinja:34
+#: counter/templates/counter/counter_click.jinja:46
+msgid "Go"
+msgstr "Valider"
+
+#: counter/templates/counter/counter_click.jinja:38
+msgid "Selling"
+msgstr "Vente"
+
+#: counter/templates/counter/counter_click.jinja:40
+msgid "Not enough money"
+msgstr "Solde insuffisant"
+
+#: counter/templates/counter/counter_click.jinja:48
+msgid "Basket: "
+msgstr "Panier : "
+
+#: counter/templates/counter/counter_click.jinja:56
+#: counter/templates/counter/counter_main.jinja:28
+msgid "Total: "
+msgstr "Total : "
+
+#: counter/templates/counter/counter_click.jinja:60
+msgid "Finish"
+msgstr "Terminer"
+
+#: counter/templates/counter/counter_click.jinja:67
+#: counter/templates/counter/counter_main.jinja:15
+msgid "Products: "
+msgstr "Produits : "
+
+#: counter/templates/counter/counter_edit.jinja:4
+msgid "Edit counter"
+msgstr "Éditer le comptoir"
+
+#: counter/templates/counter/counter_list.jinja:4
+#: counter/templates/counter/counter_list.jinja:10
+msgid "Counter admin list"
+msgstr "Liste des comptoirs"
+
+#: counter/templates/counter/counter_list.jinja:8
+msgid "New counter"
+msgstr "Nouveau comptoir"
+
+#: counter/templates/counter/counter_list.jinja:18
+msgid "There is no counters in this website."
+msgstr "Il n'y a pas de comptoirs dans ce site web."
+
+#: counter/templates/counter/counter_main.jinja:19
+msgid "Sellings"
+msgstr "Ventes"
+
+#: counter/templates/counter/counter_main.jinja:21
+msgid "Last selling: "
+msgstr "Dernière vente : "
+
+#: counter/templates/counter/counter_main.jinja:22
+msgid "Client: "
+msgstr "Client : "
+
+#: counter/templates/counter/counter_main.jinja:22
+msgid "New amount: "
+msgstr "Nouveau montant : "
+
+#: counter/templates/counter/counter_main.jinja:31
+msgid "Enter client code:"
+msgstr "Entrez un code client : "
+
+#: counter/templates/counter/counter_main.jinja:35
+msgid "validate"
+msgstr "valider"
+
+#: counter/templates/counter/counter_main.jinja:38
+msgid "Please, login"
+msgstr "Merci de vous identifier"
+
+#: counter/templates/counter/counter_main.jinja:42
+msgid "Barman: "
+msgstr "Barman : "
+
+#: counter/templates/counter/user_account.jinja:4
+#, python-format
+msgid "%(user_name)s's account"
+msgstr "Compte de %(user_name)s"
+
+#: counter/templates/counter/user_account.jinja:8
+msgid "User account"
+msgstr "Compte utilisateur"
+
#: counter/views.py:194
msgid "END"
msgstr "FIN"
diff --git a/subscription/migrations/0002_auto_20160718_1805.py b/subscription/migrations/0002_auto_20160718_1805.py
new file mode 100644
index 00000000..99606a01
--- /dev/null
+++ b/subscription/migrations/0002_auto_20160718_1805.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('subscription', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='subscription',
+ name='payment_method',
+ field=models.CharField(max_length=255, verbose_name='payment method', choices=[('cheque', 'Check'), ('cash', 'Cash'), ('other', 'Other')]),
+ ),
+ migrations.AlterField(
+ model_name='subscription',
+ name='subscription_type',
+ field=models.CharField(max_length=255, verbose_name='subscription type', choices=[('cursus-branche', 'Branch cursus'), ('cursus-tronc-commun', 'Common core cursus'), ('deux-semestres', 'Two semesters'), ('un-semestre', 'One semester')]),
+ ),
+ ]
diff --git a/subscription/templates/subscription/subscription.jinja b/subscription/templates/subscription/subscription.jinja
index dd894c5c..c68c0d2a 100644
--- a/subscription/templates/subscription/subscription.jinja
+++ b/subscription/templates/subscription/subscription.jinja
@@ -1,14 +1,14 @@
{% extends "core/base.jinja" %}
{% block title %}
-New subscription
+{% trans %}New subscription{% endtrans %}
{% endblock %}
{% block content %}
-New subscription
+{% trans %}New subscription{% endtrans %}
{% endblock %}