Rename existing warnings to notices

This commit is contained in:
timvisee 2025-04-23 10:08:11 +02:00
parent d0f21e8078
commit 1fb2f45285
No known key found for this signature in database
GPG key ID: B8DB720BC383E172
3 changed files with 12 additions and 12 deletions

View file

@ -486,12 +486,12 @@ module.exports.empty = function(state, emit) {
})} })}
</button> </button>
`; `;
const warning = state.WEB_UI.UPLOAD_AREA_WARNING_HTML const uploadNotice = state.WEB_UI.UPLOAD_AREA_NOTICE_HTML
? html` ? html`
<p <p
class="w-full mt-8 p-2 border-default dark:border-grey-70 rounded-default text-orange-60 bg-yellow-40 text-center leading-normal" class="w-full mt-8 p-2 border-default dark:border-grey-70 rounded-default text-orange-60 bg-yellow-40 text-center leading-normal"
> >
${raw(state.WEB_UI.UPLOAD_AREA_WARNING_HTML)} ${raw(state.WEB_UI.UPLOAD_AREA_NOTICE_HTML)}
</p> </p>
` `
: ''; : '';
@ -536,7 +536,7 @@ module.exports.empty = function(state, emit) {
> >
${state.translate('addFilesButton')} ${state.translate('addFilesButton')}
</label> </label>
${upsell} ${warning} ${upsell} ${uploadNotice}
</send-upload-area> </send-upload-area>
`; `;
@ -569,12 +569,12 @@ module.exports.preview = function(state, emit) {
${archiveDetails(state.translate, archive)} ${archiveDetails(state.translate, archive)}
</div> </div>
`; `;
const warning = state.WEB_UI.DOWNLOAD_WARNING_HTML const notice = state.WEB_UI.DOWNLOAD_NOTICE_HTML
? html` ? html`
<p <p
class="w-full mt-4 p-2 border-default dark:border-grey-70 rounded-default text-orange-60 bg-yellow-40 text-center leading-normal" class="w-full mt-4 p-2 border-default dark:border-grey-70 rounded-default text-orange-60 bg-yellow-40 text-center leading-normal"
> >
${raw(state.WEB_UI.DOWNLOAD_WARNING_HTML)} ${raw(state.WEB_UI.DOWNLOAD_NOTICE_HTML)}
</p> </p>
` `
: ''; : '';
@ -594,7 +594,7 @@ module.exports.preview = function(state, emit) {
> >
${state.translate('downloadButtonLabel')} ${state.translate('downloadButtonLabel')}
</button> </button>
${warning} ${notice}
</send-archive> </send-archive>
`; `;

View file

@ -16,9 +16,9 @@ module.exports = {
CUSTOM_FOOTER_TEXT: config.custom_footer_text, CUSTOM_FOOTER_TEXT: config.custom_footer_text,
CUSTOM_FOOTER_URL: config.custom_footer_url, CUSTOM_FOOTER_URL: config.custom_footer_url,
MAIN_NOTICE_HTML: config.main_notice_html, MAIN_NOTICE_HTML: config.main_notice_html,
UPLOAD_AREA_WARNING_HTML: config.upload_area_warning_html, UPLOAD_AREA_NOTICE_HTML: config.upload_area_notice_html,
DOWNLOAD_LIST_NOTICE_HTML: config.download_list_notice_html, DOWNLOAD_LIST_NOTICE_HTML: config.download_list_notice_html,
DOWNLOAD_WARNING_HTML: config.download_warning_html, DOWNLOAD_NOTICE_HTML: config.download_notice_html,
COLORS: { COLORS: {
PRIMARY: config.ui_color_primary, PRIMARY: config.ui_color_primary,
ACCENT: config.ui_color_accent ACCENT: config.ui_color_accent

View file

@ -269,20 +269,20 @@ const conf = convict({
default: '', default: '',
env: 'SEND_MAIN_NOTICE_HTML' env: 'SEND_MAIN_NOTICE_HTML'
}, },
upload_area_warning_html: { upload_area_notice_html: {
format: String, format: String,
default: '', default: '',
env: 'SEND_UPLOAD_AREA_WARNING_HTML' env: 'SEND_UPLOAD_AREA_NOTICE_HTML'
}, },
download_list_notice_html: { download_list_notice_html: {
format: String, format: String,
default: '', default: '',
env: 'SEND_DOWNLOAD_LIST_NOTICE_HTML' env: 'SEND_DOWNLOAD_LIST_NOTICE_HTML'
}, },
download_warning_html: { download_notice_html: {
format: String, format: String,
default: '', default: '',
env: 'SEND_DOWNLOAD_WARNING_HTML' env: 'SEND_DOWNLOAD_NOTICE_HTML'
}, },
ui_color_primary: { ui_color_primary: {
format: String, format: String,