diff --git a/CHANGES.md b/CHANGES.md index 2cf333d3..be0344de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,10 @@ -### 0.14.3 (2018-02-13 13:00:00 UTC) +### 0.14.4 (2018-02-18 23:55:00 UTC) + +Change relax strict mode from subtitle languages and show unknown.png flag for 'Undetermined' subtitle languages +Add Paramount Network icon + + +### 0.14.3 (2018-02-13 13:00:00 UTC) Change improve thetvdb api response handling diff --git a/gui/slick/images/network/paramount network.png b/gui/slick/images/network/paramount network.png new file mode 100644 index 00000000..edba8d2a Binary files /dev/null and b/gui/slick/images/network/paramount network.png differ diff --git a/gui/slick/interfaces/default/inc_displayShow.tmpl b/gui/slick/interfaces/default/inc_displayShow.tmpl index 75de3a14..6a2aebc9 100644 --- a/gui/slick/interfaces/default/inc_displayShow.tmpl +++ b/gui/slick/interfaces/default/inc_displayShow.tmpl @@ -94,9 +94,11 @@ #if $sg_var('USE_SUBTITLES') and $show.subtitles #if $ep['subtitles'] - #for $sub_lang in subliminal.language.language_list($ep['subtitles'].split(',')) + #for $sub_lang in subliminal.language.language_list($ep['subtitles'].split(','), strict=False) #if '' != sub_lang.alpha2 ${sub_lang} + #elif 'und' == sub_lang.alpha3 + undetermined #end if #end for #end if diff --git a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl index d8c1a9a9..63d0948d 100644 --- a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl +++ b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl @@ -19,7 +19,7 @@ #end if ## #if $whichSubs - #set subsLanguage = $subliminal.language.Language($whichSubs) if not $whichSubs == 'all' else 'All' + #set subsLanguage = $subliminal.language.Language($whichSubs, strict=False) if not $whichSubs == 'all' else 'All' #end if #if not $whichSubs or ($whichSubs and not $ep_counts) #if $whichSubs: diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index fb770b95..8f7d1991 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -2437,10 +2437,10 @@ class Home(MainHandler): return json.dumps({'result': 'failure'}) # try do download subtitles for that episode - previous_subtitles = set(subliminal.language.Language(x) for x in ep_obj.subtitles) try: + previous_subtitles = set(subliminal.language.Language(x) for x in ep_obj.subtitles) ep_obj.subtitles = set(x.language for x in ep_obj.downloadSubtitles().values()[0]) - except: + except(StandardError, Exception): return json.dumps({'result': 'failure'}) # return the correct json value @@ -4027,8 +4027,8 @@ class Manage(MainHandler): result[cur_season][cur_episode]['name'] = cur_result['name'] result[cur_season][cur_episode]['subtitles'] = ','.join( - subliminal.language.Language(subtitle).alpha2 for subtitle in cur_result['subtitles'].split(',')) if not \ - cur_result['subtitles'] == '' else '' + subliminal.language.Language(subtitle, strict=False).alpha2 + for subtitle in cur_result['subtitles'].split(',')) if '' != cur_result['subtitles'] else '' return json.dumps(result)