Merge remote-tracking branch 'origin/develop' into feature_confetti#14676

This commit is contained in:
Travis Ralston 2020-12-07 14:58:56 -07:00
commit 2c992c456e
100 changed files with 3268 additions and 1825 deletions

View file

@ -394,7 +394,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
className="mx_AppearanceUserSettingsTab_AdvancedToggle"
onClick={() => this.setState({showAdvanced: !this.state.showAdvanced})}
>
{this.state.showAdvanced ? "Hide advanced" : "Show advanced"}
{this.state.showAdvanced ? _t("Hide advanced") : _t("Show advanced")}
</div>;
let advanced: React.ReactNode;