diff --git a/components/settings/about.js b/components/settings/about.js index fbeb32e..96d0b96 100644 --- a/components/settings/about.js +++ b/components/settings/about.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import { View, ScrollView } from 'react-native' import AppText from '../app-text' import styles from '../../styles/index' -import { settings as labels } from '../../i18n/en/settings' +import labels from '../../i18n/en/settings' export default class AboutSection extends Component { render() { return ( diff --git a/components/settings/import-export/import-dialog.js b/components/settings/import-export/import-dialog.js index fe374c8..2ff977e 100644 --- a/components/settings/import-export/import-dialog.js +++ b/components/settings/import-export/import-dialog.js @@ -3,7 +3,7 @@ import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker import rnfs from 'react-native-fs' import importCsv from '../../../lib/import-export/import-from-csv' import { shared as sharedLabels } from '../../../i18n/en/labels' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' import alertError from '../alert-error' export default function openImportDialogAndImport() { diff --git a/components/settings/import-export/index.js b/components/settings/import-export/index.js index 4ea77dd..430f29b 100644 --- a/components/settings/import-export/index.js +++ b/components/settings/import-export/index.js @@ -4,7 +4,7 @@ import { TouchableOpacity, } from 'react-native' import styles from '../../../styles/index' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' import AppText from '../../app-text' import openImportDialogAndImport from './import-dialog' import openShareDialogAndExport from './export-dialog' diff --git a/components/settings/nfp-settings/index.js b/components/settings/nfp-settings/index.js index ceb48a8..bac516c 100644 --- a/components/settings/nfp-settings/index.js +++ b/components/settings/nfp-settings/index.js @@ -3,7 +3,7 @@ import { ScrollView, View } from 'react-native' import styles from '../../../styles' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' import AppText from '../../app-text' import TempSlider from './temp-slider' import UseCervixSetting from './use-cervix' diff --git a/components/settings/nfp-settings/temp-slider.js b/components/settings/nfp-settings/temp-slider.js index c4e2988..9dcdfb9 100644 --- a/components/settings/nfp-settings/temp-slider.js +++ b/components/settings/nfp-settings/temp-slider.js @@ -7,7 +7,7 @@ import { saveTempScale, } from '../../../local-storage' import { secondaryColor } from '../../../styles/index' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' import config from '../../../config' import alertError from '../alert-error' diff --git a/components/settings/nfp-settings/use-cervix.js b/components/settings/nfp-settings/use-cervix.js index 2c7f868..ecfe5d3 100644 --- a/components/settings/nfp-settings/use-cervix.js +++ b/components/settings/nfp-settings/use-cervix.js @@ -10,7 +10,7 @@ import { saveUseCervix } from '../../../local-storage' import styles from '../../../styles/index' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' export default class UseCervixSetting extends Component { constructor() { diff --git a/components/settings/password/delete.js b/components/settings/password/delete.js index d75f2de..6cef844 100644 --- a/components/settings/password/delete.js +++ b/components/settings/password/delete.js @@ -6,7 +6,7 @@ import { import nodejs from 'nodejs-mobile-react-native' import AppText from '../../app-text' import styles from '../../../styles' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' import { requestHash, changeEncryptionAndRestartApp } from '../../../db' import PasswordField from './password-field' import showBackUpReminder from './show-backup-reminder' diff --git a/components/settings/password/index.js b/components/settings/password/index.js index 22b48c7..f5741e3 100644 --- a/components/settings/password/index.js +++ b/components/settings/password/index.js @@ -8,7 +8,7 @@ import { hasEncryptionObservable } from '../../../local-storage' import styles from '../../../styles/index' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' export default class PasswordSetting extends Component { constructor(props) { diff --git a/components/settings/password/show-backup-reminder.js b/components/settings/password/show-backup-reminder.js index 708b81c..f61e5a4 100644 --- a/components/settings/password/show-backup-reminder.js +++ b/components/settings/password/show-backup-reminder.js @@ -1,6 +1,6 @@ import { Alert } from 'react-native' import { shared } from '../../../i18n/en/labels' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' export default function showBackUpReminder(okHandler, isDelete) { let title, message diff --git a/components/settings/reminders/period-reminder.js b/components/settings/reminders/period-reminder.js index b091741..3c07c10 100644 --- a/components/settings/reminders/period-reminder.js +++ b/components/settings/reminders/period-reminder.js @@ -9,7 +9,7 @@ import { savePeriodReminder } from '../../../local-storage' import styles from '../../../styles/index' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' export default class PeriodReminderPicker extends Component { constructor(props) { diff --git a/components/settings/reminders/temp-reminder-picker.js b/components/settings/reminders/temp-reminder-picker.js index 1a37d41..09dda42 100644 --- a/components/settings/reminders/temp-reminder-picker.js +++ b/components/settings/reminders/temp-reminder-picker.js @@ -11,7 +11,7 @@ import { saveTempReminder } from '../../../local-storage' import styles from '../../../styles/index' -import { settings as labels } from '../../../i18n/en/settings' +import labels from '../../../i18n/en/settings' import padWithZeros from '../../helpers/pad-time-with-zeros' export default class TempReminderPicker extends Component { diff --git a/components/settings/settings-menu.js b/components/settings/settings-menu.js index 502759a..4152c11 100644 --- a/components/settings/settings-menu.js +++ b/components/settings/settings-menu.js @@ -4,10 +4,12 @@ import { ScrollView, } from 'react-native' import styles from '../../styles/index' -import { settings as settingsLabels } from '../../i18n/en/settings' +import settingsLabels from '../../i18n/en/settings' import AppText from '../app-text' +console.log(settingsLabels.menuTitles) const labels = settingsLabels.menuTitles +console.log(settingsLabels.menuTitles) const menu = [ {title: labels.reminders, component: 'Reminders'}, diff --git a/i18n/en/labels.js b/i18n/en/labels.js index 059e2c0..743f4c1 100644 --- a/i18n/en/labels.js +++ b/i18n/en/labels.js @@ -1,3 +1,6 @@ +import labels from './settings' +const settingsTitles = labels.menuTitles + export const shared = { cancel: 'Cancel', save: 'Save', @@ -21,7 +24,12 @@ export const headerTitles = { Calendar: 'Calendar', Chart: 'Chart', Stats: 'Statistics', - Settings: 'Settings', + SettingsMenu: 'Settings', + Reminders: settingsTitles.reminders, + NfpSettings: settingsTitles.nfpSettings, + ImportExport: settingsTitles.importExport, + Password: settingsTitles.password, + About: settingsTitles.about, BleedingEditView: 'Bleeding', TemperatureEditView: 'Temperature', MucusEditView: 'Mucus', diff --git a/i18n/en/settings.js b/i18n/en/settings.js index 24d9ef7..d230cf0 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -1,4 +1,4 @@ -export const settings = { +export default { menuTitles: { reminders: 'Reminders', importExport: 'Import and Export',