Merge branch 'master' into develop

CHANGES.md

@@ -99,6 +99,12 @@
 * Change removed NZBGet 'remote' PostProcess guidance until it is verified to work
 
 
+### 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

gui/slick/interfaces/default/inc_displayShow.tmpl

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

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:

sickbeard/webserve.py

@@ -2449,10 +2449,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
@@ -4035,8 +4035,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)