Updated translation.

6 files changed, 187 insertions, 19 deletions

diff --git a/messages.pot b/messages.pot
index 6e487268..65fbf06c 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 11:10+0200\n"
+"POT-Creation-Date: 2014-05-01 11:36+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"
@@ -124,6 +124,10 @@ msgstr ""
 msgid "This user does not exist."
 msgstr ""
 
+#: pyaggr3g470r/templates/article.html:25
+msgid "Next post:"
+msgstr ""
+
 #: pyaggr3g470r/templates/home.html:5
 msgid "You are not subscribed to any feed."
 msgstr ""
@@ -152,3 +156,83 @@ msgstr ""
 msgid "Mark all as read"
 msgstr ""
 
+#: pyaggr3g470r/templates/management.html:5
+msgid "Your subscriptions"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "You are subscribed to"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "feeds"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "Add a"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "feed"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:7
+msgid "articles are stored in the database with"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:7
+msgid "unread articles"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:9
+msgid "Index database"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:13
+msgid "Your Profile"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:16
+msgid "Update your"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:16
+msgid "profile"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:17
+msgid "Member since"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:18
+msgid "Last seen:"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:26
+msgid "Import/export feeds"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:27
+msgid "Import"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:29
+msgid "Batch import feeds from OPML"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:29
+msgid "or"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:32
+msgid "Export"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:33
+msgid "Export feeds to OPML"
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:36
+msgid "Export articles"
+msgstr ""
+
diff --git a/pyaggr3g470r/templates/article.html b/pyaggr3g470r/templates/article.html
index 1ca1ce49..f7790d6a 100644
--- a/pyaggr3g470r/templates/article.html
+++ b/pyaggr3g470r/templates/article.html
@@ -22,7 +22,7 @@
     <div class="jumbotron">
         <div class="row">
             <div class="col-md-6">
-                Next post: <a href="/article/{{ next_article.id }}">{{ next_article.title }}</a>
+                {{ _('Next post:') }} <a href="/article/{{ next_article.id }}">{{ next_article.title }}</a>
             </div>
             <div class="col-md-6 text-right">
                 Previous post: <a href="/article/{{ previous_article.id }}">{{ previous_article.title }}</a>
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html
index 78f4399b..b37653c4 100644
--- a/pyaggr3g470r/templates/management.html
+++ b/pyaggr3g470r/templates/management.html
@@ -2,20 +2,20 @@
 {% block content %}
 <div class="container">
     <div class="jumbotron">
-        <h1>Your subscriptions</h1>
-        <p>You are subscribed to {{ nb_feeds }} <a href="/feeds">feeds</a>. Add a <a href="/create_feed/">feed</a>.</p>
-        <p>{{ nb_articles }} articles are stored in the database with {{ nb_unread_articles }} <a href="/unread/">unread articles</a>.</p>
+        <h1>{{ _('Your subscriptions') }}</h1>
+        <p>{{ _('You are subscribed to') }} {{ nb_feeds }} <a href="/feeds">{{ _('feeds') }}</a>. {{ _('Add a') }} <a href="/create_feed/">{{ _('feed') }}</a>.</p>
+        <p>{{ nb_articles }} {{ _('articles are stored in the database with') }} {{ nb_unread_articles }} <a href="/unread/">{{ _('unread articles') }}</a>.</p>
         {% if not_on_heroku %}
-            <a href="/index_database/" class="btn btn-default">Index database</a>
+            <a href="/index_database/" class="btn btn-default">{{ _('Index database') }}</a>
         {% endif %}
     </div>
     <div class="jumbotron">
-        <h1>Your Profile</h1>
+        <h1>{{ _('Your Profile') }}</h1>
         <div class="row">
             <div class="col-md-6">
-                <p>Update your <a href="/profile/">profile</a>.</p>
-                <p>Member since {{ user.date_created.strftime('%A, %d %B %Y') }}.</p>
-                <p>Last seen: {{ user.last_seen.strftime('%A, %d %B %Y at %H:%M:%S') }}.</p>
+                <p>{{ _('Update your') }} <a href="/profile/">{{ _('profile') }}</a>.</p>
+                <p>{{ _('Member since') }} {{ user.date_created.strftime('%A, %d %B %Y') }}.</p>
+                <p>{{ _('Last seen:') }} {{ user.last_seen.strftime('%A, %d %B %Y at %H:%M:%S') }}.</p>
             </div>
             <div class="col-md-6">
                 <img src="{{ user.email | gravatar }}" />
@@ -23,17 +23,17 @@
         </div>
     </div>
     <div class="jumbotron">
-        <h1>Import/export feeds</h1>
-        <h2>Import</h2>
+        <h1>{{ _('Import/export feeds') }}</h1>
+        <h2>{{ _('Import') }}</h2>
         <form action="" method="post" id="formImportOPML" enctype="multipart/form-data">
-            <span class="btn btn-default btn-file">Batch import feeds from OPML (<span class="text-info">*.xml or *.opml</span>)<input type="file" name="opmlfile" /></span>
+            <span class="btn btn-default btn-file">{{ _('Batch import feeds from OPML') }} (<span class="text-info">*.xml {{ _('or') }} *.opml</span>)<input type="file" name="opmlfile" /></span>
             <button class="btn btn-default" type="submit">OK</button>
         </form>
-        <h2>Export</h2>
-        <a href="/export_opml/" class="btn btn-default">Export feeds to OPML</a>
+        <h2>{{ _('Export') }}</h2>
+        <a href="/export_opml/" class="btn btn-default">{{ _('Export feeds to OPML') }}</a>
     </div>
     <div class="jumbotron">
-        <h1>Export articles</h1>
+        <h1>{{ _('Export articles') }}</h1>
         <a href="/export/?format=HTML" class="btn btn-default">HTML</a>
         <a href="/export/?format=JSON" class="btn btn-default">JSON</a>
     </div>
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index e2f373d0..e685bafd 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
index bcb85625..a9e50dd0 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 11:10+0200\n"
-"PO-Revision-Date: 2014-05-01 11:12+0100\n"
+"POT-Creation-Date: 2014-05-01 11:36+0200\n"
+"PO-Revision-Date: 2014-05-01 11:36+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ -126,6 +126,10 @@ msgstr "Utilisateur"
 msgid "This user does not exist."
 msgstr "Cet utilisateur n'existe pas."
 
+#: pyaggr3g470r/templates/article.html:25
+msgid "Next post:"
+msgstr "Billet suivant:"
+
 #: pyaggr3g470r/templates/home.html:5
 msgid "You are not subscribed to any feed."
 msgstr "Vous êtes abonné à aucun flux."
@@ -153,3 +157,83 @@ msgstr "Récupérer ce flux"
 #: pyaggr3g470r/templates/home.html:17
 msgid "Mark all as read"
 msgstr "Marquer tout comme lu"
+
+#: pyaggr3g470r/templates/management.html:5
+msgid "Your subscriptions"
+msgstr "Vos abonnements"
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "You are subscribed to"
+msgstr "Vous êtes abonné à"
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "feeds"
+msgstr "flux"
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "Add a"
+msgstr "Ajouter un"
+
+#: pyaggr3g470r/templates/management.html:6
+msgid "feed"
+msgstr "flux"
+
+#: pyaggr3g470r/templates/management.html:7
+msgid "articles are stored in the database with"
+msgstr "articles sont stockés dans la base avec"
+
+#: pyaggr3g470r/templates/management.html:7
+msgid "unread articles"
+msgstr "articles non lus"
+
+#: pyaggr3g470r/templates/management.html:9
+msgid "Index database"
+msgstr "Indexer la base de données"
+
+#: pyaggr3g470r/templates/management.html:13
+msgid "Your Profile"
+msgstr "Votre profil"
+
+#: pyaggr3g470r/templates/management.html:16
+msgid "Update your"
+msgstr "Mettez à jour votre"
+
+#: pyaggr3g470r/templates/management.html:16
+msgid "profile"
+msgstr "profil"
+
+#: pyaggr3g470r/templates/management.html:17
+msgid "Member since"
+msgstr "Membre depuis"
+
+#: pyaggr3g470r/templates/management.html:18
+msgid "Last seen:"
+msgstr "Vue la dernière fois:"
+
+#: pyaggr3g470r/templates/management.html:26
+msgid "Import/export feeds"
+msgstr "Importer/exporter les flux"
+
+#: pyaggr3g470r/templates/management.html:27
+msgid "Import"
+msgstr "Importer"
+
+#: pyaggr3g470r/templates/management.html:29
+msgid "Batch import feeds from OPML"
+msgstr "Import en lot via un fichier OPML"
+
+#: pyaggr3g470r/templates/management.html:29
+msgid "or"
+msgstr "ou"
+
+#: pyaggr3g470r/templates/management.html:32
+msgid "Export"
+msgstr "Exporter"
+
+#: pyaggr3g470r/templates/management.html:33
+msgid "Export feeds to OPML"
+msgstr "Exporter les flux au format OPML"
+
+#: pyaggr3g470r/templates/management.html:36
+msgid "Export articles"
+msgstr "Exporter les articles"
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 05b7e0f6..88bb45f7 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())
 
 
 #