diff --git a/package.json b/package.json index b6df1dc7..1442de59 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.14.4", + "version": "4.14.5", "description": "FrankerFaceZ is a Twitch enhancement suite.", "license": "Apache-2.0", "scripts": { diff --git a/src/settings/index.js b/src/settings/index.js index 07d2ec22..39407620 100644 --- a/src/settings/index.js +++ b/src/settings/index.js @@ -524,10 +524,10 @@ export default class SettingsManager extends Module { if ( ! ui.key && ui.title ) ui.key = ui.title.toSnakeCase(); - if ( ui.component === 'setting-select-box' && Array.isArray(ui.data) ) { + if ( (ui.component === 'setting-select-box' || ui.component === 'setting-combo-box') && Array.isArray(ui.data) ) { const i18n_base = `${ui.i18n_key || `setting.entry.${key}`}.values`; for(const value of ui.data) { - if ( value.i18n_key === undefined && value.value ) + if ( value.i18n_key === undefined && value.value !== undefined ) value.i18n_key = `${i18n_base}.${value.value}`; } } diff --git a/src/sites/twitch-twilight/modules/menu_button.jsx b/src/sites/twitch-twilight/modules/menu_button.jsx index 8acb3ca5..42163d55 100644 --- a/src/sites/twitch-twilight/modules/menu_button.jsx +++ b/src/sites/twitch-twilight/modules/menu_button.jsx @@ -350,12 +350,14 @@ export default class MenuButton extends SiteModule { { this.renderButtonIcon(profile) } ) + const desc_key = profile.desc_i18n_key || profile.i18n_key && `${profile.i18n_key}.description`; + profiles.push(
{toggle}

{ profile.i18n_key ? this.i18n.t(profile.i18n_key, profile.name, profile) : profile.name }

{profile.description && (
- { profile.desc_i18n_key ? this.i18n.t(profile.desc_i18n_key, profile.description, profile) : profile.description } + { desc_key ? this.i18n.t(desc_key, profile.description, profile) : profile.description }
)}
);