--- a/src/catedit/__init__.py Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/__init__.py Wed Apr 15 10:30:48 2015 +0200
@@ -14,6 +14,7 @@
from flask.ext.github import GitHub
from flask.ext.cache import Cache
from flask.ext.restful import Api
+from flask.ext.moment import Moment
from celery import Celery
from catedit.settings import AppSettings
@@ -56,6 +57,9 @@
celery = Celery(app.name, broker=app.config['CELERY_BROKER_URL'], backend=app.config['CELERY_RESULT_BACKEND'])
celery.conf.update(app.config)
+# Moment
+moment = Moment(app)
+
@github.access_token_getter
def token_getter():
"""
--- a/src/catedit/templates/categories/workshop.html Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/templates/categories/workshop.html Wed Apr 15 10:30:48 2015 +0200
@@ -140,7 +140,7 @@
{% for changeset in changeset_list %}
<tr>
<td class="col-md-1">{{changeset["author"]}}</td>
- <td class="col-md-2">{{changeset["date"]}}</td>
+ <td class="col-md-2">{{moment(changeset["date"]).fromNow()}}</td>
<td class="col-md-6">{{changeset["title"]}}</td>
<td class="col-md-2">{{changeset["comment_count"]}}</td>
<td class="col-md-1">
@@ -187,10 +187,10 @@
{% for discussion in discussion_list %}
<tr>
<td class="col-md-1">{{discussion["author"]}}</td>
- <td class="col-md-2">{{discussion["opening_date"]}}</td>
+ <td class="col-md-2">{{moment(discussion["opening_date"]).format('DD/MM/YYYY à HH:mm')}}</td>
<td class="col-md-5">{{discussion["title"]}}</td>
<td class="col-md-1">{{discussion["comment_count"]}}</td>
- <td class="col-md-2">{{discussion["last_updated"]}}</td>
+ <td class="col-md-2">{{moment(discussion["last_updated"]).fromNow()}}</td>
<td class="col-md-1">
<a href="{{ url_for('social.discussion', repository=current_repository, discussion_id=discussion['id'])}}" title="Voir la discussion" class="btn btn-default">
<span class=" glyphicon glyphicon-log-in"/>
--- a/src/catedit/templates/layout.html Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/templates/layout.html Wed Apr 15 10:30:48 2015 +0200
@@ -9,6 +9,8 @@
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet">
<script src="{{ url_for('static', filename='js/jquery-1.11.2.min.js') }}"></script>
+ {{ moment.include_moment() }}
+ {{ moment.lang("fr") }}
{% if current_repository and session.get('tasks',{}).get(current_repository,[]) and running_tasks_nb %}
<script>
var check_tasks_url = "{{url_for('meta.query_tasks_status', repository=current_repository)}}";
--- a/src/catedit/templates/social/changesets_index.html Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/templates/social/changesets_index.html Wed Apr 15 10:30:48 2015 +0200
@@ -50,7 +50,7 @@
{% for changeset in changeset_list %}
<tr>
<td class="col-md-1">{{changeset["author"]}}</td>
- <td class="col-md-2">{{changeset["date"]}}</td>
+ <td class="col-md-2">{{moment(changeset["date"]).fromNow()}}</td>
<td class="col-md-6">{{changeset["title"]}}</td>
<td class="col-md-2">{{changeset["comment_count"]}}</td>
<td class="col-md-1">
--- a/src/catedit/templates/social/comment_thread_layout.html Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/templates/social/comment_thread_layout.html Wed Apr 15 10:30:48 2015 +0200
@@ -30,7 +30,7 @@
<theader>
<tr class="info">
<th class="col-md-2"> {{comments["author"]}} </td>
- <th class="col-md-2"> {{comments["opening_date"]}} </td>
+ <th class="col-md-2"> {{moment(comments["opening_date"]).format('DD/MM/YYYY à HH:mm')}} </td>
<th class="col-md-8"> <strong>Titre: {{comments["title"]}}</strong> </td>
</tr>
<tr>
@@ -47,7 +47,7 @@
{% for comment in comments["comment_list"] %}
<tr>
<td class="col-md-2"> {{comment["author"]}} </td>
- <td class="col-md-2"> {{comment["date"]}} </td>
+ <td class="col-md-2"> {{moment(comment["date"]).fromNow()}} </td>
<td class="col-md-8"> {{comment["body"]}} </td>
</tr>
{% endfor %}
--- a/src/catedit/templates/social/discussions_index.html Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/templates/social/discussions_index.html Wed Apr 15 10:30:48 2015 +0200
@@ -58,10 +58,10 @@
{% for discussion in discussions_list %}
<tr>
<td class="col-md-1">{{discussion["author"]}}</td>
- <td class="col-md-2">{{discussion["opening_date"]}}</td>
+ <td class="col-md-2">{{moment(discussion["opening_date"]).format('DD/MM/YYYY à HH:mm')}}</td>
<td class="col-md-5">{{discussion["title"]}}</td>
<td class="col-md-1">{{discussion["comment_count"]}}</td>
- <td class="col-md-2">{{discussion["last_updated"]}}</td>
+ <td class="col-md-2">{{moment(discussion["last_updated"]).fromNow()}}</td>
<td class="col-md-1">
<a href="{{ url_for('social.discussion', repository=current_repository, discussion_id=discussion['id'])}}" title="Voir la discussion" class="btn btn-default">
<span class=" glyphicon glyphicon-log-in"/>
--- a/src/catedit/views/utils.py Tue Apr 14 16:25:20 2015 +0200
+++ b/src/catedit/views/utils.py Wed Apr 15 10:30:48 2015 +0200
@@ -527,8 +527,6 @@
return datetime.strptime(
date,
"%Y-%m-%dT%H:%M:%SZ"
- ).strftime(
- "%d/%m/%Y à %H:%M"
)
--- a/virtualenv/requirements.txt Tue Apr 14 16:25:20 2015 +0200
+++ b/virtualenv/requirements.txt Wed Apr 15 10:30:48 2015 +0200
@@ -6,6 +6,7 @@
celery==3.1.17
Flask==0.10.1
Flask-Cache==0.13.1
+Flask-Moment==0.4.0
Flask-RESTful==0.3.1
Flask-WTF==0.10.3
GitHub-Flask==2.0.0