Translate individual counter page

counter/models.py

@@ -26,7 +26,7 @@ class Counter(models.Model):
 class Reset(models.Model):
     timestamp = models.DateTimeField(_('datetime'), auto_now_add=True)
     reason = models.TextField(_('reason'))
-    counter = models.ForeignKey('Counter', related_name='counter', verbose_name=_('victim'))
+    counter = models.ForeignKey('Counter', related_name='resets', verbose_name=_('victim'))
     who = models.ForeignKey('Counter', related_name='who', verbose_name=_('seum giver'), blank=True, null=True, default=None)
 
     def __str__(self):

counter/templates/counterTemplate.html

@@ -1,7 +1,14 @@
-{% extends 'baseTemplate.html' %} {% block title %}{{counter.trigramme}}{% endblock %} {% block content %} {% load hashtags %}
+{% extends 'baseTemplate.html' %}
+
+{% block title %}{{counter.trigramme}}{% endblock %}
+
+{% block content %}
+{% load i18n %}
+{% load hashtags %}
+
 <div class="text-center">
   <h1>
-      <a class="counter-link" href="{% url 'home' %}"><b>{{counter.trigramme}}</b> <small>{{ counter.name }}</small></a>
+      <a class="counter-link" href="{% url 'home' %}"><b>{{ counter.trigramme }}</b> <small>{{ counter.name }}</small></a>
   </h1>
 </div>
 <div class="container-fluid">
@@ -37,32 +44,34 @@
         </div>
         <div class="seum-counter panel-body" style="height:125px" id="container{{counter.id}}">
           {% if counter.lastReset.noSeum %}
-          <strong>N'a pas encore eu le seum.</strong>
-          <br> {% else %}
-          <strong>
-          {% if counter.lastReset.selfSeum %}
-              A eu le seum il y a {{ counter.lastReset.formatted_delta }}.
+            <strong>{% trans "Has not got the seum yet" %}.</strong><br />
           {% else %}
-              {{ counter.lastReset.who.trigramme }} lui a foutu le seum il y a {{ counter.lastReset.formatted_delta }}.
+            <strong>
+            {% if counter.lastReset.selfSeum %}
+              {% trans "Has got the seum" %} {{ counter.lastReset.formatted_delta }}.
+            {% else %}
+              {{ counter.lastReset.who.trigramme }} {% trans "threw him/her the seum" %} {{ counter.lastReset.formatted_delta }}.
+            {% endif %}
+            </strong><br />
           {% endif %}
-          </strong>
-          <br> {% endif %}
 
           <p>{{ counter.lastReset.reason | hashtag }}</p>
           <div class="text-center">
-            <button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{counter.id}})">Remettre à zéro</button>
+            <button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{counter.id}})">
+              {% trans "Reset" %}
+            </button>
           </div>
           <form style="display:none" id="counter{{counter.id}}" action="{% url 'reset-counter' %}" method="post">
             {% csrf_token %}
             <div class="form-group">
-              <label for="reason">Motif du seum :</label>
+              <label for="reason">{% trans "Motive for the seum:" %}</label>
               <input id="reason{{counter.id}}" type="text" class="form-control" name="reason"></input>
             </div>
             <input type="hidden" name="counter" value="{{counter.id}}"></input>
             <input type="hidden" name="redirect" value="{% url 'counter' id_counter=counter.id %}"></input>
             <input type="hidden" name="who" value="{{myCounter.id}}"></input>
             <div class="text-center">
-              <button type="submit" class="btn btn-default btn-success">Foutre le seum</button>
+              <button type="submit" class="btn btn-default btn-success">{% trans "Throw the seum" %}</button>
             </div>
           </form>
         </div>
@@ -71,15 +80,15 @@
     <div class="col-md-9">
       <div class="panel panel-info">
         <div class="panel-heading">
-          <h2 class="panel-title">Timeline du seum</h2>
+          <h2 class="panel-title">{% trans "Timeline of the seum" %}</h2>
         </div>
         <div class="graphs timeline panel-body">
             {% if counter.lastReset.noSeum %}
-            <div class="text-center text-muted">
-                <p>Pas encore de timeline du seum...</p>
-            </div>
+              <div class="text-center text-muted">
+                <p>{% trans "No timeline of the seum yet..." %}</p>
+              </div>
             {% else %}
-            {{chart.as_html}}
+              {{ chart.as_html }}
             {% endif %}
         </div>
       </div>
@@ -89,30 +98,33 @@
     <div class="col-sm-12">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h2 class="panel-title">Historique du seum <small class="badge pull-right">{{seumFrequency}}/seum</small></h2>
+          <h2 class="panel-title">
+            {% trans "Seum history" %}
+            <small class="badge pull-right">{{ seumFrequency }}/seum</small>
+          </h2>
         </div>
         <div class="panel-body">
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Date</th>
-                <th>Motif</th>
-                <th>Fouteur de seum</th>
-                <th>Nombre de likes</th>
+                <th>{% trans "Date" %}</th>
+                <th>{% trans "Motive" %}</th>
+                <th>{% trans "Seum thrower" %}</th>
+                <th>{% trans "Number of likes" %}</th>
               </tr>
             </thead>
             <tbody>
               {% for reset in resets %}
-              <tr>
-                <td><b>{{ reset.date }}</b></td>
-                <td>{{ reset.reason | hashtag }}</td>
-                <td>
-                {% if not reset.selfSeum %}
-                    {{ reset.who.trigramme }}
-                {% endif %}
-                </td>
-                <td>{{ reset.likeCount }}</td>
-              </tr>
+                <tr>
+                  <td><b>{{ reset.date | date:"SHORT_DATETIME_FORMAT" }}</b></td>
+                  <td>{{ reset.reason | hashtag }}</td>
+                  <td>
+                    {% if not reset.selfSeum %}
+                      {{ reset.who.trigramme }}
+                    {% endif %}
+                  </td>
+                  <td>{{ reset.likeCount }}</td>
+                </tr>
               {% endfor %}
             </tbody>
           </table>
@@ -123,8 +135,9 @@
 </div>
 <div class="row">
   <div class="text-center">
-    <a class="btn btn-success" href="{% url 'home' %}">Retour à la liste des compteurs</a>
+    <a class="btn btn-success" href="{% url 'home' %}">{% trans "Back to counters list" %}</a>
   </div>
 </div>
 </div>
+
 {% endblock %}

counter/templates/hashtagTemplate.html

@@ -26,7 +26,7 @@
                 <th>{% trans "Date" %}</th>
                 <th>{% trans "Motive" %}</th>
                 <th>{% trans "Victim" %}</th>
-                <th>{% trans "Seum giver" %}</th>
+                <th>{% trans "Seum thrower" %}</th>
                 <th>{% trans "Number of likes" %}</th>
               </tr>
             </thead>

counter/urls.py

@@ -3,12 +3,12 @@ from counter.rss import SeumFeed
 from django.contrib.auth import views as auth_views
 from django.views.generic.base import RedirectView
 
-from .views import views, hashtag
+from .views import views, hashtag, counter
 
 urlpatterns = [
     url(r'^$', views.home, name='home'),
     url(r'^reset-counter/$', views.resetCounter, name='reset-counter'),
-    url(r'^counter/(?P<id_counter>\d+)/$', views.counter, name='counter'),
+    url(r'^counter/(?P<id_counter>\d+)/$', counter.get, name='counter'),
     url(r'^hashtag/(?P<keyword>.+)/$', hashtag.get, name='hashtag'),
     url(r'^rss/$', SeumFeed()),
     url(r'^create_user/$', views.createUser, name='create_user'),

counter/views/counter.py

@@ -0,0 +1,103 @@
+from datetime import datetime, timedelta
+import copy
+
+from django.contrib.auth.decorators import login_required
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from django.utils.translation import ugettext as _, get_language
+
+import arrow
+from babel.dates import format_timedelta, format_datetime
+from graphos.renderers import gchart
+from graphos.sources.model import ModelDataSource
+
+from counter.models import *
+
+
+@login_required
+def get(request, id_counter):
+    try:
+        myCounter = Counter.objects.get(user__id=request.user.id)
+    except Counter.DoesNotExist:
+        return HttpResponseRedirect(reverse('login'))
+
+    counter = Counter.objects.prefetch_related('resets', 'resets__likes').get(pk=id_counter)
+    resets = counter.resets.order_by('-timestamp')
+    timezero = timedelta(0)
+
+    # Display
+    if resets.count() == 0:
+        counter.lastReset = Reset()
+        counter.lastReset.delta = timezero
+        counter.lastReset.noSeum = True
+        seumFrequency = _('unknown')
+    else:
+        firstReset = resets.reverse()[0]
+        counter.lastReset = resets[0]
+        counter.lastReset.noSeum = False
+        if counter.lastReset.who is None or counter.lastReset.who == counter:
+            counter.lastReset.selfSeum = True
+        else:
+            counter.lastReset.selfSeum = False
+
+        counter.lastReset.formatted_delta = arrow.Arrow.fromdatetime(counter.lastReset.timestamp).humanize(locale=get_language())
+        counter.seumCount = counter.resets.count()
+        seumFrequency = format_timedelta((datetime.now() - firstReset.timestamp.replace(tzinfo=None)) / counter.seumCount,
+            locale=get_language(), threshold=1)
+
+        counter.lastLikes = list(counter.lastReset.likes.all())
+        counter.alreadyLiked = myCounter.id in [l.liker.id for l in counter.lastLikes]
+        counter.likeCount = len(counter.lastLikes)
+        if counter.likeCount > 0:
+            counter.likersString = ", ".join(like.liker.trigramme for like in counter.lastLikes)
+
+    for reset in resets:
+        if reset.who is None or reset.who == reset.counter:
+            reset.selfSeum = True
+        else:
+            reset.selfSeum = False
+        reset.date = reset.timestamp
+        reset.likeCount = reset.likes.count()
+
+    # Timeline graph
+    # Data pre-processing
+    if not counter.lastReset.noSeum:
+        resets_graph = resets
+        for reset in resets_graph:
+            reset.timestamp = {
+                'v': reset.timestamp.timestamp(),
+                'f': arrow.Arrow.fromdatetime(reset.timestamp).humanize(locale=get_language())
+            }
+            if reset.selfSeum:
+                reset.Seum = {'v': 0, 'f': reset.reason}
+            else:
+                reset.Seum = {'v': 0, 'f': _('From %(who)s: %(reason)s') % {'who': reset.who.trigramme, 'reason': reset.reason}}
+
+        # Drawing the graph
+        data = ModelDataSource(resets, fields=['timestamp', 'Seum'])
+        chart = gchart.LineChart(data, options={
+            'lineWidth': 0,
+            'pointSize': 10,
+            'title': '',
+            'vAxis': {'ticks': []},
+            'hAxis': {'ticks': [{
+                'v': firstReset.timestamp.timestamp(),
+                'f': arrow.Arrow.fromdatetime(firstReset.timestamp).humanize(locale=get_language())
+            }, {
+                'v': datetime.now().timestamp(),
+                'f': 'Présent'}
+            ]},
+            'legend': 'none',
+            'height': 90
+        })
+    else:
+        chart = None
+
+    return render(request, 'counterTemplate.html', {
+        'counter': counter,
+        'chart': chart,
+        'resets': resets,
+        'seumFrequency': seumFrequency,
+        'myCounter': myCounter,
+    })

counter/views/hashtag.py

@@ -1,12 +1,12 @@
-from babel.dates import format_timedelta, format_datetime
-import arrow
-
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.translation import ugettext as _, get_language
 
+import arrow
+from babel.dates import format_timedelta, format_datetime
+
 from counter.models import *
 
 

counter/views/views.py

@@ -353,136 +353,6 @@ def resetCounter(request):
     return HttpResponseRedirect(data['redirect'][0])
 
 
-@login_required
-def counter(request, id_counter):
-    try:
-        myCounter = Counter.objects.get(user__id=request.user.id)
-    except Counter.DoesNotExist:
-        return HttpResponseRedirect(reverse('login'))
-
-    counter = Counter.objects.get(pk=id_counter)
-    resets = Reset.objects.filter(counter=counter).order_by('-timestamp')
-    timezero = timedelta(0)
-    # Display
-    if (resets.count() == 0):
-        counter.lastReset = Reset()
-        counter.lastReset.delta = timezero
-        counter.lastReset.noSeum = True
-        seumFrequency = 'inconnu'
-    else:
-        firstReset = copy.copy(resets[len(resets) - 1])
-        counter.lastReset = resets[0]
-        counter.lastReset.noSeum = False
-        if (counter.lastReset.who is None or
-                counter.lastReset.who.id == counter.id):
-            counter.lastReset.selfSeum = True
-        else:
-            counter.lastReset.selfSeum = False
-        counter.lastReset.delta = datetime.now(
-        ) - counter.lastReset.timestamp.replace(tzinfo=None)
-        counter.lastReset.formatted_delta = format_timedelta(
-            counter.lastReset.delta, locale='fr', threshold=1)
-        counter.seumCount = Reset.objects.filter(
-            counter=counter).count()
-        seumFrequency = format_timedelta((
-            datetime.now() - firstReset.timestamp.replace(tzinfo=None)) /
-            counter.seumCount, locale='fr', threshold=1)
-        counter.alreadyLiked = (Like.objects.filter(
-            reset=counter.lastReset, liker=myCounter).exists())
-        likesMe = Like.objects.filter(
-            reset=counter.lastReset)
-        counter.likeCount = likesMe.count()
-        if counter.likeCount > 0:
-            counter.likersString = functools.reduce(
-                lambda a, b: a + ", " + b,
-                [like.liker.trigramme for like in likesMe])
-
-    for reset in resets:
-        if (reset.who is None or
-                reset.who.id == reset.counter.id):
-            reset.selfSeum = True
-        else:
-            reset.selfSeum = False
-        reset.date = format_datetime(
-            reset.timestamp, locale='fr',
-            format="dd/MM/Y HH:mm")
-        reset.likeCount = Like.objects.filter(reset=reset).count()
-
-    # Timeline graph
-    # Data pre-processing
-    if not counter.lastReset.noSeum:
-        resets_graph = resets
-        for reset in resets_graph:
-            reset.timestamp = {
-                'v': reset.timestamp.timestamp(),
-                'f': "Il y a " + format_timedelta(
-                    datetime.now() - reset.timestamp.replace(tzinfo=None),
-                    locale='fr', threshold=1)
-            }
-            if reset.selfSeum:
-                reset.Seum = {'v': 0, 'f': reset.reason}
-            else:
-                reset.Seum = {'v': 0, 'f': 'De ' +
-                              reset.who.trigramme + ' : ' + reset.reason}
-        # Drawing the graph
-        data = ModelDataSource(
-            resets, fields=['timestamp', 'Seum'])
-        chart = gchart.LineChart(data, options={
-            'lineWidth': 0,
-            'pointSize': 10,
-            'title': '',
-            'vAxis': {'ticks': []},
-            'hAxis': {'ticks': [{
-                'v': firstReset.timestamp.timestamp(),
-                'f': 'Il y a ' + format_timedelta(
-                    datetime.now() - firstReset.timestamp.replace(tzinfo=None),
-                    locale='fr', threshold=1)
-            }, {
-                'v': datetime.now().timestamp(),
-                'f': 'Présent'}
-            ]},
-            'legend': 'none',
-            'height': 90
-        })
-    else:
-        chart = None
-
-    return render(request, 'counterTemplate.html', {
-        'counter': counter,
-        'chart': chart,
-        'resets': resets,
-        'seumFrequency': seumFrequency,
-        'myCounter': myCounter,
-    })
-
-
-# @login_required
-# def hashtag(request, keyword):
-#     try:
-#         keyword = Keyword.objects.get(text=keyword)
-#     except Keyword.DoesNotExist:
-#         print('erreur !')
-#         return HttpResponseRedirect(reverse('home'))
-#     hashtag = '#' + keyword.text
-#     resets = Reset.objects.filter(
-#         hashtag__keyword=keyword).order_by('-timestamp')
-#     for reset in resets:
-#         if (reset.who is None or
-#                 reset.who.id == reset.counter.id):
-#             reset.selfSeum = True
-#         else:
-#             reset.selfSeum = False
-#         reset.date = format_datetime(
-#             reset.timestamp, locale='fr',
-#             format="dd/MM/Y HH:mm")
-#         reset.likeCount = Like.objects.filter(reset=reset).count()
-#     return render(request, 'hashtagTemplate.html', {
-#         'hashtag': hashtag,
-#         'totalNumber': resets.count(),
-#         'resets': resets,
-#     })
-
-
 def createUser(request):
     if (request.method == 'POST'):
         # create a form instance and populate it with data from the request:

locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-21 14:29+0100\n"
+"POT-Creation-Date: 2017-01-21 15:44+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"
@@ -121,34 +121,84 @@ msgstr ""
 msgid "%(keyword)s for %(who)s"
 msgstr ""
 
-#: counter/templates/hashtagTemplate.html:20
-msgid "Seums containing"
+#: counter/templates/counterTemplate.html:47
+msgid "Has not got the seum yet"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:51
+msgid "Has got the seum"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:53
+msgid "threw him/her the seum"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:61
+msgid "Reset"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:67
+msgid "Motive for the seum:"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:74
+msgid "Throw the seum"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:83
+msgid "Timeline of the seum"
+msgstr ""
+
+#: counter/templates/counterTemplate.html:88
+msgid "No timeline of the seum yet..."
+msgstr ""
+
+#: counter/templates/counterTemplate.html:102
+msgid "Seum history"
 msgstr ""
 
+#: counter/templates/counterTemplate.html:110
 #: counter/templates/hashtagTemplate.html:26
 msgid "Date"
 msgstr ""
 
+#: counter/templates/counterTemplate.html:111
 #: counter/templates/hashtagTemplate.html:27
 msgid "Motive"
 msgstr ""
 
-#: counter/templates/hashtagTemplate.html:28
-msgid "Victim"
-msgstr ""
-
+#: counter/templates/counterTemplate.html:112
 #: counter/templates/hashtagTemplate.html:29
-msgid "Seum giver"
+msgid "Seum thrower"
 msgstr ""
 
+#: counter/templates/counterTemplate.html:113
 #: counter/templates/hashtagTemplate.html:30
 msgid "Number of likes"
 msgstr ""
 
+#: counter/templates/counterTemplate.html:138
 #: counter/templates/hashtagTemplate.html:56
 msgid "Back to counters list"
 msgstr ""
 
+#: counter/templates/hashtagTemplate.html:20
+msgid "Seums containing"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:28
+msgid "Victim"
+msgstr ""
+
+#: counter/views/counter.py:34
+msgid "unknown"
+msgstr ""
+
+#: counter/views/counter.py:75
+#, python-format
+msgid "From %(who)s: %(reason)s"
+msgstr ""
+
 #: seum/settings.py:111
 msgid "English"
 msgstr ""

locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-21 14:29+0100\n"
+"POT-Creation-Date: 2017-01-21 15:44+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"
@@ -126,34 +126,86 @@ msgstr "hashtags"
 msgid "%(keyword)s for %(who)s"
 msgstr "%(keyword)s pour %(who)s"
 
-#: counter/templates/hashtagTemplate.html:20
-msgid "Seums containing"
-msgstr "Liste des seums contenant"
+#: counter/templates/counterTemplate.html:47
+msgid "Has not got the seum yet"
+msgstr "N'a pas encore eu le seum"
+
+#: counter/templates/counterTemplate.html:51
+msgid "Has got the seum"
+msgstr "A eu le seum"
+
+#: counter/templates/counterTemplate.html:53
+msgid "threw him/her the seum"
+msgstr "a foutu le seum"
+
+#: counter/templates/counterTemplate.html:61
+#, fuzzy
+#| msgid "reset"
+msgid "Reset"
+msgstr "Remise à zéro"
 
+#: counter/templates/counterTemplate.html:67
+msgid "Motive for the seum:"
+msgstr "Motif du seum"
+
+#: counter/templates/counterTemplate.html:74
+msgid "Throw the seum"
+msgstr "Foutre le seum"
+
+#: counter/templates/counterTemplate.html:83
+msgid "Timeline of the seum"
+msgstr "Timeline du seum"
+
+#: counter/templates/counterTemplate.html:88
+msgid "No timeline of the seum yet..."
+msgstr "Pas encore de timeline du seum..."
+
+#: counter/templates/counterTemplate.html:102
+msgid "Seum history"
+msgstr "Historique du seum"
+
+#: counter/templates/counterTemplate.html:110
 #: counter/templates/hashtagTemplate.html:26
 msgid "Date"
 msgstr "Date"
 
+#: counter/templates/counterTemplate.html:111
 #: counter/templates/hashtagTemplate.html:27
 msgid "Motive"
 msgstr "Motif"
 
-#: counter/templates/hashtagTemplate.html:28
-msgid "Victim"
-msgstr "Victime"
-
+#: counter/templates/counterTemplate.html:112
 #: counter/templates/hashtagTemplate.html:29
-msgid "Seum giver"
+msgid "Seum thrower"
 msgstr "Fouteur de seum"
 
+#: counter/templates/counterTemplate.html:113
 #: counter/templates/hashtagTemplate.html:30
 msgid "Number of likes"
 msgstr "Nombre de likes"
 
+#: counter/templates/counterTemplate.html:138
 #: counter/templates/hashtagTemplate.html:56
 msgid "Back to counters list"
 msgstr "Retour à la liste des compteurs"
 
+#: counter/templates/hashtagTemplate.html:20
+msgid "Seums containing"
+msgstr "Liste des seums contenant"
+
+#: counter/templates/hashtagTemplate.html:28
+msgid "Victim"
+msgstr "Victime"
+
+#: counter/views/counter.py:34
+msgid "unknown"
+msgstr "inconnu"
+
+#: counter/views/counter.py:75
+#, python-format
+msgid "From %(who)s: %(reason)s"
+msgstr "De %(who)s : %(reason)s"
+
 #: seum/settings.py:111
 msgid "English"
 msgstr "Anglais"