monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-06 01:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/0.14.4'

Browse source
This commit is contained in:
JackDandy 2018-02-18 23:55:43 +00:00
commit 783ddda806
5 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES.md
View file

@ -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

BIN
gui/slick/images/network/paramount network.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

4
gui/slick/interfaces/default/inc_displayShow.tmpl
View file

@ -94,9 +94,11 @@
#if $sg_var('USE_SUBTITLES') and $show.subtitles
<td class="col-subtitles" align="center">
#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
<img src="$sbRoot/images/flags/${sub_lang.alpha2}.png" width="16" height="11" alt="${sub_lang}">
#elif 'und' == sub_lang.alpha3
<img src="$sbRoot/images/flags/unknown.png" width="16" height="11" alt="undetermined">
#end if
#end for
#end if

2
gui/slick/interfaces/default/manage_subtitleMissed.tmpl
View file

@ -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:

8
sickbeard/webserve.py
View file

@ -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)