mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Translations for columns 

(cherry picked from commit 6d53d2a153a98070c42d0619c15902b6bd5dfab4)
This commit is contained in:
Mark McDowall 2023-07-19 17:52:19 -07:00 committed by Bogdan
parent ed5c063127
commit 53eb88d9a9
2 changed files with 13 additions and 6 deletions
Show Stats 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
}; };

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);
} }
}); });