mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Louis Vézina 2020-06-03 06:42:20 -04:00
parent 37dff31e5f 727ceb0910
commit f79faaa5c5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bazarr/api.py
View File

@ -722,7 +722,7 @@ class Movies(Resource):
if settings.general.getboolean('embedded_subs_show_desired'): if settings.general.getboolean('embedded_subs_show_desired'):
desired_lang_list = [] desired_lang_list = []
if item['languages'] and item['languages'] != 'None': if isinstance(item['languages'], list):
desired_lang_list = [x['code2'] for x in item['languages']] desired_lang_list = [x['code2'] for x in item['languages']]
item['subtitles'] = [x for x in item['subtitles'] if x['code2'] in desired_lang_list or x['path']] item['subtitles'] = [x for x in item['subtitles'] if x['code2'] in desired_lang_list or x['path']]

2
views/settingssubtitles.html
View File

@ -217,7 +217,7 @@
<input type="checkbox" class="custom-control-input" id="settings-general-embedded_subs_show_desired" name="settings-general-embedded_subs_show_desired"> <input type="checkbox" class="custom-control-input" id="settings-general-embedded_subs_show_desired" name="settings-general-embedded_subs_show_desired">
<span class="custom-control-label" for="settings-general-embedded_subs_show_desired"></span> <span class="custom-control-label" for="settings-general-embedded_subs_show_desired"></span>
</label> </label>
<label>Hide subtitles for languages that are not currently enabled.</label> <label>Hide embedded subtitles for languages that are not currently desired.</label>
</div> </div>
</div> </div>
</div> </div>