diff --git a/.pylintrc b/.pylintrc
index 59f9258..248d282 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -21,3 +21,4 @@ disable=
super-with-arguments, # Python 2.7 compatibility
raise-missing-from, # Python 2.7 compatibility
+ consider-using-f-string, # Python 2.7 compatibility
diff --git a/resources/lib/modules/catalog.py b/resources/lib/modules/catalog.py
index 66ca7da..46bb5f4 100644
--- a/resources/lib/modules/catalog.py
+++ b/resources/lib/modules/catalog.py
@@ -113,7 +113,7 @@ class Catalog:
},
info_dict={
'tvshowtitle': program.title,
- 'title': kodiutils.localize(30205, season=season.number), # Season {season}
+ 'title': kodiutils.localize(30205, season=season.number) if season.number else season.title, # Season {season}
'plot': season.description or program.description,
'set': program.title,
}
@@ -243,7 +243,8 @@ class Catalog:
listing = []
for episode in episodes:
title_item = Menu.generate_titleitem(episode)
- title_item.info_dict['title'] = episode.program_title + ' - ' + title_item.title
+ if episode.program_title:
+ title_item.info_dict['title'] = episode.program_title + ' - ' + title_item.title
listing.append(title_item)
for program in programs:
diff --git a/resources/lib/viervijfzes/content.py b/resources/lib/viervijfzes/content.py
index 246a304..23c4d9b 100644
--- a/resources/lib/viervijfzes/content.py
+++ b/resources/lib/viervijfzes/content.py
@@ -454,7 +454,7 @@ class ContentApi:
# Categories regexes
regex_articles = re.compile(r'