Bug Correction

- bad language display
- update 'maxWeight ' to maxWeight
This commit is contained in:
docjyJ 2020-09-12 11:59:48 +02:00
parent 5b6176a361
commit c5b6e128ee
4 changed files with 21 additions and 22 deletions

View file

@ -69,7 +69,7 @@ class ProxiwashListItem extends React.Component<PropsType> {
this.updateStateStrings();
let displayNumber = props.item.number;
const displayMaxWeight = props.item['maxWeight '];
const displayMaxWeight = props.item.maxWeight;
if (AprilFoolsManager.getInstance().isAprilFoolsEnabled())
displayNumber = AprilFoolsManager.getProxiwashMachineDisplayNumber(
parseInt(props.item.number, 10),

View file

@ -19,7 +19,6 @@ import AsyncStorageManager from '../../../managers/AsyncStorageManager';
import CustomSlider from '../../../components/Overrides/CustomSlider';
import CollapsibleScrollView from '../../../components/Collapsible/CollapsibleScrollView';
import type {ListIconPropsType} from '../../../constants/PaperStyles';
import {PROXIWASH_DATA} from '../../Proxiwash/ProxiwashAboutScreen';
type PropsType = {
navigation: StackNavigationProp,
@ -130,12 +129,12 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
onValueChange={this.onSelectWashValueChange}
value={selectedWash}>
<RadioButton.Item
label={PROXIWASH_DATA.washinsa.title}
value={PROXIWASH_DATA.washinsa.id}
label={i18n.t('screens.proxiwash.washinsa.title')}
value="washinsa"
/>
<RadioButton.Item
label={PROXIWASH_DATA.tripodeB.title}
value={PROXIWASH_DATA.tripodeB.id}
label={i18n.t('screens.proxiwash.tripodeB.title')}
value="tripodeB"
/>
</RadioButton.Group>
);

View file

@ -23,22 +23,22 @@ export type LaverieType = {
export const PROXIWASH_DATA = {
washinsa: {
id: 'washinsa',
title: i18n.t('screens.proxiwash.washinsa.title'),
subtitle: i18n.t('screens.proxiwash.washinsa.subtitle'),
description: i18n.t('screens.proxiwash.washinsa.description'),
tarif: i18n.t('screens.proxiwash.washinsa.tariff'),
paymentMethods: i18n.t('screens.proxiwash.washinsa.paymentMethods'),
title: 'screens.proxiwash.washinsa.title',
subtitle: 'screens.proxiwash.washinsa.subtitle',
description: 'screens.proxiwash.washinsa.description',
tarif: 'screens.proxiwash.washinsa.tariff',
paymentMethods: 'screens.proxiwash.washinsa.paymentMethods',
icon: 'school-outline',
url:
'https://etud.insa-toulouse.fr/~amicale_app/v2/washinsa/washinsa_data.json',
},
tripodeB: {
id: 'tripodeB',
title: i18n.t('screens.proxiwash.tripodeB.title'),
subtitle: i18n.t('screens.proxiwash.tripodeB.subtitle'),
description: i18n.t('screens.proxiwash.tripodeB.description'),
tarif: i18n.t('screens.proxiwash.tripodeB.tariff'),
paymentMethods: i18n.t('screens.proxiwash.tripodeB.paymentMethods'),
title: 'screens.proxiwash.tripodeB.title',
subtitle: 'screens.proxiwash.tripodeB.subtitle',
description: 'screens.proxiwash.tripodeB.description',
tarif: 'screens.proxiwash.tripodeB.tariff',
paymentMethods: 'screens.proxiwash.tripodeB.paymentMethods',
icon: 'domain',
url:
'https://etud.insa-toulouse.fr/~amicale_app/v2/washinsa/tripode_b_data.json',
@ -53,18 +53,18 @@ export default class ProxiwashAboutScreen extends React.Component<null> {
return (
<Card style={{margin: 5}}>
<Card.Title
title={item.title}
subtitle={item.subtitle}
title={i18n.t(item.title)}
subtitle={i18n.t(item.subtitle)}
left={(iconProps: CardTitleIconPropsType): React.Node => (
<Avatar.Icon size={iconProps.size} icon={item.icon} />
)}
/>
<Card.Content>
<Paragraph>{item.description}</Paragraph>
<Paragraph>{i18n.t(item.description)}</Paragraph>
<Title>{i18n.t('screens.proxiwash.tariffs')}</Title>
<Paragraph>{item.tarif}</Paragraph>
<Paragraph>{i18n.t(item.tarif)}</Paragraph>
<Title>{i18n.t('screens.proxiwash.paymentMethods')}</Title>
<Paragraph>{item.paymentMethods}</Paragraph>
<Paragraph>{i18n.t(item.paymentMethods)}</Paragraph>
</Card.Content>
</Card>
);

View file

@ -37,7 +37,7 @@ const LIST_ITEM_HEIGHT = 64;
export type ProxiwashMachineType = {
number: string,
state: string,
'maxWeight ': number,
maxWeight: number,
startTime: string,
endTime: string,
donePercent: string,