renames folder with labels, splits up the setting labels from rest

This commit is contained in:
tina
2018-11-28 16:10:38 +01:00
parent 11ceb21921
commit d5f3fdbde5
33 changed files with 303 additions and 31 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ import symptomViews from './cycle-day/symptoms'
import Chart from './chart/chart'
import Settings from './settings'
import Stats from './stats'
import {headerTitles, menuTitles} from '../copy/en/labels'
import {headerTitles, menuTitles} from '../i18n/en/labels'
import setupNotifications from '../lib/notifications'
// design wants everyhting lowercased, but we don't
+1 -1
View File
@@ -11,7 +11,7 @@ import styles from './styles'
import { scaleObservable } from '../../local-storage'
import config from '../../config'
import AppText from '../app-text'
import { shared as labels } from '../../copy/en/labels'
import { shared as labels } from '../../i18n/en/labels'
import DripIcon from '../../assets/drip-icons'
import CycleDayIcon from '../../assets/home-circle'
import nothingChanged from '../../db/db-unchanged'
+1 -1
View File
@@ -10,7 +10,7 @@ import Header from '../header'
import { getCycleDay } from '../../db'
import cycleModule from '../../lib/cycle'
import styles from '../../styles'
import * as labels from '../../copy/en/cycle-day'
import * as labels from '../../i18n/en/cycle-day'
import AppText from '../app-text'
import DripIcon from '../../assets/drip-icons'
@@ -5,7 +5,7 @@ import {
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
import { saveSymptom } from '../../../db'
import styles, {iconStyles} from '../../../styles'
import {sharedDialogs as labels} from '../../../copy/en/cycle-day'
import {sharedDialogs as labels} from '../../../i18n/en/cycle-day'
export default class ActionButtonFooter extends Component {
render() {
+1 -1
View File
@@ -6,7 +6,7 @@ import {
} from 'react-native'
import styles from '../../../styles'
import { saveSymptom } from '../../../db'
import { bleeding as labels } from '../../../copy/en/cycle-day'
import { bleeding as labels } from '../../../i18n/en/cycle-day'
import ActionButtonFooter from './action-button-footer'
import SelectTabGroup from '../select-tab-group'
import SymptomSection from './symptom-section'
+1 -1
View File
@@ -6,7 +6,7 @@ import {
} from 'react-native'
import styles from '../../../styles'
import { saveSymptom } from '../../../db'
import { cervix as labels } from '../../../copy/en/cycle-day'
import { cervix as labels } from '../../../i18n/en/cycle-day'
import ActionButtonFooter from './action-button-footer'
import SelectTabGroup from '../select-tab-group'
import SymptomSection from './symptom-section'
+1 -1
View File
@@ -5,7 +5,7 @@ import {
} from 'react-native'
import styles from '../../../styles'
import { saveSymptom } from '../../../db'
import { intensity, desire } from '../../../copy/en/cycle-day'
import { intensity, desire } from '../../../i18n/en/cycle-day'
import ActionButtonFooter from './action-button-footer'
import SelectTabGroup from '../select-tab-group'
import SymptomSection from './symptom-section'
+1 -1
View File
@@ -6,7 +6,7 @@ import {
} from 'react-native'
import styles from '../../../styles'
import { saveSymptom } from '../../../db'
import { mucus as labels } from '../../../copy/en/cycle-day'
import { mucus as labels } from '../../../i18n/en/cycle-day'
import computeSensiplanValue from '../../../lib/sensiplan-mucus'
import ActionButtonFooter from './action-button-footer'
import SelectTabGroup from '../select-tab-group'
+1 -1
View File
@@ -9,7 +9,7 @@ import styles from '../../../styles'
import { saveSymptom } from '../../../db'
import ActionButtonFooter from './action-button-footer'
import SymptomSection from './symptom-section'
import { noteExplainer } from '../../../copy/en/cycle-day'
import { noteExplainer } from '../../../i18n/en/cycle-day'
export default class Note extends Component {
constructor(props) {
+1 -1
View File
@@ -5,7 +5,7 @@ import {
View
} from 'react-native'
import { saveSymptom } from '../../../db'
import { pain as labels } from '../../../copy/en/cycle-day'
import { pain as labels } from '../../../i18n/en/cycle-day'
import ActionButtonFooter from './action-button-footer'
import SelectBoxGroup from '../select-box-group'
import SymptomSection from './symptom-section'
+1 -1
View File
@@ -6,7 +6,7 @@ import {
} from 'react-native'
import styles from '../../../styles'
import { saveSymptom } from '../../../db'
import { sex as sexLabels, contraceptives as cLabels } from '../../../copy/en/cycle-day'
import { sex as sexLabels, contraceptives as cLabels } from '../../../i18n/en/cycle-day'
import ActionButtonFooter from './action-button-footer'
import SelectBoxGroup from '../select-box-group'
import SymptomSection from './symptom-section'
+2 -2
View File
@@ -13,9 +13,9 @@ import padWithZeros from '../../helpers/pad-time-with-zeros'
import { getPreviousTemperature, saveSymptom } from '../../../db'
import styles from '../../../styles'
import { LocalTime, ChronoUnit } from 'js-joda'
import { temperature as labels } from '../../../copy/en/cycle-day'
import { temperature as labels } from '../../../i18n/en/cycle-day'
import { scaleObservable } from '../../../local-storage'
import { shared } from '../../../copy/en/labels'
import { shared } from '../../../i18n/en/labels'
import ActionButtonFooter from './action-button-footer'
import config from '../../../config'
import SymptomSection from './symptom-section'
+1 -1
View File
@@ -4,7 +4,7 @@ import { LocalDate, ChronoUnit } from 'js-joda'
import Icon from 'react-native-vector-icons/Entypo'
import { Surface } from 'react-native/Libraries/ART/ReactNativeART'
import { secondaryColor, cycleDayColor, periodColor } from '../styles'
import { home as labels, bleedingPrediction as predictLabels, shared } from '../copy/en/labels'
import { home as labels, bleedingPrediction as predictLabels, shared } from '../i18n/en/labels'
import CycleDayIcon from '../assets/home-circle'
import Drop from '../assets/home-drop'
import cycleModule from '../lib/cycle'
+1 -1
View File
@@ -4,7 +4,7 @@ import nodejs from 'nodejs-mobile-react-native'
import { saveEncryptionFlag } from '../local-storage'
import AppText from './app-text'
import styles from '../styles'
import { passwordPrompt as labels, shared } from '../copy/en/labels'
import { passwordPrompt as labels, shared } from '../i18n/en/labels'
import { requestHash, deleteDbAndOpenNew, openDb } from '../db'
export default class PasswordPrompt extends Component {
+1 -1
View File
@@ -1,5 +1,5 @@
import { Alert } from 'react-native'
import { shared as sharedLabels } from '../../copy/en/labels'
import { shared as sharedLabels } from '../../i18n/en/labels'
export default function alertError(msg) {
Alert.alert(sharedLabels.errorTitle, msg)
+1 -1
View File
@@ -1,7 +1,7 @@
import Share from 'react-native-share'
import getDataAsCsvDataUri from '../../lib/import-export/export-to-csv'
import alertError from './alert-error'
import { settings as labels } from '../../copy/en/labels'
import { settings as labels } from '../../i18n/en/settings'
export default async function openShareDialogAndExport() {
let data
+2 -1
View File
@@ -2,7 +2,8 @@ import { Alert } from 'react-native'
import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker'
import rnfs from 'react-native-fs'
import importCsv from '../../lib/import-export/import-from-csv'
import { settings as labels, shared as sharedLabels } from '../../copy/en/labels'
import { shared as sharedLabels } from '../../i18n/en/labels'
import { settings as labels } from '../../i18n/en/settings'
import alertError from './alert-error'
export default function openImportDialogAndImport() {
+1 -1
View File
@@ -5,7 +5,7 @@ import {
ScrollView,
} from 'react-native'
import styles from '../../styles/index'
import { settings as labels } from '../../copy/en/labels'
import { settings as labels } from '../../i18n/en/settings'
import AppText from '../app-text'
import TempReminderPicker from './temp-reminder-picker'
import PeriodReminderPicker from './period-reminder'
@@ -1,6 +1,6 @@
import { Alert } from 'react-native'
import { openDb } from '../../../db'
import { shared } from '../../../copy/en/labels'
import { shared } from '../../../i18n/en/labels'
export default async function checkPassword({hash, onCancel, onTryAgain }) {
const connected = await openDb(hash)
+1 -1
View File
@@ -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 '../../../copy/en/settings'
import { settings as labels } from '../../../i18n/en/settings'
import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
import PasswordField from './password-field'
import showBackUpReminder from './show-backup-reminder'
+1 -1
View File
@@ -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 '../../../copy/en/settings'
import { settings as labels } from '../../../i18n/en/settings'
import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
import PasswordField from './password-field'
import showBackUpReminder from './show-backup-reminder'
+1 -1
View File
@@ -8,7 +8,7 @@ import {
hasEncryptionObservable
} from '../../../local-storage'
import styles from '../../../styles/index'
import { settings as labels } from '../../../copy/en/labels'
import { settings as labels } from '../../../i18n/en/settings'
export default class PasswordSetting extends Component {
constructor(props) {
@@ -1,5 +1,6 @@
import { Alert } from 'react-native'
import { settings as labels, shared } from '../../../copy/en/labels'
import { shared } from '../../../i18n/en/labels'
import { settings as labels } from '../../../i18n/en/settings'
export default function showBackUpReminder(okHandler, isDelete) {
let title, message
+2 -1
View File
@@ -6,7 +6,8 @@ import {
import nodejs from 'nodejs-mobile-react-native'
import AppText from '../../app-text'
import styles from '../../../styles'
import { settings as labels, shared } from '../../../copy/en/labels'
import { shared } from '../../../i18n/en/labels'
import { settings as labels } from '../../../i18n/en/settings'
import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
import PasswordField from './password-field'
import showBackUpReminder from './show-backup-reminder'
+1 -1
View File
@@ -9,7 +9,7 @@ import {
savePeriodReminder
} from '../../local-storage'
import styles from '../../styles/index'
import { settings as labels } from '../../copy/en/labels'
import { settings as labels } from '../../i18n/en/settings'
export default class PeriodReminderPicker extends Component {
constructor(props) {
+1 -1
View File
@@ -11,7 +11,7 @@ import {
saveTempReminder
} from '../../local-storage'
import styles from '../../styles/index'
import { settings as labels } from '../../copy/en/labels'
import { settings as labels } from '../../i18n/en/settings'
import padWithZeros from '../helpers/pad-time-with-zeros'
export default class TempReminderPicker extends Component {
+1 -1
View File
@@ -7,7 +7,7 @@ import {
saveTempScale,
} from '../../local-storage'
import { secondaryColor } from '../../styles/index'
import { settings as labels } from '../../copy/en/labels'
import { settings as labels } from '../../i18n/en/settings'
import config from '../../config'
import alertError from './alert-error'
+1 -1
View File
@@ -7,7 +7,7 @@ import {
import styles from '../styles/index'
import cycleModule from '../lib/cycle'
import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length'
import {stats as labels} from '../copy/en/labels'
import {stats as labels} from '../i18n/en/labels'
import AppText from './app-text'
import { getCycleStartsSortedByDate } from '../db'