LanguageSelection: allow ll_LL.png as flag image name
authorpieterg <pieterg@users.sourceforge.net>
Thu, 4 Oct 2012 10:03:13 +0000 (12:03 +0200)
committerpieterg <pieterg@users.sourceforge.net>
Thu, 4 Oct 2012 10:03:13 +0000 (12:03 +0200)
fallback to ll.png

data/countries/Makefile.am
data/countries/fy_NL.png [moved from data/countries/x-fy.png with 100% similarity]
lib/python/Screens/LanguageSelection.py

index 0fe22dd..c474756 100644 (file)
@@ -35,5 +35,5 @@ dist_install_DATA = \
        th.png \
        tr.png \
        ua.png \
-       x-fy.png \
+       fy_NL.png \
        yu.png
index 3e352a6f3ad17f27cd0c9fb680bf24a763fed331..3d2dc276e0a613cea5b417315e7317c8a10d262f 100644 (file)
@@ -18,9 +18,11 @@ from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN
 from Tools.LoadPixmap import LoadPixmap
 
 def LanguageEntryComponent(file, name, index):
-       png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + file + ".png"))
+       png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + index + ".png"))
        if png == None:
-               png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/missing.png"))
+               png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + file + ".png"))
+               if png == None:
+                       png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/missing.png"))
        res = (index, name, png)
        return res