Merge remote-tracking branch 'origin/development' into development

views/episodes.tpl

@@ -223,7 +223,7 @@
                                                 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]:
+                                                    if episode[10] is not None and get_general_settings()[25] and language in episode[10]:
                                                         for lang in ast.literal_eval(episode[10]):
                                                             if language in lang:
                                                                 if search_active(lang[1]):

views/movie.tpl

@@ -183,7 +183,7 @@
 					</table>
 					<%
 						for missing_subs_language in missing_subs_languages:
-						    if details[14] is not None and get_general_settings()[25]:
+						    if details[14] is not None and get_general_settings()[25] and missing_subs_language in details[14]:
                                 for lang in ast.literal_eval(details[14]):
                                     if missing_subs_language in lang:
                                         if search_active(lang[1]):

views/wantedmovies.tpl

@@ -75,7 +75,7 @@
                             from get_subtitle import search_active
                             from get_settings import get_general_settings
 							for language in missing_languages:
-                                if row[6] is not None and get_general_settings()[25]:
+                                if row[6] is not None and get_general_settings()[25] and language in row[6]:
                                         for lang in ast.literal_eval(row[6]):
                                             if language in lang:
                                                 active = search_active(lang[1])

views/wantedseries.tpl

@@ -82,7 +82,7 @@
                             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]:
+                                if row[9] is not None and get_general_settings()[25] and language in row[9]:
                                         for lang in ast.literal_eval(row[9]):
                                             if language in lang:
                                                 active = search_active(lang[1])