Lint and i18n

This commit is contained in:
Jorik Schellekens 2020-06-18 13:28:24 +01:00
parent a250bf6a97
commit a579ea95db
2 changed files with 19 additions and 18 deletions

View file

@ -35,27 +35,27 @@ interface IProps {
} }
interface IThemeState { interface IThemeState {
theme: string, theme: string;
useSystemTheme: boolean, useSystemTheme: boolean;
} }
export interface CustomThemeMessage { export interface CustomThemeMessage {
isError: boolean, isError: boolean;
text: string text: string;
}; };
interface IState extends IThemeState { interface IState extends IThemeState {
// String displaying the current selected fontSize. // String displaying the current selected fontSize.
// Needs to be string for things like '17.' without // Needs to be string for things like '17.' without
// trailing 0s. // trailing 0s.
fontSize: string, fontSize: string;
customThemeUrl: string, customThemeUrl: string;
customThemeMessage: CustomThemeMessage, customThemeMessage: CustomThemeMessage;
useCustomFontSize: boolean, useCustomFontSize: boolean;
useIRCLayout: boolean, useIRCLayout: boolean;
} }
const MESSAGE_PREVIEW_TEXT = "Hey you. You're the best" const MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> { export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
@ -70,7 +70,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
customThemeUrl: "", customThemeUrl: "",
customThemeMessage: {isError: false, text: ""}, customThemeMessage: {isError: false, text: ""},
useCustomFontSize: SettingsStore.getValue("useCustomFontSize"), useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
useIRCLayout: SettingsStore.getValue("useIRCLayout", null), useIRCLayout: SettingsStore.getValue("useIRCLayout"),
}; };
} }
@ -277,7 +277,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
return <StyledRadioButton return <StyledRadioButton
key={theme.id} key={theme.id}
value={theme.id} value={theme.id}
name={"theme"} name="theme"
disabled={this.state.useSystemTheme} disabled={this.state.useSystemTheme}
checked={!this.state.useSystemTheme && theme.id === this.state.theme} checked={!this.state.useSystemTheme && theme.id === this.state.theme}
className={"mx_ThemeSelector_" + theme.id} className={"mx_ThemeSelector_" + theme.id}
@ -350,11 +350,11 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
<MessagePreview <MessagePreview
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview" className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
message={MESSAGE_PREVIEW_TEXT} message={MESSAGE_PREVIEW_TEXT}
useIRCLayout={true} useIRCLayout="true"
/> />
<StyledRadioButton <StyledRadioButton
name={"layout"} name="layout"
value={true} value="true"
checked={this.state.useIRCLayout} checked={this.state.useIRCLayout}
onChange={this.onLayoutChange} onChange={this.onLayoutChange}
> >
@ -366,11 +366,11 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
<MessagePreview <MessagePreview
className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview" className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
message={MESSAGE_PREVIEW_TEXT} message={MESSAGE_PREVIEW_TEXT}
useIRCLayout={false} useIRCLayout="false"
/> />
<StyledRadioButton <StyledRadioButton
name={"layout"} name="layout"
value={false} value="false"
checked={!this.state.useIRCLayout} checked={!this.state.useIRCLayout}
onChange={this.onLayoutChange} onChange={this.onLayoutChange}
> >

View file

@ -771,6 +771,7 @@
"Downloading update...": "Downloading update...", "Downloading update...": "Downloading update...",
"New version available. <a>Update now.</a>": "New version available. <a>Update now.</a>", "New version available. <a>Update now.</a>": "New version available. <a>Update now.</a>",
"Check for update": "Check for update", "Check for update": "Check for update",
"Hey you. You're the best!": "Hey you. You're the best!",
"Size must be a number": "Size must be a number", "Size must be a number": "Size must be a number",
"Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt", "Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt",
"Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt", "Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt",