diff --git a/gui/slick/images/flags/pt-BR.png b/gui/slick/images/flags/pt-BR.png new file mode 100644 index 0000000000000000000000000000000000000000..2fecf539d9ddd9b191efdd0eae3003a1d2c2e37a Binary files /dev/null and b/gui/slick/images/flags/pt-BR.png differ diff --git a/gui/slick/interfaces/default/config_subtitles.tmpl b/gui/slick/interfaces/default/config_subtitles.tmpl index 91d2139f8d96da70e8ea5e5bfbd8b33570731d76..145c847c2f837c177e0d5806d9c6162c609ca84e 100644 --- a/gui/slick/interfaces/default/config_subtitles.tmpl +++ b/gui/slick/interfaces/default/config_subtitles.tmpl @@ -1,7 +1,6 @@ #from sickbeard import subtitles #import sickbeard #from sickbeard.helpers import anon_url -#from babelfish import Language #set global $title="Config - Subtitles" #set global $header="Subtitles" @@ -29,7 +28,7 @@ [ <%= - ",\r\n".join("{id: \"" + Language.fromietf(lang).alpha3 + "\", name: \"" + Language.fromietf(lang).name + "\"}" for lang in subtitles.wantedLanguages()) if subtitles.wantedLanguages() else '' + ",\r\n".join("{id: \"" + subtitles.fromietf(lang).alpha3 + "\", name: \"" + subtitles.fromietf(lang).name + "\"}" for lang in subtitles.wantedLanguages()) if subtitles.wantedLanguages() else '' %> ] } diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl index 0312c0d05f0968027fc4ca22932831d1cd11b19a..29e75c6dd76cde56c556bf3cec43fa2489de1796 100644 --- a/gui/slick/interfaces/default/displayShow.tmpl +++ b/gui/slick/interfaces/default/displayShow.tmpl @@ -3,12 +3,10 @@ #import sickbeard.helpers #from sickbeard.common import * #from sickbeard.helpers import anon_url -#import subliminal #import os.path, os #import datetime #import urllib #import ntpath -#import babelfish #set global $title=$show.name ##set global $header = '<a></a>' % @@ -286,7 +284,7 @@ </table> <table style="width:180px; float: right; vertical-align: middle; height: 100%;"> - #set $info_flag = $babelfish.Language.fromietf($show.lang).alpha3 if $subtitles.isValidLanguage($show.lang) else 'unknown' + #set $info_flag = $subtitles.fromietf($show.lang).alpha3 if $subtitles.isValidLanguage($show.lang) else 'unknown' <tr><td class="showLegend">Info Language:</td><td><img src="$sbRoot/images/flags/${info_flag}.png" width="16" height="11" alt="$show.lang" title="$show.lang" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';"/></td></tr> #if $sickbeard.USE_SUBTITLES <tr><td class="showLegend">Subtitles: </td><td><img src="$sbRoot/images/#if $show.subtitles then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr> @@ -580,7 +578,7 @@ #end if </td> <td class="col-subtitles" align="center"> - #for $sub_lang in [babelfish.Language.fromietf(x) for x in $epResult["subtitles"].split(',') if $epResult["subtitles"]]: + #for $sub_lang in [$subtitles.fromietf(x) for x in $epResult["subtitles"].split(',') if $epResult["subtitles"]]: #set $flag = $sub_lang.alpha3 if $hasattr($sub_lang, 'alpha3') and $sub_lang.alpha3 else $sub_lang.alpha2 if $hasattr($sub_lang, 'alpha2') and $sub_lang.alpha2 else 'unknown' <img src="$sbRoot/images/flags/${flag}.png" width="16" height="11" alt="${sub_lang.name}" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';" /> #end for diff --git a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl index ecc04db93c9cb61acbf7a4197cfe2f7aa9a6cced..38d061d6096697317125a4e6c39218d86e8d21a4 100644 --- a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl +++ b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl @@ -1,6 +1,4 @@ #from sickbeard import subtitles -#import subliminal -#import babelfish #import datetime #import sickbeard #from sickbeard import common @@ -19,7 +17,7 @@ <h1 class="title">$title</h1> #end if #if $whichSubs: -#set subsLanguage = $babelfish.Language.fromietf($whichSubs).name if not $whichSubs == 'all' else 'All' +#set subsLanguage = $subtitles.fromietf($whichSubs).name if not $whichSubs == 'all' else 'All' #end if #if not $whichSubs or ($whichSubs and not $ep_counts): @@ -31,7 +29,7 @@ <form action="$sbRoot/manage/subtitleMissed" method="get"> Manage episodes without <select name="whichSubs" class="form-control form-control-inline input-sm"> <option value="all">All</option> -#for $sub_lang in [$babelfish.Language.fromietf(x) for x in $subtitles.wantedLanguages]: +#for $sub_lang in [$subtitles.fromietf(x) for x in $subtitles.wantedLanguages]: <option value="$sub_lang.alpha3">$sub_lang.name</option> #end for </select> diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py index 0d9f17f41c481855a44019892e401eea010b8a16..f6035e516f27d544bd343368e7bc7fb634869edd 100644 --- a/sickbeard/subtitles.py +++ b/sickbeard/subtitles.py @@ -66,15 +66,19 @@ def sortedServiceList(): def getEnabledServiceList(): return [x['name'] for x in sortedServiceList() if x['enabled']] +#Hack around this for now. +def fromietf(language): + return babelfish.Language.fromietf(language if language not in 'pb' else 'pt-BR') + def isValidLanguage(language): try: - langObj = babelfish.Language.fromietf(language) + langObj = fromietf(language) except: return False return True def getLanguageName(language): - return babelfish.Language.fromietf(language).name + return fromietf(language ).name # TODO: Filter here for non-languages in sickbeard.SUBTITLES_LANGUAGES def wantedLanguages(sqlLike = False): diff --git a/sickbeard/tv.py b/sickbeard/tv.py index ebcaf73386d7d5ded33b78f5382e7558a70d2c85..e203c30d475e5de80d52f5c1752cf08ec70e16bb 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -1445,7 +1445,7 @@ class TVEpisode(object): try: languages = set() for language in frozenset(subtitles.wantedLanguages()).difference(self.subtitles): - languages.add(babelfish.Language.fromietf(language)) + languages.add(subtitles.fromietf(language)) if not languages: logger.log(u'%s: No missing subtitles for S%02dE%02d' % (self.show.indexerid, self.season, self.episode), logger.DEBUG) @@ -1544,7 +1544,7 @@ class TVEpisode(object): newSubtitles = frozenset(self.subtitles).difference(previous_subtitles) if newSubtitles: - subtitleList = ", ".join([babelfish.Language.fromietf(newSub).name for newSub in newSubtitles]) + subtitleList = ", ".join([subtitles.fromietf(newSub).name for newSub in newSubtitles]) logger.log(u"%s: Downloaded %s subtitles for S%02dE%02d" % (self.show.indexerid, subtitleList, self.season, self.episode), logger.DEBUG) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 39a53c10e4220d07f540ccea5f50527c9d07e849..d769133549867c3dc0de7f4714d80faec068e3f2 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -2032,7 +2032,7 @@ class Home(WebRoot): # return the correct json value newSubtitles = frozenset(ep_obj.subtitles).difference(previous_subtitles) if newSubtitles: - newLangs = [babelfish.Language.fromietf(newSub) for newSub in newSubtitles] + newLangs = [subtitles.fromietf(newSub) for newSub in newSubtitles] status = 'New subtitles downloaded: %s' % ' '.join([ "<img src='" + sickbeard.WEB_ROOT + "/images/flags/" + newLang.alpha3 + ".png' alt='" + newLang.name + "'/>" for newLang in newLangs])