From f6466a0d8b178fce2b3cc5cdba28d82f17c7214a Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnau@debian.org>
Date: Sat, 7 Feb 2009 14:49:36 +0000
Subject: [PATCH] Convert language name to unicode if needed

---
 lib/core.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/core.py b/lib/core.py
index 8943f3d..4db07e3 100644
--- a/lib/core.py
+++ b/lib/core.py
@@ -300,8 +300,10 @@ class PyotoCore(security.SecurityAware, admin.AdminSupport):
             attrs = {}
             if value == key:
                 attrs["selected"] = "selected"
+            if not isinstance(name, unicode):
+                name = unicode(name, 'utf-8')
             yield { "key": key,
-                    "name": unicode(name, "utf-8"),
+                    "name": name,
                     "attrs": attrs }
 
     #
-- 
1.6.0.6