i18n irc and fix lint from merge conflict

This commit is contained in:
Michael Telatynski 2021-07-20 11:18:27 +01:00
parent d3934ff7da
commit b94886a291
2 changed files with 6 additions and 5 deletions

View file

@ -407,10 +407,10 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
<StyledRadioButton
name="layout"
value="irc"
checked={this.state.layout == Layout.IRC}
checked={this.state.layout === Layout.IRC}
onChange={this.onLayoutChange}
>
{ "IRC" }
{ _t("IRC") }
</StyledRadioButton>
</div>
<div className="mx_AppearanceUserSettingsTab_spacer" />
@ -431,12 +431,12 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
checked={this.state.layout == Layout.Group}
onChange={this.onLayoutChange}
>
{_t("Modern")}
{ _t("Modern") }
</StyledRadioButton>
</div>
<div className="mx_AppearanceUserSettingsTab_spacer" />
<div className={classNames("mx_AppearanceUserSettingsTab_Layout_RadioButton", {
mx_AppearanceUserSettingsTab_Layout_RadioButton_selected: this.state.layout == Layout.Bubble,
mx_AppearanceUserSettingsTab_Layout_RadioButton_selected: this.state.layout === Layout.Bubble,
})}>
<EventTilePreview
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
@ -452,7 +452,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
checked={this.state.layout == Layout.Bubble}
onChange={this.onLayoutChange}
>
{_t("Message bubbles")}
{ _t("Message bubbles") }
</StyledRadioButton>
</div>
</div>

View file

@ -1247,6 +1247,7 @@
"Add theme": "Add theme",
"Theme": "Theme",
"Message layout": "Message layout",
"IRC": "IRC",
"Modern": "Modern",
"Message bubbles": "Message bubbles",
"Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Set the name of a font installed on your system & %(brand)s will attempt to use it.",