Permalink
Browse files

Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…

…_binaries
  • Loading branch information...
2 parents 297ad71 + f511a0b commit 776b5c8e054128254b4ee08f9bf8b5985573e0bc @midgetspy midgetspy committed Jan 29, 2011
@@ -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:
@@ -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>
View
@@ -100,7 +100,7 @@ def selectSeries(self, allSeries):
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")

0 comments on commit 776b5c8

Please sign in to comment.