Replaced hardcoded app name with parameter in localizable strings (#2807)

This commit is contained in:
Dmitry Lyzlov
2023-08-29 14:17:55 +03:00
committed by GitHub
parent a8a00a3d03
commit d8a42d68db
6 changed files with 27 additions and 12 deletions

View File

@@ -7,6 +7,8 @@ import classNames from 'classnames';
import {useIntl} from 'react-intl';
import {app} from 'electron';
import FileSizeAndStatus from './FileSizeAndStatus';
import ProgressBar from './ProgressBar';
import ThreeDotButton from './ThreeDotButton';
@@ -28,7 +30,7 @@ const DownloadsDropdownItemFile = ({item, activeItem}: OwnProps) => {
};
const itemFilename = item.type === 'update' ?
translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `Mattermost version ${item.filename}`}, {version: item.filename}) :
translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: app.name}) :
item.filename;
return (

View File

@@ -8,6 +8,8 @@ import {FormattedMessage} from 'react-intl';
import {Button} from 'react-bootstrap';
import {app} from 'electron';
import Thumbnail from '../Thumbnail';
type OwnProps = {
@@ -33,8 +35,11 @@ const UpdateAvailable = ({item}: OwnProps) => {
<div className='DownloadsDropdown__Update__Details__Description'>
<FormattedMessage
id='renderer.downloadsDropdown.Update.ANewVersionIsAvailableToInstall'
defaultMessage={`A new version of the Mattermost Desktop App (version ${item.filename}) is available to install.`}
values={{version: item.filename}}
defaultMessage={`A new version of the {appName} Desktop App (version ${item.filename}) is available to install.`}
values={{
version: item.filename,
appName: app.name,
}}
/>
</div>
<Button

View File

@@ -10,6 +10,8 @@ import {Button} from 'react-bootstrap';
import classNames from 'classnames';
import {app} from 'electron';
import Thumbnail from '../Thumbnail';
import FileSizeAndStatus from '../FileSizeAndStatus';
@@ -31,7 +33,7 @@ const UpdateAvailable = ({item}: OwnProps) => {
<Thumbnail item={item}/>
<div className='DownloadsDropdown__File__Body__Details'>
<div className='DownloadsDropdown__File__Body__Details__Filename'>
{translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `Mattermost version ${item.filename}`}, {version: item.filename})}
{translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: app.name})}
</div>
<div
className={classNames('DownloadsDropdown__File__Body__Details__FileSizeAndStatus', {

View File

@@ -519,7 +519,7 @@ class MainPage extends React.PureComponent<Props, State> {
>
{window.process.platform !== 'linux' && this.state.servers.length === 0 && (
<div className='app-title'>
{intl.formatMessage({id: 'renderer.components.mainPage.titleBar', defaultMessage: 'Mattermost'})}
{intl.formatMessage({id: 'renderer.components.mainPage.titleBar', defaultMessage: '{appName}'}, {appName: this.props.appName})}
</div>
)}
<button

View File

@@ -946,7 +946,10 @@ class SettingsPage extends React.PureComponent<Props, State> {
<FormText>
<FormattedMessage
id='renderer.components.settingsPage.enableHardwareAcceleration.description'
defaultMessage='If enabled, Mattermost UI is rendered more efficiently but can lead to decreased stability for some systems.'
defaultMessage='If enabled, {appName} UI is rendered more efficiently but can lead to decreased stability for some systems.'
values={{
appName: this.state.appName,
}}
/>
{' '}
<FormattedMessage
@@ -975,7 +978,10 @@ class SettingsPage extends React.PureComponent<Props, State> {
<FormText>
<FormattedMessage
id='renderer.components.settingsPage.fullscreen.description'
defaultMessage='If enabled, the Mattermost application will always open in full screen'
defaultMessage='If enabled, the {appName} application will always open in full screen'
values={{
appName: this.state.appName,
}}
/>
</FormText>
</FormCheck>,