From 4bb4c06a30d7188d269d1e15ed78b77d32e4e578 Mon Sep 17 00:00:00 2001
From: Luan <luanpab@gmail.com>
Date: Mon, 11 Nov 2013 15:42:39 -0200
Subject: [PATCH] Minor fix on badge translation on templates

---
 src/accounts/templates/accounts/user_detail.html | 5 +++--
 src/colab/custom_settings.py                     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/accounts/templates/accounts/user_detail.html b/src/accounts/templates/accounts/user_detail.html
index b0ee97c..b284f26 100644
--- a/src/accounts/templates/accounts/user_detail.html
+++ b/src/accounts/templates/accounts/user_detail.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load i18n gravatar %}
+{% load i18n gravatar i18n_model %}
 
 
 {% block head_js %}
@@ -108,7 +108,8 @@
             <div class="panel-body">
               <div>
                 {% for badge in user_.badge_set.all %}
-                  <img src="{{ badge.get_badge_url }}" title="{{ badge.description }}" />
+                  {% translate badge as badge_trans %}
+                  <img src="{{ badge.get_badge_url }}" title="({{ badge_trans.title }}) {{ badge_trans.description }}" />
                 {% endfor %}
               </div>
             </div>
diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index a1bae68..f83cd99 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -8,8 +8,8 @@ TIME_ZONE = 'America/Sao_Paulo'
 
 gettext = lambda s: s
 LANGUAGES = (
-    ('pt-br', gettext('Portuguese')),
     ('en', gettext('English')),
+    ('pt-br', gettext('Portuguese')),
     ('es', gettext('Spanish')),
 )
 
@@ -18,7 +18,7 @@ DJANGO_DATE_FORMAT_TO_JS = {
     'es': ('es', 'dd/MM/yyyy'),
 }
 
-LANGUAGE_CODE = 'pt-br'
+LANGUAGE_CODE = 'en'
 
 # The absolute path to the folder containing the attachments
 ATTACHMENTS_FOLDER_PATH = '/home/colab/trac/attachments/'
--
libgit2 0.21.2