Commit 60f31001 authored by Remi Oudin's avatar Remi Oudin

Page perso fix + Factures en anglais

parent 01cbc319
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-14 23:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/factures/index.html:8 templates/factures/index.html.py:9
msgid "Mes factures"
msgstr "My invoices"
#: templates/factures/index.html:14
msgid ""
"\n"
" <th>Numéro de facture</th>\n"
" <th>Montant</th>\n"
" <th>Reçue le</th>\n"
" <th>Payé par</th>\n"
" <th>Type d'achat</th>\n"
" <th>Télécharger le pdf</th>\n"
" "
msgstr ""
"\n"
" <th>Invoice Number</th>\n"
" <th>Amount</th>\n"
" <th>Registered on</th>\n"
" <th>Payed by</th>\n"
" <th>Type of purchase</th>\n"
" <th>Download the pdf</th>\n"
" "
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-14 23:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/factures/index.html:8 templates/factures/index.html.py:9
msgid "Mes factures"
msgstr ""
#: templates/factures/index.html:14
msgid ""
"\n"
" <th>Numéro de facture</th>\n"
" <th>Montant</th>\n"
" <th>Reçue le</th>\n"
" <th>Payé par</th>\n"
" <th>Type d'achat</th>\n"
" <th>Télécharger le pdf</th>\n"
" "
msgstr ""
{% load i18n %}
{% language 'fr' %}
\nonstopmode
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Invoice Template
......@@ -26,7 +28,7 @@
\documentclass[12pt]{article} % Use the custom invoice class (invoice.cls)
\usepackage[utf8]{inputenc}
\usepackage[french]{babel}
\usepackage[frenchb]{babel}
\usepackage{eurosym}
\usepackage{tabularx}
\usepackage[letterpaper,hmargin=0.79in,vmargin=0.79in]{geometry}
......@@ -68,7 +70,6 @@
\hfil{\Huge\bf C.R.A.N.S.}\hfil % Company providing the invoice
\bigskip\break % Whitespace
\hrule % Horizontal line
62 avenue du président Wilson \hfill (0) 95 170 3128 \\ % Your address and contact information
Cachan, 94235 CEDEX \hfill tresorier@crans.org \\
Siret : 452 661 531 00015
......@@ -115,7 +116,7 @@ Siret : 452 661 531 00015
\hrule % Horizontal line
\footnotesize{TVA non applicable, art. 293 B du CGI}
{% endlanguage %}
%----------------------------------------------------------------------------------------
\end{document}
{% extends "template.html" %}
{% load static from staticfiles %}
{% load i18n %}
{% block head %}
<link rel="stylesheet" type="text/css" href="{% static 'css/factures.css' %}" />
{% endblock head %}
{% block title %} Mes factures {% endblock %}
{% block h1 %} Mes factures {% endblock %}
{% block title %} {% trans "Mes factures" %} {% endblock %}
{% block h1 %}{% trans "Mes factures" %} {% endblock %}
{% block content %}
<table class="mobile-friendly">
<thead>
<tr>
{% blocktrans %}
<th>Numéro de facture</th>
<th>Montant</th>
<th>Reçue le</th>
<th>Payé par</th>
<th>Type d'achat</th>
<th>Télécharger le pdf</th>
{% endblocktrans %}
</tr>
</thead>
<tbody>
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-12 21:02+0100\n"
"POT-Creation-Date: 2016-01-16 10:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -18,18 +18,40 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/pageperso/affichage.html:3
#: templates/pageperso/affichage.html:3 templates/pageperso/createdb.html:2
#: templates/pageperso/deletedb.html:2
msgid "Ma page Perso"
msgstr "My personnal web page"
msgstr "My personal web page"
#: templates/pageperso/affichage.html:4 templates/pageperso/createdb.html:3
#: templates/pageperso/deletedb.html:3
msgid "Ma page perso"
msgstr "My personal web page"
#: templates/pageperso/affichage.html:6
msgid "<h2>Référencement</h2>"
msgstr "<h2>Indexing</h2>"
#: templates/pageperso/affichage.html:7
msgid "Cette interface permet de référencer sa page perso sur"
msgstr "This interface makes it possible to index your personnal web page on"
msgid "Cette interface permet de référencer sa page perso sur "
msgstr "This interface makes it possible to index your personnal web page on "
#: templates/pageperso/affichage.html:8
msgid "Pour plus d'informations, rendez-vous sur le "
msgstr "For more informations, visit the "
#: templates/pageperso/affichage.html:39
msgid "<h2>Déréférencement</h2>"
msgstr "<h2>Discontinuing</h2>"
#: templates/pageperso/affichage.html:41
msgid "Déréférencer ma page perso"
msgstr "Discontinue my personnal web page"
#: templates/pageperso/affichage.html:44
msgid "Base de données"
msgstr "Database"
#: templates/pageperso/affichage.html:47
#, python-format
msgid ""
......@@ -44,24 +66,53 @@ msgid ""
msgstr ""
"\n"
"You own a mysql database accessible from zamok.<br/>\n"
"User Name \"%(user.username)s\", name of the database, \"%(user.username)s"
"\",address \"localhost\".<br/>\n"
"You can log to it with the command line from zamok with \"mysql"
" -u %(user.username)s -p %(user.username)s\" and then by entering your"
"database password.<br/>\n"
"User Name \"%(user.username)s\", name of the database, \"%(user.username)s\","
"address \"localhost\".<br/>\n"
"You can log to it with the command line from zamok with \"mysql -u "
"%(user.username)s -p %(user.username)s\" and then by entering yourdatabase "
"password.<br/>\n"
"You can also use the web interface"
#: templates/pageperso/affichage.html:55
msgid ""
"Vous ne disposez pas encore d'une base de données mysql accessible depuis "
"zamok."
msgstr ""
"You don't own a mysql database accessible from zamok."
msgstr "You don't own a mysql database accessible from zamok."
#: templates/pageperso/affichage.html:59
msgid "Impossible d'accéder aux information de connexion mysql"
msgstr "Impossible to access mysql's connection informations"
#: templates/pageperso/createdb.html:16
msgid "Création de la base de données"
msgstr "Creation of the database"
#: templates/pageperso/createdb.html:17
msgid ""
"\n"
"Merci de choisir un mot de passe pour votre base de données.<br/>\n"
"Il est fortement recommandé d'utiliser un mot de passe différent de celui de "
"votre compte Crans.\n"
msgstr ""
"\n"
"Please select a password for your database<br/>\n"
"It is strongly recommended to choose a different password from that for "
"accessing to your Crans account.\n"
#: templates/pageperso/createdb.html:24
msgid "Générer un mot de passe"
msgstr "Generate a password"
#: templates/pageperso/deletedb.html:5
msgid "Destruction de votre base de données"
msgstr "Destruction of you database"
#: templates/pageperso/deletedb.html:8
msgid ""
"Vraiment supprimer la base de données ? Toutes les données contenues dedans "
"seront irrémédiablement perdues."
msgstr "Really destroy the database? All data in will be irremediably lost"
#: views.py:43 views.py:58
msgid "Modifier l'affichage de ma page perso"
msgstr "Modify your personnal webpage display"
......@@ -69,3 +120,8 @@ msgstr "Modify your personnal webpage display"
#: views.py:46 views.py:63
msgid "Référencer ma page perso"
msgstr "Index my personnal web page"
#, fuzzy
#~| msgid "Référencer ma page perso"
#~ msgid "Référencement"
#~ msgstr "Index my personnal web page"
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-12 21:18+0100\n"
"POT-Creation-Date: 2016-01-16 10:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -23,14 +23,35 @@ msgstr ""
msgid "Ma page Perso"
msgstr ""
#: templates/pageperso/affichage.html:4 templates/pageperso/createdb.html:3
#: templates/pageperso/deletedb.html:3
msgid "Ma page perso"
msgstr ""
#: templates/pageperso/affichage.html:6
msgid "<h2>Référencement</h2>"
msgstr ""
#: templates/pageperso/affichage.html:7
msgid "Cette interface permet de référencer sa page perso sur"
msgid "Cette interface permet de référencer sa page perso sur "
msgstr ""
#: templates/pageperso/affichage.html:8
msgid "Pour plus d'informations, rendez-vous sur le "
msgstr ""
#: templates/pageperso/affichage.html:39
msgid "<h2>Déréférencement</h2>"
msgstr ""
#: templates/pageperso/affichage.html:41
msgid "Déréférencer ma page perso"
msgstr ""
#: templates/pageperso/affichage.html:44
msgid "Base de données"
msgstr ""
#: templates/pageperso/affichage.html:47
#, python-format
msgid ""
......@@ -54,10 +75,6 @@ msgstr ""
msgid "Impossible d'accéder aux information de connexion mysql"
msgstr ""
#: templates/pageperso/createdb.html:3 templates/pageperso/deletedb.html:3
msgid "Ma page perso"
msgstr ""
#: templates/pageperso/createdb.html:16
msgid "Création de la base de données"
msgstr ""
......
{% extends "template.html" %}
{% load i18n %}
{% block title %} {% trans "Ma page Perso" %} {% endblock %}
{% block h1 %} Ma page perso {% endblock %}
{% block h1 %} {% trans "Ma page perso" %} {% endblock %}
{% block content %}
<h2>Référencement</h2>
{% trans "Cette interface permet de référencer sa page perso sur" %}<a href="https://wiki.crans.org/PagesPerso"a>Wiki/PagesPerso</a><br/>
{% trans Pour plus d'informations, rendez-vous sur le %} <a href="https://wiki.crans.org/HowToEspacePerso"a>Wiki</a>
{% trans "<h2>Référencement</h2>" %}
{% trans "Cette interface permet de référencer sa page perso sur " %}<a href="https://wiki.crans.org/PagesPerso"a>Wiki/PagesPerso</a><br/>
{% trans "Pour plus d'informations, rendez-vous sur le " %} <a href="https://wiki.crans.org/HowToEspacePerso"a>Wiki</a>
<form class="form-full-width" method="post"> {% csrf_token %}
<div class="error-container">
{{ form.non_field_errors }}
......@@ -36,12 +36,12 @@
</footer>
</form>
{% if deref %}
<h2>Déréférencement</h2>
{% trans "<h2>Déréférencement</h2>" %}
<form action="{% url 'pageperso:deref' %}">
<input type="submit" value="{% trans "Déréférencer ma page perso" %}" class="button-del">
</form>
{% endif %}
<h2>Base de données</h2>
<h2>{%trans "Base de données" %}</h2>
{% if not mysql_error %}
{% if mysql_exists %}
{% blocktrans %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment