diff --git a/gui/slick/views/config_subtitles.mako b/gui/slick/views/config_subtitles.mako
index a9a0d04322cf92393cef6d24a3ab5594560c36d5..28cf9a36921a08105d4daba25a3cfe1353abfc4f 100644
--- a/gui/slick/views/config_subtitles.mako
+++ b/gui/slick/views/config_subtitles.mako
@@ -111,6 +111,15 @@ $('#subtitles_dir').fileBrowser({ title: 'Select Subtitles Download Directory' }
</span>
</label>
</div>
+ <div class="field-pair">
+ <label class="clearfix" for="subtitles_hearing_impaired">
+ <span class="component-title">Hearing Impaired Subtitles</span>
+ <span class="component-desc">
+ <input type="checkbox" name="subtitles_hearing_impaired" id="subtitles_hearing_impaired" ${('', 'checked="checked"')[bool(sickbeard.SUBTITLES_HEARING_IMPAIRED)]}/>
+ <p>Download hearing impaired style subtitles?</p>
+ </span>
+ </label>
+ </div>
<div class="field-pair">
<label class="nocheck">
<span class="component-title">Extra Scripts</span>
@@ -197,7 +206,7 @@ $('#subtitles_dir').fileBrowser({ title: 'Select Subtitles Download Directory' }
<label class="nocheck" for="${curService['name']}_pass">
<span class="component-title">${curService['name'].capitalize()} Password</span>
<span class="component-desc">
- <input type="text" name="${curService['name']}_pass" id="${curService['name']}_pass" value="${providerLoginDict[curService['name']]['pass']}" class="form-control input-sm input300" />
+ <input type="password" name="${curService['name']}_pass" id="${curService['name']}_pass" value="${providerLoginDict[curService['name']]['pass']}" class="form-control input-sm input300" />
</span>
</label>
</div>
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 4e0951e8b571daffbe3d9ed886909d44b3d0a7ac..5a41da479d5e1a48570ccb9e2e51967ab12c8b0c 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -526,6 +526,7 @@ SUBTITLES_SERVICES_LIST = []
SUBTITLES_SERVICES_ENABLED = []
SUBTITLES_HISTORY = False
EMBEDDED_SUBTITLES_ALL = False
+SUBTITLES_HEARING_IMPAIRED = False
SUBTITLES_FINDER_FREQUENCY = 1
SUBTITLES_MULTI = False
SUBTITLES_EXTRA_SCRIPTS = []
@@ -616,7 +617,7 @@ def initialize(consoleLogging=True):
POSTER_SORTBY, POSTER_SORTDIR, HISTORY_LIMIT, CREATE_MISSING_SHOW_DIRS, ADD_SHOWS_WO_DIR, \
METADATA_WDTV, METADATA_TIVO, METADATA_MEDE8ER, IGNORE_WORDS, IGNORED_SUBS_LIST, REQUIRE_WORDS, CALENDAR_UNPROTECTED, NO_RESTART, \
USE_SUBTITLES, SUBTITLES_LANGUAGES, SUBTITLES_DIR, SUBTITLES_SERVICES_LIST, SUBTITLES_SERVICES_ENABLED, SUBTITLES_HISTORY, SUBTITLES_FINDER_FREQUENCY, SUBTITLES_MULTI, EMBEDDED_SUBTITLES_ALL, SUBTITLES_EXTRA_SCRIPTS, subtitlesFinderScheduler, \
- ADDIC7ED_USER, ADDIC7ED_PASS, LEGENDASTV_USER, LEGENDASTV_PASS, OPENSUBTITLES_USER, OPENSUBTITLES_PASS, \
+ SUBTITLES_HEARING_IMPAIRED, ADDIC7ED_USER, ADDIC7ED_PASS, LEGENDASTV_USER, LEGENDASTV_PASS, OPENSUBTITLES_USER, OPENSUBTITLES_PASS, \
USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, TMDB_API_KEY, DEBUG, DEFAULT_PAGE, PROXY_SETTING, PROXY_INDEXERS, \
AUTOPOSTPROCESSER_FREQUENCY, SHOWUPDATE_HOUR, DEFAULT_AUTOPOSTPROCESSER_FREQUENCY, MIN_AUTOPOSTPROCESSER_FREQUENCY, \
ANIME_DEFAULT, NAMING_ANIME, ANIMESUPPORT, USE_ANIDB, ANIDB_USERNAME, ANIDB_PASSWORD, ANIDB_USE_MYLIST, \
@@ -1143,6 +1144,7 @@ def initialize(consoleLogging=True):
SUBTITLES_DEFAULT = bool(check_setting_int(CFG, 'Subtitles', 'subtitles_default', 0))
SUBTITLES_HISTORY = bool(check_setting_int(CFG, 'Subtitles', 'subtitles_history', 0))
EMBEDDED_SUBTITLES_ALL = bool(check_setting_int(CFG, 'Subtitles', 'embedded_subtitles_all', 0))
+ SUBTITLES_HEARING_IMPAIRED = bool(check_setting_int(CFG, 'Subtitles', 'subtitles_hearing_impaired', 0))
SUBTITLES_FINDER_FREQUENCY = check_setting_int(CFG, 'Subtitles', 'subtitles_finder_frequency', 1)
SUBTITLES_MULTI = bool(check_setting_int(CFG, 'Subtitles', 'subtitles_multi', 1))
@@ -2143,6 +2145,7 @@ def save_config():
new_config['Subtitles']['subtitles_default'] = int(SUBTITLES_DEFAULT)
new_config['Subtitles']['subtitles_history'] = int(SUBTITLES_HISTORY)
new_config['Subtitles']['embedded_subtitles_all'] = int(EMBEDDED_SUBTITLES_ALL)
+ new_config['Subtitles']['subtitles_hearing_impaired'] = int(SUBTITLES_HEARING_IMPAIRED)
new_config['Subtitles']['subtitles_finder_frequency'] = int(SUBTITLES_FINDER_FREQUENCY)
new_config['Subtitles']['subtitles_multi'] = int(SUBTITLES_MULTI)
new_config['Subtitles']['subtitles_extra_scripts'] = '|'.join(SUBTITLES_EXTRA_SCRIPTS)
diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py
index 34626a7e9599c1c8a3bd96e71d506a85b0357d78..5e6959caa16df430c0e3919ecc89f1c265700d9f 100644
--- a/sickbeard/subtitles.py
+++ b/sickbeard/subtitles.py
@@ -144,8 +144,7 @@ def downloadSubtitles(subtitles_info):
subtitles_list = pool.list_subtitles(video, languages)
try:
- # TODO: Add gui option for hearing_impaired parameter ?
- found_subtitles = pool.download_best_subtitles(subtitles_list, video, languages=languages, hearing_impaired=False, only_one=not sickbeard.SUBTITLES_MULTI)
+ found_subtitles = pool.download_best_subtitles(subtitles_list, video, languages=languages, hearing_impaired=sickbeard.SUBTITLES_HEARING_IMPAIRED, only_one=not sickbeard.SUBTITLES_MULTI)
if not found_subtitles:
logger.log(u'%s: No subtitles found for S%02dE%02d on any provider' % (subtitles_info['show.indexerid'], subtitles_info['season'], subtitles_info['episode']), logger.DEBUG)
return (existing_subtitles, None)
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 75d21ffadb00d87d6c87422f12f0453abd4b0814..88b9098439bbc32838b69bf9829b1ef4c6d1c5b6 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -4801,7 +4801,7 @@ class ConfigSubtitles(Config):
def saveSubtitles(self, use_subtitles=None, subtitles_plugins=None, subtitles_languages=None, subtitles_dir=None,
service_order=None, subtitles_history=None, subtitles_finder_frequency=None,
- subtitles_multi=None, embedded_subtitles_all=None, subtitles_extra_scripts=None,
+ subtitles_multi=None, embedded_subtitles_all=None, subtitles_extra_scripts=None, subtitles_hearing_impaired=None,
addic7ed_user=None, addic7ed_pass=None, legendastv_user=None, legendastv_pass=None, opensubtitles_user=None, opensubtitles_pass=None):
results = []
@@ -4813,6 +4813,7 @@ class ConfigSubtitles(Config):
sickbeard.SUBTITLES_DIR = subtitles_dir
sickbeard.SUBTITLES_HISTORY = config.checkbox_to_value(subtitles_history)
sickbeard.EMBEDDED_SUBTITLES_ALL = config.checkbox_to_value(embedded_subtitles_all)
+ sickbeard.SUBTITLES_HEARING_IMPAIRED = config.checkbox_to_value(subtitles_hearing_impaired)
sickbeard.SUBTITLES_MULTI = config.checkbox_to_value(subtitles_multi)
sickbeard.SUBTITLES_EXTRA_SCRIPTS = [x.strip() for x in subtitles_extra_scripts.split('|') if x.strip()]