From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Apr 2012 14:30:57 +0000 (+0200)
Subject: fix i18n
X-Git-Tag: 1.4.3-2~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f41ebb832b2bcf3aee5c4773af99e5f76a160e74;p=telemeta.git

fix i18n
---

diff --git a/telemeta/models/__init__.py b/telemeta/models/__init__.py
index 7bf7a719..477ee68e 100644
--- a/telemeta/models/__init__.py
+++ b/telemeta/models/__init__.py
@@ -34,7 +34,6 @@
 # Author: Olivier Guilyardi <olivier@samalyse.com>
 #         Guillaume Pellerin <yomguy@parisson.com>
 
-from media import *
 from location import *
 from instrument import *
 from enum import *
@@ -42,4 +41,4 @@ from system import *
 from query import *
 from dublincore import *
 from language import *
-
+from media import *
diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index f43be2a6..f7942358 100644
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -1444,7 +1444,7 @@ class LastestRevisionsFeed(Feed):
     organization = settings.TELEMETA_ORGANIZATION
     subjects = settings.TELEMETA_SUBJECTS
     tags = ['title', 'description', 'comment']
-    title = organization + ' - Telemeta - ' + ugettext('Last changes')
+    title = organization.decode('utf8') + ' - Telemeta - ' + ugettext('Last changes')
     link = ""
     description = ' '.join([subject.decode('utf-8') for subject in subjects])
     n_items = 100