From 94c3d0bc5980c9a7c139838d903f9c97426f02cf Mon Sep 17 00:00:00 2001 From: morpheus65535 Date: Mon, 26 Aug 2019 23:17:40 -0400 Subject: [PATCH 01/35] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f37589825..ef15757bf 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ You can reach us for support on [Discord](https://discord.gg/MH2e2eb). If you find a bug, please open an issue on [Github](https://github.com/morpheus65535/bazarr/issues). # Feature Requests -If you need something that is not already part of Bazarr, feel free to create a feature request on [Github](https://github.com/morpheus65535/bazarr/issues). +If you need something that is not already part of Bazarr, feel free to create a feature request on [Feature Upvote](http://features.bazarr.media). ## Major Features Include: From 6c5e6c4da865e77a9a2eacc2a3fbc29c8561e1b3 Mon Sep 17 00:00:00 2001 From: morpheus65535 Date: Mon, 26 Aug 2019 23:31:23 -0400 Subject: [PATCH 02/35] Delete feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 066b2d920..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. From 2e5b0b49025914122ce06f219bd21baca9383900 Mon Sep 17 00:00:00 2001 From: morpheus65535 Date: Mon, 9 Sep 2019 13:16:18 -0400 Subject: [PATCH 03/35] Fix for audio language profiles. --- bazarr/get_series.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bazarr/get_series.py b/bazarr/get_series.py index e69f09137..df2831fa7 100644 --- a/bazarr/get_series.py +++ b/bazarr/get_series.py @@ -87,12 +87,14 @@ def update_series(): if serie_default_enabled is True: series_to_add.append((show["title"], show["path"], show["tvdbId"], serie_default_language, serie_default_hi, show["id"], overview, poster, fanart, - profile_id_to_language(show['qualityProfileId'], audio_profiles), show['sortTitle'], + profile_id_to_language( + (show['qualityProfileId'] if get_sonarr_version().startswith('2') else show['languageProfileId']), audio_profiles), show['sortTitle'], show['year'], alternateTitles, serie_default_forced)) else: series_to_add.append((show["title"], show["path"], show["tvdbId"], show["tvdbId"], show["tvdbId"], show["id"], overview, poster, fanart, - profile_id_to_language(show['qualityProfileId'], audio_profiles), show['sortTitle'], + profile_id_to_language( + (show['qualityProfileId'] if get_sonarr_version().startswith('2') else show['languageProfileId']), audio_profiles), show['sortTitle'], show['year'], alternateTitles, show["id"])) # Update or insert series in DB From b99a9ca3d0fc369d16dd47fef63c6ddd1efaef52 Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 14:36:50 +0100 Subject: [PATCH 04/35] Update scheduler.py --- bazarr/scheduler.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/bazarr/scheduler.py b/bazarr/scheduler.py index e7580ae2e..9b35077fb 100644 --- a/bazarr/scheduler.py +++ b/bazarr/scheduler.py @@ -27,16 +27,16 @@ def sonarr_full_update(): if full_update == "Daily": scheduler.add_job(update_all_episodes, CronTrigger(hour=settings.sonarr.full_update_hour), max_instances=1, coalesce=True, misfire_grace_time=15, id='update_all_episodes', - name='Update all episodes subtitles from disk', replace_existing=True) + name='Update all Episode Subtitles from disk', replace_existing=True) elif full_update == "Weekly": scheduler.add_job(update_all_episodes, CronTrigger(day_of_week=settings.sonarr.full_update_day, hour=settings.sonarr.full_update_hour), max_instances=1, coalesce=True, misfire_grace_time=15, id='update_all_episodes', - name='Update all episodes subtitles from disk', replace_existing=True) + name='Update all Episode Subtitles from disk', replace_existing=True) elif full_update == "Manually": scheduler.add_job(update_all_episodes, CronTrigger(year='2100'), max_instances=1, coalesce=True, misfire_grace_time=15, id='update_all_episodes', - name='Update all episodes subtitles from disk', replace_existing=True) + name='Update all Episode Subtitles from disk', replace_existing=True) def radarr_full_update(): @@ -45,17 +45,17 @@ def radarr_full_update(): if full_update == "Daily": scheduler.add_job(update_all_movies, CronTrigger(hour=settings.radarr.full_update_hour), max_instances=1, coalesce=True, misfire_grace_time=15, - id='update_all_movies', name='Update all movies subtitles from disk', + id='update_all_movies', name='Update all Movie Subtitles from disk', replace_existing=True) elif full_update == "Weekly": scheduler.add_job(update_all_movies, CronTrigger(day_of_week=settings.radarr.full_update_day, hour=settings.radarr.full_update_hour), max_instances=1, coalesce=True, misfire_grace_time=15, id='update_all_movies', - name='Update all movies subtitles from disk', + name='Update all Movie Subtitles from disk', replace_existing=True) elif full_update == "Manually": scheduler.add_job(update_all_movies, CronTrigger(year='2100'), max_instances=1, coalesce=True, misfire_grace_time=15, id='update_all_movies', - name='Update all movies subtitles from disk', + name='Update all Movie Subtitles from disk', replace_existing=True) @@ -87,38 +87,38 @@ def schedule_update_job(): if settings.general.getboolean('auto_update'): scheduler.add_job(check_and_apply_update, IntervalTrigger(hours=6), max_instances=1, coalesce=True, misfire_grace_time=15, id='update_bazarr', - name='Update bazarr from source on Github' if not args.release_update else 'Update bazarr from release on Github', + name='Update Bazarr from source on Github' if not args.release_update else 'Update Bazarr from release on Github', replace_existing=True) else: scheduler.add_job(check_and_apply_update, CronTrigger(year='2100'), hour=4, id='update_bazarr', - name='Update bazarr from source on Github' if not args.release_update else 'Update bazarr from release on Github', + name='Update Bazarr from source on Github' if not args.release_update else 'Update Bazarr from release on Github', replace_existing=True) scheduler.add_job(check_releases, IntervalTrigger(hours=6), max_instances=1, coalesce=True, - misfire_grace_time=15, id='update_release', name='Update release info', + misfire_grace_time=15, id='update_release', name='Update Release Info', replace_existing=True) else: scheduler.add_job(check_releases, IntervalTrigger(hours=6), max_instances=1, coalesce=True, misfire_grace_time=15, - id='update_release', name='Update release info', replace_existing=True) + id='update_release', name='Update Release Info', replace_existing=True) if settings.general.getboolean('use_sonarr'): scheduler.add_job(update_series, IntervalTrigger(minutes=1), max_instances=1, coalesce=True, misfire_grace_time=15, - id='update_series', name='Update series list from Sonarr') + id='update_series', name='Update Series list from Sonarr') scheduler.add_job(sync_episodes, IntervalTrigger(minutes=5), max_instances=1, coalesce=True, misfire_grace_time=15, id='sync_episodes', name='Sync episodes with Sonarr') if settings.general.getboolean('use_radarr'): scheduler.add_job(update_movies, IntervalTrigger(minutes=5), max_instances=1, coalesce=True, misfire_grace_time=15, - id='update_movies', name='Update movies list from Radarr') + id='update_movies', name='Update Movie list from Radarr') def schedule_wanted_search(): if settings.general.getboolean('use_sonarr') or settings.general.getboolean('use_radarr'): scheduler.add_job(wanted_search_missing_subtitles, IntervalTrigger(hours=int(settings.general.wanted_search_frequency)), max_instances=1, coalesce=True, misfire_grace_time=15, id='wanted_search_missing_subtitles', - name='Search for wanted subtitles', replace_existing=True) + name='Search for wanted Subtitles', replace_existing=True) def schedule_upgrade_subs(): @@ -126,7 +126,7 @@ def schedule_upgrade_subs(): settings.general.getboolean('use_radarr')): scheduler.add_job(upgrade_subtitles, IntervalTrigger(hours=int(settings.general.upgrade_frequency)), max_instances=1, coalesce=True, misfire_grace_time=15, id='upgrade_subtitles', - name='Upgrade previously downloaded subtitles', replace_existing=True) + name='Upgrade previously downloaded Subtitles', replace_existing=True) scheduler.add_job(cache_maintenance, IntervalTrigger(hours=24), max_instances=1, coalesce=True, misfire_grace_time=15, id='cache_cleanup', name='Cache maintenance') From 106f40895ef3b57b1b5b90521061661e5ba0d216 Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 14:51:40 +0100 Subject: [PATCH 05/35] Update get_subtitle.py --- bazarr/get_subtitle.py | 54 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/bazarr/get_subtitle.py b/bazarr/get_subtitle.py index dbbc57b28..3b3859370 100644 --- a/bazarr/get_subtitle.py +++ b/bazarr/get_subtitle.py @@ -71,7 +71,7 @@ def get_video(path, title, sceneName, use_scenename, providers=None, media_type= refine_from_db(original_path, video) refine_from_ffprobe(original_path, video) - logging.debug('BAZARR is using those video object properties: %s', vars(video)) + logging.debug('BAZARR is using these video object properties: %s', vars(video)) return video except Exception as e: @@ -201,7 +201,7 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce path_decoder=force_unicode ) except Exception as e: - logging.exception('BAZARR Error saving subtitles file to disk for this file:' + path) + logging.exception('BAZARR Error saving Subtitles file to disk for this file:' + path) pass else: saved_any = True @@ -271,12 +271,12 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced if not saved_any: - logging.debug('BAZARR No subtitles were found for this file: ' + path) + logging.debug('BAZARR No Subtitles were found for this file: ' + path) return None subliminal.region.backend.sync() - logging.debug('BAZARR Ended searching subtitles for file: ' + path) + logging.debug('BAZARR Ended searching Subtitles for file: ' + path) def manual_search(path, language, hi, forced, providers, providers_auth, sceneName, title, media_type): @@ -339,7 +339,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa logging.info("BAZARR All providers are throttled") return None except Exception as e: - logging.exception("BAZARR Error trying to get subtitle list from provider for this file: " + path) + logging.exception("BAZARR Error trying to get Subtitle list from provider for this file: " + path) else: subtitles_list = [] @@ -374,8 +374,8 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa url=s.page_link, matches=list(matches), dont_matches=list(not_matched))) final_subtitles = sorted(subtitles_list, key=lambda x: x['score'], reverse=True) - logging.debug('BAZARR ' + str(len(final_subtitles)) + " subtitles have been found for this file: " + path) - logging.debug('BAZARR Ended searching subtitles for this file: ' + path) + logging.debug('BAZARR ' + str(len(final_subtitles)) + " Subtitles have been found for this file: " + path) + logging.debug('BAZARR Ended searching Subtitles for this file: ' + path) subliminal.region.backend.sync() @@ -384,7 +384,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa def manual_download_subtitle(path, language, hi, forced, subtitle, provider, providers_auth, sceneName, title, media_type): - logging.debug('BAZARR Manually downloading subtitles for this file: ' + path) + logging.debug('BAZARR Manually downloading Subtitles for this file: ' + path) if settings.general.getboolean('utf8_encode'): os.environ["SZ_KEEP_ENCODING"] = "" @@ -409,11 +409,11 @@ def manual_download_subtitle(path, language, hi, forced, subtitle, provider, pro logging.info("BAZARR All providers are throttled") return None except Exception as e: - logging.exception('BAZARR Error downloading subtitles for this file ' + path) + logging.exception('BAZARR Error downloading Subtitles for this file ' + path) return None else: if not subtitle.is_valid(): - logging.exception('BAZARR No valid subtitles file found for this file: ' + path) + logging.exception('BAZARR No valid Subtitles file found for this file: ' + path) return logging.debug('BAZARR Subtitles file downloaded for this file:' + path) try: @@ -429,7 +429,7 @@ def manual_download_subtitle(path, language, hi, forced, subtitle, provider, pro path_decoder=force_unicode) except Exception as e: - logging.exception('BAZARR Error saving subtitles file to disk for this file:' + path) + logging.exception('BAZARR Error saving Subtitles file to disk for this file:' + path) return else: if saved_subtitles: @@ -444,7 +444,7 @@ def manual_download_subtitle(path, language, hi, forced, subtitle, provider, pro downloaded_path = saved_subtitle.storage_path logging.debug('BAZARR Subtitles file saved to disk: ' + downloaded_path) is_forced_string = " forced" if subtitle.language.forced else "" - message = downloaded_language + is_forced_string + " subtitles downloaded from " + downloaded_provider + " with a score of " + unicode( + message = downloaded_language + is_forced_string + " Subtitles downloaded from " + downloaded_provider + " with a score of " + unicode( score) + "% using manual search." if use_postprocessing is True: @@ -490,13 +490,13 @@ def manual_download_subtitle(path, language, hi, forced, subtitle, provider, pro return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced else: logging.error( - "BAZARR Tried to manually download a subtitles for file: " + path + " but we weren't able to do (probably throttled by " + str( - subtitle.provider_name) + ". Please retry later or select a subtitles from another provider.") + "BAZARR Tried to manually download a Subtitles for file: " + path + " but we weren't able to do (probably throttled by " + str( + subtitle.provider_name) + ". Please retry later or select a Subtitles from another provider.") return None subliminal.region.backend.sync() - logging.debug('BAZARR Ended manually downloading subtitles for file: ' + path) + logging.debug('BAZARR Ended manually downloading Subtitles for file: ' + path) def manual_upload_subtitle(path, language, forced, title, scene_name, media_type, subtitle): @@ -534,7 +534,7 @@ def manual_upload_subtitle(path, language, forced, title, scene_name, media_type if chmod: os.chmod(subtitle_path, chmod) - message = language_from_alpha3(language) + (" forced" if forced else "") + " subtitles manually uploaded." + message = language_from_alpha3(language) + (" forced" if forced else "") + " Subtitles manually uploaded." if media_type == 'series': reversed_path = path_replace_reverse(path) @@ -580,7 +580,7 @@ def series_download_subtitles(no): if providers_list: for language in ast.literal_eval(episode.missing_subtitles): if language is not None: - notifications.write(msg='Searching for series subtitles...', queue='get_subtitle', item=i, + notifications.write(msg='Searching for Series Subtitles...', queue='get_subtitle', item=i, length=count_episodes_details) result = download_subtitle(path_replace(episode.path), str(alpha3_from_alpha2(language.split(':'))), @@ -608,7 +608,7 @@ def series_download_subtitles(no): list_missing_subtitles(no) if count_episodes_details: - notifications.write(msg='Searching completed. Please reload the page.', type='success', duration='permanent', + notifications.write(msg='Search Complete. Please Reload The Page.', type='success', duration='permanent', button='refresh', queue='get_subtitle') @@ -644,7 +644,7 @@ def episode_download_subtitles(no): for language in ast.literal_eval(episode.missing_subtitles): if language is not None: notifications.write(msg='Searching for ' + str( - language_from_alpha2(language)) + ' subtitles for this episode: ' + path_replace(episode.path), + language_from_alpha2(language)) + ' Subtitles for this episode: ' + path_replace(episode.path), queue='get_subtitle') result = download_subtitle(path_replace(episode.path), str(alpha3_from_alpha2(language.split(':')[0])), @@ -693,7 +693,7 @@ def movies_download_subtitles(no): for i, language in enumerate(ast.literal_eval(movie.missing_subtitles), 1): if providers_list: if language is not None: - notifications.write(msg='Searching for movies subtitles', queue='get_subtitle', item=i, + notifications.write(msg='Searching for Movie Subtitles', queue='get_subtitle', item=i, length=count_movie) result = download_subtitle(path_replace_movie(movie.path), str(alpha3_from_alpha2(language.split(':')[0])), @@ -721,7 +721,7 @@ def movies_download_subtitles(no): list_missing_subtitles_movies(no) if count_movie: - notifications.write(msg='Searching completed. Please reload the page.', type='success', duration='permanent', + notifications.write(msg='Search Complete. Please Reload The Page.', type='success', duration='permanent', button='refresh', queue='get_subtitle') @@ -771,7 +771,7 @@ def wanted_download_subtitles(path, l, count_episodes): for i in range(len(attempt)): if attempt[i][0] == language: if search_active(attempt[i][1]): - notifications.write(msg='Searching for series subtitles...', queue='get_subtitle', item=l, + notifications.write(msg='Searching for Series Subtitles...', queue='get_subtitle', item=l, length=count_episodes) result = download_subtitle(path_replace(episode.path), str(alpha3_from_alpha2(language.split(':')[0])), @@ -840,7 +840,7 @@ def wanted_download_subtitles_movie(path, l, count_movies): for i in range(len(attempt)): if attempt[i][0] == language: if search_active(attempt[i][1]) is True: - notifications.write(msg='Searching for movies subtitles...', queue='get_subtitle', item=l, + notifications.write(msg='Searching for Movie Subtitles...', queue='get_subtitle', item=l, length=count_movies) result = download_subtitle(path_replace_movie(movie.path), str(alpha3_from_alpha2(language.split(':')[0])), @@ -864,7 +864,7 @@ def wanted_download_subtitles_movie(path, l, count_movies): send_notifications_movie(movie.radarr_id, message) else: logging.info( - 'BAZARR Search is not active for movie ' + movie.path + ' Language: ' + attempt[i][0]) + 'BAZARR Search is not active for this Movie ' + movie.path + ' Language: ' + attempt[i][0]) def wanted_search_missing_subtitles(): @@ -917,7 +917,7 @@ def wanted_search_missing_subtitles(): logging.info("BAZARR All providers are throttled") return - logging.info('BAZARR Finished searching for missing subtitles. Check histories for more information.') + logging.info('BAZARR Finished searching for missing Subtitles. Check History for more information.') notifications.write(msg='Searching completed. Please reload the page.', type='success', duration='permanent', button='refresh', queue='get_subtitle') @@ -1184,7 +1184,7 @@ def upgrade_subtitles(): forced_languages = desired_languages if episode['language'] in forced_languages: - notifications.write(msg='Upgrading series subtitles...', + notifications.write(msg='Upgrading Series Subtitles...', queue='upgrade_subtitle', item=i, length=count_episode_to_upgrade) if episode['language'].endswith('forced'): @@ -1233,7 +1233,7 @@ def upgrade_subtitles(): forced_languages = desired_languages if movie['language'] in forced_languages: - notifications.write(msg='Upgrading movie subtitles...', + notifications.write(msg='Upgrading Movie Subtitles...', queue='upgrade_subtitle', item=i, length=count_movie_to_upgrade) if movie['language'].endswith('forced'): From 596e17ea50a578d30b7b4d31c4ef9e569934b598 Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 14:58:59 +0100 Subject: [PATCH 06/35] Update system.tpl --- views/system.tpl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/views/system.tpl b/views/system.tpl index 75c77ca87..01faaa1a7 100644 --- a/views/system.tpl +++ b/views/system.tpl @@ -108,9 +108,9 @@
- - - + + +
@@ -167,7 +167,7 @@
- +
@@ -180,7 +180,7 @@ % if settings.general.getboolean('use_sonarr'):
- +
@@ -194,7 +194,7 @@ % if settings.general.getboolean('use_radarr'):
- +
@@ -207,7 +207,7 @@ % end
- +
@@ -219,7 +219,7 @@
- +
@@ -231,7 +231,7 @@
- +
@@ -243,7 +243,7 @@
- +
@@ -260,19 +260,19 @@
- +
- Bazarr website + Bazarr Website
- +
@@ -284,7 +284,7 @@
- +
@@ -296,7 +296,7 @@
- +
@@ -315,7 +315,7 @@ %for release in releases:

%if release[0][1:] == bazarr_version: - {{release[0]}}
Current version
+ {{release[0]}}
Current Version
%else: {{release[0]}} %end @@ -563,4 +563,4 @@ $("#exception").html(exception); $('#modal').modal('show'); }); - \ No newline at end of file + From f8975ba9eb3617ca0db408efbde89373df0fc8ae Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 15:01:26 +0100 Subject: [PATCH 07/35] Update historyseries.tpl --- views/historyseries.tpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/views/historyseries.tpl b/views/historyseries.tpl index 0380c25af..19d50c385 100644 --- a/views/historyseries.tpl +++ b/views/historyseries.tpl @@ -116,7 +116,7 @@ % forced_languages = desired_languages % end % if row.language in forced_languages: -
+
{{row.description}}
% else: @@ -161,7 +161,7 @@ %end fast forward icon">
-
Total records: {{row_count}}
+
Total Records: {{row_count}}

%end @@ -173,7 +173,7 @@
Series
- statistics + Statistics
@@ -184,7 +184,7 @@ {{stats[0]}}
- Since 24 hours + In 24 Hours
@@ -192,7 +192,7 @@ {{stats[1]}}
- Since one week + In One Week
@@ -200,7 +200,7 @@ {{stats[2]}}
- Since one year + In One Year
@@ -243,4 +243,4 @@ $('.fast.forward').on('click', function(){ loadURLseries({{int(max_page)}}); }); - \ No newline at end of file + From 9465e8e8e1278b3669bdbb75eb92ac5d4d64f2f2 Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 15:03:35 +0100 Subject: [PATCH 08/35] Update historymovies.tpl --- views/historymovies.tpl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/views/historymovies.tpl b/views/historymovies.tpl index aa6aa9b1f..16d548ba0 100644 --- a/views/historymovies.tpl +++ b/views/historymovies.tpl @@ -59,23 +59,23 @@ %if row.action == 0: -
+
%elif row.action == 1: -
+
%elif row.action == 2: -
+
%elif row.action == 3: -
+
%elif row[0] == 4: -
+
%end @@ -101,7 +101,7 @@ % forced_languages = desired_languages % end % if row.languages and row.language and row.language in forced_languages: -
+
{{row.description}}
% else: @@ -146,7 +146,7 @@ %end fast forward icon">
-
Total records: {{row_count}}
+
Total Records: {{row_count}}
%end @@ -158,7 +158,7 @@
Movies
- statistics + Statistics
@@ -169,7 +169,7 @@ {{stats[0]}}
- Since 24 hours + In 24 Hours
@@ -177,7 +177,7 @@ {{stats[1]}}
- Since one week + In One Week
@@ -185,7 +185,7 @@ {{stats[2]}}
- Since one year + In One Year
From 85d9089a19d8fb6af8f85b5dea6bb315255687d3 Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 15:04:44 +0100 Subject: [PATCH 09/35] Update historyseries.tpl --- views/historyseries.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/historyseries.tpl b/views/historyseries.tpl index 19d50c385..b08604ae4 100644 --- a/views/historyseries.tpl +++ b/views/historyseries.tpl @@ -61,23 +61,23 @@ %if row.action == 0: -
+
%elif row.action == 1: -
+
%elif row.action == 2: -
+
%elif row.action == 3: -
+
%elif row.action == 4: -
+
%end @@ -116,7 +116,7 @@ % forced_languages = desired_languages % end % if row.language in forced_languages: -
+
{{row.description}}
% else: From 24c4acc255516bc1d055c65956219b5cd5597294 Mon Sep 17 00:00:00 2001 From: Kraken <10617703+UnhealthyKraken@users.noreply.github.com> Date: Tue, 17 Sep 2019 15:14:09 +0100 Subject: [PATCH 10/35] Update settings_general.tpl --- views/settings_general.tpl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/views/settings_general.tpl b/views/settings_general.tpl index 75cfeeb76..aa8b1d64b 100644 --- a/views/settings_general.tpl +++ b/views/settings_general.tpl @@ -3,7 +3,7 @@
- +
@@ -19,7 +19,7 @@