fix i18n

diff --git a/telemeta/models/__init__.py b/telemeta/models/__init__.py
index 7bf7a719c3f4ac87755996638c042be8dd29740e..477ee68eaa7913acde5c116406d4b9bf411a02fb 100644 (file)
--- 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 f43be2a696b6b2afa94a7a6906a94e36f1b5c18b..f794235836acbeac017e584c944bc67a6fafc62d 100644 (file)
--- 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