From 8664b95ca12ad249e0219e6ec9a5a39a795a61ce Mon Sep 17 00:00:00 2001 From: FSCorrupt <45659314+fscorrupt@users.noreply.github.com> Date: Thu, 22 Dec 2022 01:26:32 +0100 Subject: [PATCH] Adding stream audio/sub language to activity card. (#1900) * Update current_activity_instance.html * Update index.html * Make sure language is capitalized on activity card Co-authored-by: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> --- .../default/current_activity_instance.html | 16 ++++++++-------- data/interfaces/default/index.html | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 2c24c233..83660745 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -266,11 +266,11 @@ DOCUMENTATION :: END
% if data['stream_audio_decision']: % if data['stream_audio_decision'] == 'transcode': - Transcode (${AUDIO_CODEC_OVERRIDES.get(data['audio_codec'], data['audio_codec'].upper())} ${data['audio_channel_layout'].split('(')[0].capitalize()} ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()}) + Transcode (${data['stream_audio_language'].capitalize()} - ${AUDIO_CODEC_OVERRIDES.get(data['audio_codec'], data['audio_codec'].upper())} ${data['audio_channel_layout'].split('(')[0].capitalize()} ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()}) % elif data['stream_audio_decision'] == 'copy': - Direct Stream (${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()}) + Direct Stream (${data['stream_audio_language'].capitalize()} - ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()}) % else: - Direct Play (${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()}) + Direct Play (${data['stream_audio_language'].capitalize()} - ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()}) % endif % endif
@@ -285,13 +285,13 @@ DOCUMENTATION :: END subtitle_codec = 'None' if data['stream_subtitle_codec'] and data['stream_subtitle_transient'] else data['subtitle_codec'].upper() %> % if data['stream_subtitle_decision'] == 'transcode': - Transcode (${subtitle_codec} ${data['stream_subtitle_codec'].upper()}) + Transcode (${data['stream_subtitle_language'].capitalize()} - ${subtitle_codec} ${data['stream_subtitle_codec'].upper()}) % elif data['stream_subtitle_decision'] == 'copy': - Direct Stream (${subtitle_codec}) + Direct Stream (${data['stream_subtitle_language'].capitalize()} - ${subtitle_codec}) % elif data['stream_subtitle_decision'] == 'burn': - Burn (${subtitle_codec}) + Burn (${data['stream_subtitle_language'].capitalize()} - ${subtitle_codec}) % else: - Direct Play (${subtitle_codec if data['synced_version'] else data['stream_subtitle_codec'].upper()}) + Direct Play (${data['stream_subtitle_language'].capitalize()} - ${subtitle_codec if data['synced_version'] else data['stream_subtitle_codec'].upper()}) % endif % else: None @@ -537,4 +537,4 @@ DOCUMENTATION :: END -% endif \ No newline at end of file +% endif diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index b96e67cf..adcefce6 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -526,11 +526,11 @@ var a_codec = (s.audio_codec === 'truehd') ? 'TrueHD' : s.audio_codec.toUpperCase(); var sa_codec = (s.stream_audio_codec === 'truehd') ? 'TrueHD' : s.stream_audio_codec.toUpperCase(); if (s.stream_audio_decision === 'transcode') { - audio_decision = 'Transcode (' + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')'; + audio_decision = 'Transcode ('+ capitalizeFirstLetter(s.stream_audio_language)+ ' - ' + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')'; } else if (s.stream_audio_decision === 'copy') { - audio_decision = 'Direct Stream (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')'; + audio_decision = 'Direct Stream ('+ capitalizeFirstLetter(s.stream_audio_language)+ ' - ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')'; } else { - audio_decision = 'Direct Play (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')'; + audio_decision = 'Direct Play ('+ capitalizeFirstLetter(s.stream_audio_language)+ ' - ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')'; } } $('#audio_decision-' + key).html(audio_decision); @@ -539,13 +539,13 @@ if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.subtitles === 1) { var subtitle_codec = (s.stream_subtitle_codec && s.stream_subtitle_transient) ? 'None' : s.subtitle_codec.toUpperCase(); if (s.stream_subtitle_decision === 'transcode') { - subtitle_decision = 'Transcode (' + subtitle_codec + ' ' + s.stream_subtitle_codec.toUpperCase() + ')'; + subtitle_decision = 'Transcode ('+ capitalizeFirstLetter(s.stream_subtitle_language)+ ' - ' + subtitle_codec + ' ' + s.stream_subtitle_codec.toUpperCase() + ')'; } else if (s.stream_subtitle_decision === 'copy') { - subtitle_decision = 'Direct Stream (' + subtitle_codec + ')'; + subtitle_decision = 'Direct Stream ('+ capitalizeFirstLetter(s.stream_subtitle_language)+ ' - ' + subtitle_codec + ')'; } else if (s.stream_subtitle_decision === 'burn') { - subtitle_decision = 'Burn (' + subtitle_codec + ')'; + subtitle_decision = 'Burn ('+ capitalizeFirstLetter(s.stream_subtitle_language)+ ' - ' + subtitle_codec + ')'; } else { - subtitle_decision = 'Direct Play (' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')'; + subtitle_decision = 'Direct Play ('+ capitalizeFirstLetter(s.stream_subtitle_language)+ ' - ' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')'; } } $('#subtitle_decision-' + key).html(subtitle_decision); @@ -1076,4 +1076,4 @@ } % endif - \ No newline at end of file +