github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-13 16:43:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed translations for columns

Browse source 
(cherry picked from commit 6d53d2a153a98070c42d0619c15902b6bd5dfab4)

Closes #3897
This commit is contained in:
Mark McDowall 2023-07-19 17:52:19 -07:00 • committed by Bogdan
parent 6c9ee67e51
commit 7406e0e3b7
6 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/Components/Icon.js
View file

@ -41,7 +41,7 @@ class Icon extends PureComponent {
return ( return (
<span <span
className={containerClassName} className={containerClassName}
title={title} title={typeof title === 'function' ? title() : title}
> >
{icon} {icon}
</span> </span>
@ -58,7 +58,7 @@ Icon.propTypes = {
name: PropTypes.object.isRequired, name: PropTypes.object.isRequired,
kind: PropTypes.string.isRequired, kind: PropTypes.string.isRequired,
size: PropTypes.number.isRequired, size: PropTypes.number.isRequired,
title: PropTypes.string, title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
isSpinning: PropTypes.bool.isRequired, isSpinning: PropTypes.bool.isRequired,
fixedWidth: PropTypes.bool.isRequired fixedWidth: PropTypes.bool.isRequired
}; };

2
frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
View file

@ -74,7 +74,7 @@ const columns = [
name: 'customFormats', name: 'customFormats',
label: React.createElement(Icon, { label: React.createElement(Icon, {
name: icons.INTERACTIVE, name: icons.INTERACTIVE,
title: translate('CustomFormat') title: () => translate('CustomFormat')
}), }),
isSortable: true, isSortable: true,
isVisible: true isVisible: true

2
frontend/src/InteractiveSearch/InteractiveSearch.js
View file

@ -60,7 +60,7 @@ const columns = [
name: 'customFormatScore', name: 'customFormatScore',
label: React.createElement(Icon, { label: React.createElement(Icon, {
name: icons.SCORE, name: icons.SCORE,
title: translate('CustomFormatScore') title: () => translate('CustomFormatScore')
}), }),
isSortable: true, isSortable: true,
isVisible: true isVisible: true

2
frontend/src/Store/Actions/queueActions.js
View file

@ -100,7 +100,7 @@ export const defaultState = {
columnLabel: translate('CustomFormatScore'), columnLabel: translate('CustomFormatScore'),
label: React.createElement(Icon, { label: React.createElement(Icon, {
name: icons.SCORE, name: icons.SCORE,
title: translate('CustomFormatScore') title: () => translate('CustomFormatScore')
}), }),
isVisible: false isVisible: false
}, },

2
frontend/src/Store/Actions/trackActions.js
View file

@ -68,7 +68,7 @@ export const defaultState = {
columnLabel: translate('CustomFormatScore'), columnLabel: translate('CustomFormatScore'),
label: React.createElement(Icon, { label: React.createElement(Icon, {
name: icons.SCORE, name: icons.SCORE,
title: translate('CustomFormatScore') title: () => translate('CustomFormatScore')
}), }),
isVisible: false isVisible: false
}, },

15
frontend/src/Store/Middleware/createPersistState.js
View file

@ -36,10 +36,17 @@ function mergeColumns(path, initialState, persistedState, computedState) {
const column = initialColumns.find((i) => i.name === persistedColumn.name); const column = initialColumns.find((i) => i.name === persistedColumn.name);
if (column) { if (column) {
columns.push({ const newColumn = {};
...column,
isVisible: persistedColumn.isVisible // We can't use a spread operator or Object.assign to clone the column
}); // or any accessors are lost and can break translations.
for (const prop of Object.keys(column)) {
Object.defineProperty(newColumn, prop, Object.getOwnPropertyDescriptor(column, prop));
}
newColumn.isVisible = persistedColumn.isVisible;
columns.push(newColumn);
} }
}); });