diff --git a/src/components/Lists/Proxiwash/ProxiwashListItem.js b/src/components/Lists/Proxiwash/ProxiwashListItem.js index bee78f2..c66edb3 100644 --- a/src/components/Lists/Proxiwash/ProxiwashListItem.js +++ b/src/components/Lists/Proxiwash/ProxiwashListItem.js @@ -69,7 +69,7 @@ class ProxiwashListItem extends React.Component { 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), diff --git a/src/screens/Other/Settings/SettingsScreen.js b/src/screens/Other/Settings/SettingsScreen.js index efbbd05..355e050 100644 --- a/src/screens/Other/Settings/SettingsScreen.js +++ b/src/screens/Other/Settings/SettingsScreen.js @@ -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 { onValueChange={this.onSelectWashValueChange} value={selectedWash}> ); diff --git a/src/screens/Proxiwash/ProxiwashAboutScreen.js b/src/screens/Proxiwash/ProxiwashAboutScreen.js index 6a3b7c5..3aec251 100644 --- a/src/screens/Proxiwash/ProxiwashAboutScreen.js +++ b/src/screens/Proxiwash/ProxiwashAboutScreen.js @@ -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 { return ( ( )} /> - {item.description} + {i18n.t(item.description)} {i18n.t('screens.proxiwash.tariffs')} - {item.tarif} + {i18n.t(item.tarif)} {i18n.t('screens.proxiwash.paymentMethods')} - {item.paymentMethods} + {i18n.t(item.paymentMethods)} ); diff --git a/src/screens/Proxiwash/ProxiwashScreen.js b/src/screens/Proxiwash/ProxiwashScreen.js index ae57e5c..f1129bc 100644 --- a/src/screens/Proxiwash/ProxiwashScreen.js +++ b/src/screens/Proxiwash/ProxiwashScreen.js @@ -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,