diff options
| author | Starfall <us@starfall.systems> | 2020-07-23 16:25:58 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-23 16:25:58 -0500 |
| commit | 2b41ed0fd69a7f7a0e17d6f0c6a421805c5e3127 (patch) | |
| tree | a3ab43415b061112bc614205a3bb96bb9718bbd0 /app/javascript/flavours/glitch/components | |
| parent | e3d96a9bc62f57d60dc21906b4b803e346b0a738 (diff) | |
| parent | 16416e940fd803af92377eee9a1756ef27eed199 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/javascript/flavours/glitch/components')
| -rw-r--r-- | app/javascript/flavours/glitch/components/common_counter.js | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/components/scrollable_list.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/common_counter.js b/app/javascript/flavours/glitch/components/common_counter.js index 4fdf3babf..e10cd9b76 100644 --- a/app/javascript/flavours/glitch/components/common_counter.js +++ b/app/javascript/flavours/glitch/components/common_counter.js @@ -37,7 +37,7 @@ export function counterRenderer(counterType, isBold = true) { return (displayNumber, pluralReady) => ( <FormattedMessage id='account.following_counter' - defaultMessage='{count, plural, other {{counter} Following}}' + defaultMessage='{count, plural, one {{counter} Following} other {{counter} Following}}' values={{ count: pluralReady, counter: renderCounter(displayNumber), diff --git a/app/javascript/flavours/glitch/components/scrollable_list.js b/app/javascript/flavours/glitch/components/scrollable_list.js index 5d10ed650..cc8d9f1f3 100644 --- a/app/javascript/flavours/glitch/components/scrollable_list.js +++ b/app/javascript/flavours/glitch/components/scrollable_list.js @@ -20,7 +20,7 @@ const mapStateToProps = (state, { scrollKey }) => { }; }; -export default @connect(mapStateToProps) +export default @connect(mapStateToProps, null, null, { forwardRef: true }) class ScrollableList extends PureComponent { static contextTypes = { |