Merge branch 'develop' into 'master' to include the latests fixes on …

…the translation files after updating them after running the makemessages adminitrative tasks.
vitorfs · Sep 17, 2017 · ff8e402 · ff8e402
2 parents d198a9f + b0584a0
commit ff8e402
Show file tree

Hide file tree

Showing 8 changed files with 1,194 additions and 610 deletions.
diff --git a/bootcamp/locale/es/LC_MESSAGES/django.po b/bootcamp/locale/es/LC_MESSAGES/django.po
diff --git a/bootcamp/locale/fr/LC_MESSAGES/django.mo b/bootcamp/locale/fr/LC_MESSAGES/django.mo
diff --git a/bootcamp/locale/fr/LC_MESSAGES/django.po b/bootcamp/locale/fr/LC_MESSAGES/django.po
diff --git a/bootcamp/locale/jp/LC_MESSAGES/django.po b/bootcamp/locale/jp/LC_MESSAGES/django.po
diff --git a/bootcamp/locale/pt_BR/LC_MESSAGES/django.po b/bootcamp/locale/pt_BR/LC_MESSAGES/django.po
diff --git a/bootcamp/locale/zh_CN/LC_MESSAGES/django.po b/bootcamp/locale/zh_CN/LC_MESSAGES/django.po
diff --git a/bootcamp/messenger/templates/messenger/inbox.html b/bootcamp/messenger/templates/messenger/inbox.html
@@ -13,7 +13,7 @@
       {% endfor %}
     {% else %}
       <h4>{% trans 'This is the begining of a great new conversation.' %}</h4>
-      <p>{% trans 'Let\'s get started now!' %}</p>
+      <p>{% trans "Let's get started now!" %}</p>
     {% endif %}
     <li class="send-message"></li>
     <script type="text/javascript">window.onload = $('.conversation').scrollTop($('.conversation')[0].scrollHeight);</script>

diff --git a/bootcamp/messenger/views.py b/bootcamp/messenger/views.py
@@ -3,7 +3,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.http import HttpResponse, HttpResponseBadRequest
-from django.shortcuts import redirect, render
+from django.shortcuts import render
 
 from bootcamp.decorators import ajax_required
 from bootcamp.messenger.models import Message