From ff7cef7d4ec1d0b7218921b34d0079d0acaf865b Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 26 Feb 2013 00:16:30 +0000 Subject: [PATCH] Addons: Check for two-letter lang as well as 5-char locale E.g, check fr as well as fr_FR svn: r21450 --- gramps/gui/viewmanager.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gramps/gui/viewmanager.py b/gramps/gui/viewmanager.py index 8c1b45779..63f2dfe50 100644 --- a/gramps/gui/viewmanager.py +++ b/gramps/gui/viewmanager.py @@ -377,13 +377,19 @@ class ViewManager(CLIManager): # now we have a list of languages to try: fp = None for lang in langs: - URL = "%s/listings/addons-%s.txt" % (config.get("behavior.addons-url"), lang) + URL = ("%s/listings/addons-%s.txt" % + (config.get("behavior.addons-url"), lang)) LOG.debug(" trying: %s" % URL) try: fp = urlopen(URL, timeout=10) # abort after 10 seconds - except: # some error - LOG.debug(" IOError!") - fp = None + except: + try: + URL = ("%s/listings/addons-%s.txt" % + (config.get("behavior.addons-url"), lang[:2])) + fp = urlopen(URL, timeout=10) + except Exception as err: # some error + LOG.warn("Failed to open %s: %s" (lang, str(err))) + fp = None if fp and fp.getcode() == 200: # ok break addon_update_list = []