From 39d49458ef55adaccb49041a231b5dfd88ce3c3f Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Sun, 4 May 2014 19:25:30 +0200
Subject: Updated translations.

---
 messages.pot                                       |  76 ++++++++++++++++++-
 pyaggr3g470r/templates/admin/create_user.html      |   2 +-
 pyaggr3g470r/templates/admin/dashboard.html        |  20 ++---
 pyaggr3g470r/templates/admin/user.html             |  30 ++++----
 .../translations/fr/LC_MESSAGES/messages.mo        | Bin 7824 -> 8636 bytes
 .../translations/fr/LC_MESSAGES/messages.po        |  81 +++++++++++++++++++--
 pyaggr3g470r/views.py                              |   6 +-
 7 files changed, 177 insertions(+), 38 deletions(-)

diff --git a/messages.pot b/messages.pot
index e2e44a60..6256b150 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-03 11:35+0200\n"
+"POT-Creation-Date: 2014-05-04 19:22+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"
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: pyaggr3g470r/forms.py:61
+#: pyaggr3g470r/forms.py:61 pyaggr3g470r/templates/admin/user.html:30
 msgid "Feed link"
 msgstr ""
 
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Please enter a link for the feed."
 msgstr ""
 
-#: pyaggr3g470r/forms.py:62
+#: pyaggr3g470r/forms.py:62 pyaggr3g470r/templates/admin/user.html:31
 msgid "Site link"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Please enter your last name."
 msgstr ""
 
-#: pyaggr3g470r/forms.py:78
+#: pyaggr3g470r/forms.py:78 pyaggr3g470r/templates/admin/dashboard.html:14
 msgid "Email"
 msgstr ""
 
@@ -171,6 +171,7 @@ msgstr ""
 
 #: pyaggr3g470r/views.py:554 pyaggr3g470r/views.py:566
 #: pyaggr3g470r/views.py:569 pyaggr3g470r/views.py:592
+#: pyaggr3g470r/templates/admin/user.html:45
 msgid "Feed"
 msgstr ""
 
@@ -204,6 +205,14 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#: pyaggr3g470r/views.py:674
+msgid "Edit the user"
+msgstr ""
+
+#: pyaggr3g470r/views.py:677 pyaggr3g470r/templates/admin/dashboard.html:35
+msgid "Add a new user"
+msgstr ""
+
 #: pyaggr3g470r/views.py:691 pyaggr3g470r/views.py:707
 msgid "This user does not exist."
 msgstr ""
@@ -270,10 +279,12 @@ msgstr ""
 #: pyaggr3g470r/templates/favorites.html:18 pyaggr3g470r/templates/feed.html:8
 #: pyaggr3g470r/templates/feeds.html:33 pyaggr3g470r/templates/home.html:13
 #: pyaggr3g470r/templates/unread.html:18
+#: pyaggr3g470r/templates/admin/user.html:46
 msgid "Edit this feed"
 msgstr ""
 
 #: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:34
+#: pyaggr3g470r/templates/admin/user.html:47
 msgid "Delete this feed"
 msgstr ""
 
@@ -347,6 +358,8 @@ msgid "Articles"
 msgstr ""
 
 #: pyaggr3g470r/templates/feeds.html:14
+#: pyaggr3g470r/templates/admin/dashboard.html:15
+#: pyaggr3g470r/templates/admin/user.html:33
 msgid "Actions"
 msgstr ""
 
@@ -469,10 +482,12 @@ msgid "profile"
 msgstr ""
 
 #: pyaggr3g470r/templates/management.html:17
+#: pyaggr3g470r/templates/admin/user.html:12
 msgid "Member since"
 msgstr ""
 
 #: pyaggr3g470r/templates/management.html:18
+#: pyaggr3g470r/templates/admin/user.html:13
 msgid "Last seen:"
 msgstr ""
 
@@ -512,3 +527,56 @@ msgstr ""
 msgid "Unread articles"
 msgstr ""
 
+#: pyaggr3g470r/templates/admin/dashboard.html:7
+msgid "Registered users"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/dashboard.html:12
+msgid "Firstname"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/dashboard.html:13
+msgid "Lastname"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/dashboard.html:26
+msgid "View this user"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/dashboard.html:27
+#: pyaggr3g470r/templates/admin/user.html:8
+msgid "Edit this user"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/dashboard.html:28
+msgid "Delete this user"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/dashboard.html:37
+msgid "As an administrator you are not listed in this table"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:9
+msgid "Membership"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:22
+msgid "This user is not subscribed to any feed."
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:24
+msgid "Feeds"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:29
+msgid "Name"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:32
+msgid "Number of articles"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:53
+msgid "Add a new feed"
+msgstr ""
+
diff --git a/pyaggr3g470r/templates/admin/create_user.html b/pyaggr3g470r/templates/admin/create_user.html
index 5a6838bd..fcb59cd7 100644
--- a/pyaggr3g470r/templates/admin/create_user.html
+++ b/pyaggr3g470r/templates/admin/create_user.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="container">
     <div class="jumbotron">
-        <h2>{{ message|safe }}</h2>
+        <h2>{{ message | safe }}</h2>
         <form action="" method="post" name="saveprofileform" id="profileform">
             {{ form.hidden_tag() }}
 
diff --git a/pyaggr3g470r/templates/admin/dashboard.html b/pyaggr3g470r/templates/admin/dashboard.html
index 99f843f5..a9b3e546 100644
--- a/pyaggr3g470r/templates/admin/dashboard.html
+++ b/pyaggr3g470r/templates/admin/dashboard.html
@@ -4,15 +4,15 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-<h1>Registered users</h1>
+<h1>{{ _('Registered users') }}</h1>
 <table class="table table-striped">
     <thead>
         <tr>
             <th>#</th>
-            <th>Firstname</th>
-            <th>Lastname</th>
-            <th>Email</th>
-            <th>Actions</th>
+            <th>{{ _('Firstname') }}</th>
+            <th>{{ _('Lastname') }}</th>
+            <th>{{ _('Email') }}</th>
+            <th>{{ _('Actions') }}</th>
         </tr>
     </thead>
     <tbody>
@@ -23,17 +23,17 @@
             <td>{{ user.lastname }}</td>
             <td>{{ user.email }}</td>
             <td>
-                <a href="/admin/user/{{ user.id }}/"><i class="glyphicon glyphicon-user" title="View this user"></i></a>
-                <a href="/admin/edit_user/{{ user.id }}/"><i class="glyphicon glyphicon-edit" title="Edit this user"></i></a>
-                <a href="/admin/delete_user/{{ user.id }}/"><i class="glyphicon glyphicon-remove" title="Delete this user"></i></a>
+                <a href="/admin/user/{{ user.id }}/"><i class="glyphicon glyphicon-user" title="{{ _('View this user') }}<"></i></a>
+                <a href="/admin/edit_user/{{ user.id }}/"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this user') }}"></i></a>
+                <a href="/admin/delete_user/{{ user.id }}/"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this user') }}"></i></a>
             </td>
         </tr>
     {% endfor %}
     </tbody>
 </table>
 <br />
-<a href="/admin/create_user/" class="btn btn-default">Add a new user</a>
+<a href="/admin/create_user/" class="btn btn-default">{{ _('Add a new user') }}</a>
 <br /><br />
-<p class="text-info">As an administrator you are not listed in this table.</p>
+<p class="text-info">{{ _('As an administrator you are not listed in this table') }}.</p>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html
index 92b04b23..b7148617 100644
--- a/pyaggr3g470r/templates/admin/user.html
+++ b/pyaggr3g470r/templates/admin/user.html
@@ -5,12 +5,12 @@
 {% block content %}
 <div class="container">
     <div class="jumbotron">
-        <a href="/admin/edit_user/{{ user.id }}/" class="btn btn-default">Edit this user</a>
-        <h2>Membership</h2>
+        <a href="/admin/edit_user/{{ user.id }}/" class="btn btn-default">{{ _('Edit this user') }}</a>
+        <h2>{{ _('Membership') }}</h2>
         <div class="row">
             <div class="col-md-6">
-                <p>Member since {{ user.date_created | datetime }}.</p>
-                <p>Last seen: {{ user.last_seen | datetime }}.</p>
+                <p>{{ _('Member since') }} {{ user.date_created | datetime }}.</p>
+                <p>{{ _('Last seen:') }} {{ user.last_seen | datetime }}.</p>
             </div>
             <div class="col-md-6">
                 <img src="{{ user.email | gravatar }}" />
@@ -19,18 +19,18 @@
     </div>
     <div class="jumbotron">
         {% if user.feeds.all()|count == 0 %}
-            <h1>This user is not subscribed to any feed.</h1>
+            <h1>{{ _('This user is not subscribed to any feed.') }}</h1>
         {% else %}
-            <h1>Feeds</h1>
+            <h1>{{ _('Feeds') }}</h1>
             <table class="table table-striped">
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th>Name</th>
-                        <th>Feed link</th>
-                        <th>Site link</th>
-                        <th>Number of articles</th>
-                        <th>Actions</th>
+                        <th>{{ _('Name') }}</th>
+                        <th>{{ _('Feed link') }}</th>
+                        <th>{{ _('Site link') }}</th>
+                        <th>{{ _('Number of articles') }}</th>
+                        <th>{{ _('Actions') }}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,15 +42,15 @@
                         <td>{{ feed.site_link }}</td>
                         <td>{{ feed.articles.all()|count }}</td>
                         <td>
-                            <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-th-list" title="Feed"></i></a>
-                            <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a>
-                            <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="Delete this feed"></i></a>
+                            <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Feed') }}"></i></a>
+                            <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
+                            <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}"></i></a>
                         </td>
                 {% endfor %}
                 </tbody>
             </table>
         {% endif %}
-        <a href="/create_feed/" class="btn btn-default">Add a new feed</a>
+        <a href="/create_feed/" class="btn btn-default">{{ _('Add a new feed') }}</a>
     </div>
 </div>
 {% endblock %}
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index 71234ba0..916d871e 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 24d01157..9ccaba1d 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-03 11:35+0200\n"
-"PO-Revision-Date: 2014-05-03 11:44+0100\n"
+"POT-Creation-Date: 2014-05-04 19:22+0200\n"
+"PO-Revision-Date: 2014-05-04 19:24+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ -47,7 +47,7 @@ msgstr "Titre"
 msgid "Please enter a title."
 msgstr "S'il vous plaît, entrez un titre."
 
-#: pyaggr3g470r/forms.py:61
+#: pyaggr3g470r/forms.py:61 pyaggr3g470r/templates/admin/user.html:30
 msgid "Feed link"
 msgstr "Lien du flux"
 
@@ -55,7 +55,7 @@ msgstr "Lien du flux"
 msgid "Please enter a link for the feed."
 msgstr "S'il vous plaît, entrez un lien pour le flux."
 
-#: pyaggr3g470r/forms.py:62
+#: pyaggr3g470r/forms.py:62 pyaggr3g470r/templates/admin/user.html:31
 msgid "Site link"
 msgstr "Lien du site"
 
@@ -87,7 +87,7 @@ msgstr "Nom de famille"
 msgid "Please enter your last name."
 msgstr "S'il vous plaît, entrez votre nom de famille."
 
-#: pyaggr3g470r/forms.py:78
+#: pyaggr3g470r/forms.py:78 pyaggr3g470r/templates/admin/dashboard.html:14
 msgid "Email"
 msgstr "Email"
 
@@ -173,6 +173,7 @@ msgstr "Impossible d'importer les nouveaux flux."
 
 #: pyaggr3g470r/views.py:554 pyaggr3g470r/views.py:566
 #: pyaggr3g470r/views.py:569 pyaggr3g470r/views.py:592
+#: pyaggr3g470r/templates/admin/user.html:45
 msgid "Feed"
 msgstr "Flux"
 
@@ -206,6 +207,14 @@ msgstr "supprimé avec succès."
 msgid "User"
 msgstr "Utilisateur"
 
+#: pyaggr3g470r/views.py:674
+msgid "Edit the user"
+msgstr "Éditer cet utilisateur"
+
+#: pyaggr3g470r/views.py:677 pyaggr3g470r/templates/admin/dashboard.html:35
+msgid "Add a new user"
+msgstr "Ajouter un nouvel utilisateur"
+
 #: pyaggr3g470r/views.py:691 pyaggr3g470r/views.py:707
 msgid "This user does not exist."
 msgstr "Cet utilisateur n'existe pas."
@@ -273,10 +282,12 @@ msgstr "Détails"
 #: pyaggr3g470r/templates/favorites.html:18 pyaggr3g470r/templates/feed.html:8
 #: pyaggr3g470r/templates/feeds.html:33 pyaggr3g470r/templates/home.html:13
 #: pyaggr3g470r/templates/unread.html:18
+#: pyaggr3g470r/templates/admin/user.html:46
 msgid "Edit this feed"
 msgstr "Éditer ce flux"
 
 #: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:34
+#: pyaggr3g470r/templates/admin/user.html:47
 msgid "Delete this feed"
 msgstr "Supprimer ce flux"
 
@@ -354,6 +365,8 @@ msgid "Articles"
 msgstr "Articles"
 
 #: pyaggr3g470r/templates/feeds.html:14
+#: pyaggr3g470r/templates/admin/dashboard.html:15
+#: pyaggr3g470r/templates/admin/user.html:33
 msgid "Actions"
 msgstr "Actions"
 
@@ -476,10 +489,12 @@ msgid "profile"
 msgstr "profil"
 
 #: pyaggr3g470r/templates/management.html:17
+#: pyaggr3g470r/templates/admin/user.html:12
 msgid "Member since"
 msgstr "Membre depuis le"
 
 #: pyaggr3g470r/templates/management.html:18
+#: pyaggr3g470r/templates/admin/user.html:13
 msgid "Last seen:"
 msgstr "Vue la dernière fois le"
 
@@ -518,3 +533,59 @@ msgstr "Pas d'articles non lus"
 #: pyaggr3g470r/templates/unread.html:10
 msgid "Unread articles"
 msgstr "Articles non lus"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:7
+msgid "Registered users"
+msgstr "Utilisateurs enregistrés"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:12
+#, fuzzy
+msgid "Firstname"
+msgstr "Prénom"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:13
+msgid "Lastname"
+msgstr "Nom de famille"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:26
+msgid "View this user"
+msgstr "Voir cet utilisateur"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:27
+#: pyaggr3g470r/templates/admin/user.html:8
+msgid "Edit this user"
+msgstr "Éditer cet utilisateur"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:28
+msgid "Delete this user"
+msgstr "Supprimer cet utilisateur"
+
+#: pyaggr3g470r/templates/admin/dashboard.html:37
+msgid "As an administrator you are not listed in this table"
+msgstr "En tant qu'administrateur vous ne figurez pas dans ce tableau"
+
+#: pyaggr3g470r/templates/admin/user.html:9
+msgid "Membership"
+msgstr "Adhésion"
+
+#: pyaggr3g470r/templates/admin/user.html:22
+msgid "This user is not subscribed to any feed."
+msgstr "Cet utilisateur n'est pas encore abonné à des flux."
+
+#: pyaggr3g470r/templates/admin/user.html:24
+#, fuzzy
+msgid "Feeds"
+msgstr "Flux"
+
+#: pyaggr3g470r/templates/admin/user.html:29
+msgid "Name"
+msgstr "Nom de famille"
+
+#: pyaggr3g470r/templates/admin/user.html:32
+msgid "Number of articles"
+msgstr "Nombre d'articles"
+
+#: pyaggr3g470r/templates/admin/user.html:53
+#, fuzzy
+msgid "Add a new feed"
+msgstr "Ajouter un flux"
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 76343ead..362a3f58 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -118,7 +118,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())
 
 @babel.timezoneselector
 def get_timezone():
@@ -671,10 +671,10 @@ def create_user(user_id=None):
         if user_id is not None:
             user = User.query.filter(User.id == user_id).first()
             form = ProfileForm(obj=user)
-            message = "Edit the user <i>" + user.firstname + "</i>"
+            message = gettext('Edit the user') + ' <i>' + user.firstname + '</i>'
         else:
             form = ProfileForm()
-            message="Add a new user"
+            message = gettext('Add a new user')
         return render_template('/admin/create_user.html', form=form, message=message)
 
 @app.route('/admin/user/<int:user_id>/', methods=['GET'])
-- 
cgit