From 040a11033beb098381dce49b79a9ebb1d9db5f37 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Thu, 1 May 2014 18:15:55 +0200
Subject: Updated french translations.

---
 messages.pot                                         |  12 ++++++++++--
 pyaggr3g470r/templates/login.html                    |   6 +++---
 pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo | Bin 7154 -> 7266 bytes
 pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po |  14 +++++++++++---
 pyaggr3g470r/views.py                                |   2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/messages.pot b/messages.pot
index cf576855..088919e3 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-01 17:26+0200\n"
+"POT-Creation-Date: 2014-05-01 18:13+0200\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"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Please enter a password."
 msgstr ""
 
-#: pyaggr3g470r/forms.py:42
+#: pyaggr3g470r/forms.py:42 pyaggr3g470r/templates/login.html:5
 msgid "Log In"
 msgstr ""
 
@@ -419,6 +419,14 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
+#: pyaggr3g470r/templates/login.html:19
+msgid "Your email"
+msgstr ""
+
+#: pyaggr3g470r/templates/login.html:23
+msgid "Your Password"
+msgstr ""
+
 #: pyaggr3g470r/templates/management.html:5
 msgid "Your subscriptions"
 msgstr ""
diff --git a/pyaggr3g470r/templates/login.html b/pyaggr3g470r/templates/login.html
index 4b89afbe..4f3b6c87 100644
--- a/pyaggr3g470r/templates/login.html
+++ b/pyaggr3g470r/templates/login.html
@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="jumbotron">
-        <h2>Log In</h2>
+        <h2>{{ _('Log In') }}</h2>
 
         {% for message in form.email.errors %}
             <div class="flash">{{ message }}</div>
@@ -16,11 +16,11 @@
             {{ form.hidden_tag() }}
 
             <div class="form-group">
-            {{ form.email(class_="form-control", placeholder="Your email") }}
+            {{ form.email(class_="form-control", placeholder=_('Your email')) }}
             </div>
 
             <div class="form-group">
-            {{ form.password(class_="form-control", placeholder="Your Password") }}
+            {{ form.password(class_="form-control", placeholder=_('Your Password')) }}
             </div>
 
             {{ form.submit(class_="btn") }}
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index 1bdfcc31..334cf813 100644
Binary files a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo and b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
index 75a95595..ca495e38 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-01 17:26+0200\n"
-"PO-Revision-Date: 2014-05-01 17:28+0100\n"
+"POT-Creation-Date: 2014-05-01 18:13+0200\n"
+"PO-Revision-Date: 2014-05-01 18:14+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr "Mot de passe"
 msgid "Please enter a password."
 msgstr "S'il vous plaît entrer un mot de passe."
 
-#: pyaggr3g470r/forms.py:42
+#: pyaggr3g470r/forms.py:42 pyaggr3g470r/templates/login.html:5
 msgid "Log In"
 msgstr "Connexion"
 
@@ -425,6 +425,14 @@ msgstr "À propos"
 msgid "Logout"
 msgstr "Déconnexion"
 
+#: pyaggr3g470r/templates/login.html:19
+msgid "Your email"
+msgstr "Votre email"
+
+#: pyaggr3g470r/templates/login.html:23
+msgid "Your Password"
+msgstr "Votre mot de passe"
+
 #: pyaggr3g470r/templates/management.html:5
 msgid "Your subscriptions"
 msgstr "Vos abonnements"
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index f9a44228..e9b2e509 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -119,7 +119,7 @@ def get_locale():
     Called before each request to give us a chance to choose
     the language to use when producing its response.
     """
-    return request.accept_languages.best_match(conf.LANGUAGES.keys())
+    return "fr"#request.accept_languages.best_match(conf.LANGUAGES.keys())
 
 
 #
-- 
cgit