From f511a0b810aef0016b6789096423609387754701 Mon Sep 17 00:00:00 2001
From: Nic Wolfe <nic@wolfeden.ca>
Date: Sat, 29 Jan 2011 13:08:00 -0700
Subject: [PATCH] Hopefully fix some character encoding bugs for people with
non-english locales
---
data/interfaces/default/comingEpisodes.tmpl | 2 +-
data/interfaces/default/inc_bottom.tmpl | 2 +-
sickbeard/webserve.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/interfaces/default/comingEpisodes.tmpl b/data/interfaces/default/comingEpisodes.tmpl
index da74c796f..bb6d78ccf 100644
--- a/data/interfaces/default/comingEpisodes.tmpl
+++ b/data/interfaces/default/comingEpisodes.tmpl
@@ -219,7 +219,7 @@ Custom
#set $show_div = "ep_listing listing_toofar"
#set $too_late_header = True
#elif $cur_ep_airdate >= $today and $cur_ep_airdate < $next_week:
- <br /><h1 class="day">$datetime.date.fromordinal($cur_ep_airdate).strftime("%A").decode('utf-8')</h1>
+ <br /><h1 class="day">$datetime.date.fromordinal($cur_ep_airdate).strftime("%A")</h1>
#if $cur_ep_airdate == $today:
#set $show_div = "ep_listing listing_current"
#else:
diff --git a/data/interfaces/default/inc_bottom.tmpl b/data/interfaces/default/inc_bottom.tmpl
index ae53a8963..5373b5fce 100644
--- a/data/interfaces/default/inc_bottom.tmpl
+++ b/data/interfaces/default/inc_bottom.tmpl
@@ -14,7 +14,7 @@
<br />
<b>Search</b>: <%=str(sickbeard.currentSearchScheduler.timeLeft()).split('.')[0]%> |
<!--<b>Update</b>: <a%a=str(sickbeard.updateScheduler.timeLeft()).split('.')[0]%> | -->
-<b>Backlog</b>: $sickbeard.backlogSearchScheduler.nextRun().strftime("%a %b %d").decode('utf-8') <br />
+<b>Backlog</b>: $sickbeard.backlogSearchScheduler.nextRun().strftime("%a %b %d") <br />
</div>
</body>
</html>
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 9c5d143f0..8b625bd65 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -100,7 +100,7 @@ class TVDBWebUI:
redirect("/home/addShows/addShow?" + showDirList + "seriesList=" + searchList)
def _munge(string):
- return unicode(string).encode('ascii', 'xmlcharrefreplace')
+ return unicode(string).encode('utf-8', 'xmlcharrefreplace')
def _genericMessage(subject, message):
t = PageTemplate(file="genericMessage.tmpl")
--
GitLab