Refactor hashtag view. Translate hashtag view

counter/models.py

@@ -56,8 +56,8 @@ class Reset(models.Model):
 
 
 class Like(models.Model):
-    liker = models.ForeignKey('Counter', verbose_name='likeur')
-    reset = models.ForeignKey('Reset', verbose_name='seum')
+    liker = models.ForeignKey('Counter', verbose_name='likeur', related_name='likes')
+    reset = models.ForeignKey('Reset', verbose_name='seum', related_name='likes')
     timestamp = models.DateTimeField('date et heure', auto_now_add=True)
 
     class Meta:
@@ -81,8 +81,8 @@ class Keyword(models.Model):
 
 
 class Hashtag(models.Model):
-    keyword = models.ForeignKey('Keyword', verbose_name='hashtag')
-    reset = models.ForeignKey('Reset', verbose_name='remise à zéro')
+    keyword = models.ForeignKey('Keyword', verbose_name='hashtag', related_name='hashtags')
+    reset = models.ForeignKey('Reset', verbose_name='remise à zéro', related_name='hashtags')
 
     class Meta:
         verbose_name = 'hashtag'

counter/templates/hashtagTemplate.html

@@ -1,7 +1,14 @@
-{% extends 'baseTemplate.html' %} {% block title %}{{hashtag}}{% endblock %} {% block content %} {% load hashtags %}
+{% extends 'baseTemplate.html' %}
+
+{% block title %}{{hashtag}}{% endblock %}
+
+{% block content %}
+{% load i18n %}
+{% load hashtags %}
+
 <div class="text-center">
   <h1>
-      <a class="counter-link" href="{% url 'home' %}"><b>{{hashtag}}</b></a>
+    <a class="counter-link" href="{% url 'home' %}"><b>{{hashtag}}</b></a>
   </h1>
 </div>
 <div class="container-fluid">
@@ -9,23 +16,24 @@
     <div class="col-sm-12">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h2 class="panel-title">Liste des seums contenant {{ hashtag }}<small class="badge pull-right">{{ totalNumber }}</small></h2>
+          <h2 class="panel-title">
+            {% trans "Seums containing" %} {{ hashtag }}<small class="badge pull-right">{{ totalNumber }}</small></h2>
         </div>
         <div class="panel-body">
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Date</th>
-                <th>Motif</th>
-                <th>Victime</th>
-                <th>Fouteur de seum</th>
-                <th>Nombre de likes</th>
+                <th>{% trans "Date" %}</th>
+                <th>{% trans "Motive" %}</th>
+                <th>{% trans "Victim" %}</th>
+                <th>{% trans "Seum giver" %}</th>
+                <th>{% trans "Number of likes" %}</th>
               </tr>
             </thead>
             <tbody>
               {% for reset in resets %}
               <tr>
-                <td><b>{{ reset.date }}</b></td>
+                <td><b>{{ reset.timestamp | date:"SHORT_DATETIME_FORMAT" }}</b></td>
                 <td>{{ reset.reason | hashtag }}</td>
                 <td>{{ reset.counter.trigramme }}</td>
                 <td>
@@ -45,7 +53,7 @@
 </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>

counter/urls.py

@@ -3,13 +3,13 @@ from counter.rss import SeumFeed
 from django.contrib.auth import views as auth_views
 from django.views.generic.base import RedirectView
 
-from . import views
+from .views import views, hashtag
 
 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'^hashtag/(?P<keyword>.+)/$', views.hashtag, name='hashtag'),
+    url(r'^hashtag/(?P<keyword>.+)/$', hashtag.get, name='hashtag'),
     url(r'^rss/$', SeumFeed()),
     url(r'^create_user/$', views.createUser, name='create_user'),
     url(r'^like/$', views.like, name='like'),

counter/views/hashtag.py

@@ -0,0 +1,36 @@
+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
+
+from counter.models import *
+
+
+@login_required
+def get(request, keyword):
+    try:
+        keyword = Keyword.objects.get(text=keyword)
+    except Keyword.DoesNotExist:
+        print('erreur !')
+        return HttpResponseRedirect(reverse('home'))
+
+    hashtag = '#' + keyword.text
+    resets = Reset.objects.prefetch_related('likes', 'who', 'counter').filter(hashtags__keyword=keyword).order_by('-timestamp')
+    totalNumber = resets.count()
+    cur_lang = get_language()
+
+    for reset in resets:
+        if reset.who is None or reset.who == reset.counter:
+            reset.selfSeum = True
+        else:
+            reset.selfSeum = False
+        reset.likeCount = reset.likes.count()
+    return render(request, 'hashtagTemplate.html', {
+        'hashtag': hashtag,
+        'totalNumber': totalNumber,
+        'resets': resets,
+    })

counter/views.py

@@ -456,31 +456,31 @@ def counter(request, id_counter):
     })
 
 
-@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,
-    })
+# @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):

locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,54 @@
+# 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: 2017-01-21 13:36+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"
+
+#: counter/templates/hashtagTemplate.html:20
+msgid "Seums containing"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:26
+msgid "Date"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:27
+msgid "Motive"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:28
+msgid "Victim"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:29
+msgid "Seum giver"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:30
+msgid "Number of likes"
+msgstr ""
+
+#: counter/templates/hashtagTemplate.html:56
+msgid "Back to counters list"
+msgstr ""
+
+#: seum/settings.py:110
+msgid "French"
+msgstr ""
+
+#: seum/settings.py:111
+msgid "English"
+msgstr ""

locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,58 @@
+# 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: 2017-01-21 13:36+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"
+
+#: counter/templates/hashtagTemplate.html:20
+msgid "Seums containing"
+msgstr "Liste des seums contenant"
+
+#: counter/templates/hashtagTemplate.html:26
+msgid "Date"
+msgstr "Date"
+
+#: counter/templates/hashtagTemplate.html:27
+msgid "Motive"
+msgstr "Motif"
+
+#: counter/templates/hashtagTemplate.html:28
+msgid "Victim"
+msgstr "Victime"
+
+#: counter/templates/hashtagTemplate.html:29
+msgid "Seum giver"
+msgstr "Fouteur de seum"
+
+#: counter/templates/hashtagTemplate.html:30
+msgid "Number of likes"
+msgstr "Nombre de likes"
+
+#: counter/templates/hashtagTemplate.html:56
+msgid "Back to counters list"
+msgstr "Retour à la liste des compteurs"
+
+#: seum/settings.py:110
+msgid "French"
+msgstr "Français"
+
+#: seum/settings.py:111
+msgid "English"
+msgstr "Anglais"
+
+#~ msgid "Seum"
+#~ msgstr "Seum"

seum/urls.py

@@ -23,7 +23,6 @@ urlpatterns = i18n_patterns(
     url(r'^admin/', admin.site.urls),
     url(r'^favicon\.ico$', RedirectView.as_view(url='/static/favicon.ico')),
     url(r'^robots\.txt$', RedirectView.as_view(url='/static/robots.txt')),
-    url(r'^', include('counter.urls')),
 )
 
 if settings.DEBUG:
@@ -32,3 +31,4 @@ if settings.DEBUG:
         url(r'^__debug__/', include(debug_toolbar.urls)),
     )
 
+urlpatterns += i18n_patterns(url(r'^', include('counter.urls')), )