diff --git a/bazarr/main.py b/bazarr/main.py index 8c33b04c9..736fc7124 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -693,7 +693,7 @@ def episodes(no): series_details = c.execute("SELECT title, overview, poster, fanart, hearing_impaired, tvdbid, audio_language, languages, path_substitution(path) FROM table_shows WHERE sonarrSeriesId LIKE ?", (str(no),)).fetchone() tvdbid = series_details[5] - episodes = c.execute("SELECT title, path_substitution(path), season, episode, subtitles, sonarrSeriesId, missing_subtitles, sonarrEpisodeId, scene_name, monitored, failedAttempts FROM table_episodes WHERE sonarrSeriesId LIKE ? ORDER BY episode ASC", (str(no),)).fetchall() + episodes = c.execute("SELECT title, path_substitution(path), season, episode, subtitles, sonarrSeriesId, missing_subtitles, sonarrEpisodeId, scene_name, monitored FROM table_episodes WHERE sonarrSeriesId LIKE ? ORDER BY episode ASC", (str(no),)).fetchall() number = len(episodes) languages = c.execute("SELECT code2, name FROM table_settings_languages WHERE enabled = 1").fetchall() c.close() diff --git a/views/episodes.tpl b/views/episodes.tpl index b011d0559..a349340e8 100644 --- a/views/episodes.tpl +++ b/views/episodes.tpl @@ -214,26 +214,27 @@ %try: - %if episode[6] is not None: - % missing_languages = ast.literal_eval(episode[6]) - % missing_languages.sort() - %else: - % missing_languages = None - %end - %if missing_languages is not None: - %from get_subtitle import search_active - %from get_settings import get_general_settings - %for language in missing_languages: - %if episode[10] is not None and get_general_settings()[25]: - %for lang in ast.literal_eval(episode[10]): - %if language in lang: - %active = search_active(lang[1]) - %if active: + <% + if episode[6] is not None: + missing_languages = ast.literal_eval(episode[6]) + missing_languages.sort() + else: + missing_languages = None + end + if missing_languages is not None: + from get_subtitle import search_active + from get_settings import get_general_settings + for language in missing_languages: + if episode[10] is not None and get_general_settings()[25]: + for lang in ast.literal_eval(episode[10]): + if language in lang: + if search_active(lang[1]): + %> {{language}} %else: - + {{language}} %end diff --git a/views/wantedseries.tpl b/views/wantedseries.tpl index 53de62342..a7931628b 100644 --- a/views/wantedseries.tpl +++ b/views/wantedseries.tpl @@ -76,23 +76,27 @@ {{row[2]}} - %missing_languages = ast.literal_eval(row[3]) - %if missing_languages is not None: - %from get_subtitle import search_active - %from get_settings import get_general_settings - %for language in missing_languages: - %if row[9] is not None and get_general_settings()[25]: - %for lang in ast.literal_eval(row[9]): - %if language in lang: - %active = search_active(lang[1]) - %if active: + <% + missing_languages = ast.literal_eval(row[3]) + if missing_languages is not None: + from get_subtitle import search_active + from get_settings import get_general_settings + for language in missing_languages: + if row[9] is not None and get_general_settings()[25]: + for lang in ast.literal_eval(row[9]): + if language in lang: + active = search_active(lang[1]) + if active: + %> {{language}} + %else: - + {{language}} + %end %end %end @@ -100,6 +104,7 @@ {{language}} + %end %end