From 0521114fddb4105471204b36803540a4ddcbbeab Mon Sep 17 00:00:00 2001
From: Thomas Perl <thp@thpinfo.com>
Date: Mon, 1 Mar 2010 20:24:57 +0100
Subject: [PATCH] Better error message for feed updates (bug 910)

Make sure to create a "beautiful" error message
even when there is no detailed message available.
---
 src/gpodder/gui.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gpodder/gui.py b/src/gpodder/gui.py
index 74113d22..d30ec306 100644
--- a/src/gpodder/gui.py
+++ b/src/gpodder/gui.py
@@ -2459,7 +2459,10 @@ class gPodder(BuilderWidget, dbus.service.Object):
                     self._update_cover(channel)
                 except Exception, e:
                     d = {'url': saxutils.escape(channel.url), 'message': saxutils.escape(str(e))}
-                    message = _('There has been an error updating %(url)s: %(message)s')
+                    if d['message']:
+                        message = _('Error while updating %(url)s: %(message)s')
+                    else:
+                        message = _('The feed at %(url)s could not be updated.')
                     self.notification(message % d, _('Error while updating feed'), widget=self.treeChannels)
                     log('Error: %s', str(e), sender=self, traceback=True)
 
-- 
2.11.4.GIT