From 654dbf5e9816c49eefd28049199b963133ef3fd9 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Wed, 22 Aug 2018 18:33:00 +0200
Subject: [PATCH] Fix labels

---
 components/settings.js | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/components/settings.js b/components/settings.js
index 7b0d047..f03aec9 100644
--- a/components/settings.js
+++ b/components/settings.js
@@ -12,7 +12,7 @@ import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker
 import rnfs from 'react-native-fs'
 import styles, { secondaryColor } from '../styles/index'
 import config from '../config'
-import { settings as labels } from './labels'
+import { settings as settingsLabels, shared as sharedLabels } from './labels'
 import getDataAsCsvDataUri from '../lib/import-export/export-to-csv'
 import importCsv from '../lib/import-export/import-from-csv'
 import { scaleObservable, saveTempScale } from '../local-storage'
@@ -23,34 +23,34 @@ export default class Settings extends Component {
       <ScrollView>
         <View style={styles.settingsSegment}>
           <Text style={styles.settingsSegmentTitle}>
-            {labels.tempScale.segmentTitle}
+            {settingsLabels.tempScale.segmentTitle}
           </Text>
-          <Text>{labels.tempScale.segmentExplainer}</Text>
+          <Text>{settingsLabels.tempScale.segmentExplainer}</Text>
           <TempSlider/>
         </View>
         <View style={styles.settingsSegment}>
           <Text style={styles.settingsSegmentTitle}>
-            {labels.export.button}
+            {settingsLabels.export.button}
           </Text>
-          <Text>{labels.export.segmentExplainer}</Text>
+          <Text>{settingsLabels.export.segmentExplainer}</Text>
           <TouchableOpacity
             onPress={openShareDialogAndExport}
             style={styles.settingsButton}>
             <Text style={styles.settingsButtonText}>
-              {labels.export.button}
+              {settingsLabels.export.button}
             </Text>
           </TouchableOpacity>
         </View>
         <View style={styles.settingsSegment}>
           <Text style={styles.settingsSegmentTitle}>
-            {labels.import.button}
+            {settingsLabels.import.button}
           </Text>
-          <Text>{labels.import.segmentExplainer}</Text>
+          <Text>{settingsLabels.import.segmentExplainer}</Text>
           <TouchableOpacity
             onPress={openImportDialogAndImport}
             style={styles.settingsButton}>
             <Text style={styles.settingsButtonText}>
-              {labels.import.button}
+              {settingsLabels.import.button}
             </Text>
           </TouchableOpacity>
         </View>
@@ -80,15 +80,15 @@ class TempSlider extends Component {
     try {
       saveTempScale(this.state)
     } catch(err) {
-      alertError(labels.tempScale.saveError)
+      alertError(settingsLabels.tempScale.saveError)
     }
   }
 
   render() {
     return (
       <View style={{alignItems: 'center'}}>
-        <Text>{`${labels.tempScale.min} ${this.state.min}`}</Text>
-        <Text>{`${labels.tempScale.max} ${this.state.max}`}</Text>
+        <Text>{`${settingsLabels.tempScale.min} ${this.state.min}`}</Text>
+        <Text>{`${settingsLabels.tempScale.max} ${this.state.max}`}</Text>
         <Slider
           values={[this.state.min, this.state.max]}
           min={config.temperatureScale.min}
@@ -123,39 +123,39 @@ async function openShareDialogAndExport() {
   try {
     data = getDataAsCsvDataUri()
     if (!data) {
-      return alertError(labels.errors.noData)
+      return alertError(settingsLabels.errors.noData)
     }
   } catch (err) {
     console.error(err)
-    return alertError(labels.errors.couldNotConvert)
+    return alertError(settingsLabels.errors.couldNotConvert)
   }
 
   try {
     await Share.open({
-      title: labels.export.title,
+      title: settingsLabels.export.title,
       url: data,
-      subject: labels.export.subject,
+      subject: settingsLabels.export.subject,
       type: 'text/csv',
       showAppsToView: true
     })
   } catch (err) {
     console.error(err)
-    return alertError(labels.export.errors.problemSharing)
+    return alertError(settingsLabels.export.errors.problemSharing)
   }
 }
 
 function openImportDialogAndImport() {
   Alert.alert(
-    labels.import.title,
-    labels.import.message,
+    settingsLabels.import.title,
+    settingsLabels.import.message,
     [{
-      text: labels.import.replaceOption,
+      text: settingsLabels.import.replaceOption,
       onPress: () => getFileContentAndImport({ deleteExisting: false })
     }, {
-      text: labels.import.deleteOption,
+      text: settingsLabels.import.deleteOption,
       onPress: () => getFileContentAndImport({ deleteExisting: true })
     }, {
-      text: labels.shared.cancel, style: 'cancel', onPress: () => { }
+      text: sharedLabels.cancel, style: 'cancel', onPress: () => { }
     }]
   )
 }
@@ -180,22 +180,22 @@ async function getFileContentAndImport({ deleteExisting }) {
   try {
     fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
   } catch (err) {
-    return importError(labels.import.errors.couldNotOpenFile)
+    return importError(settingsLabels.import.errors.couldNotOpenFile)
   }
 
   try {
     await importCsv(fileContent, deleteExisting)
-    Alert.alert(labels.import.success.title, labels.import.success.message)
+    Alert.alert(sharedLabels.successTitle, settingsLabels.import.success.message)
   } catch(err) {
     importError(err.message)
   }
 }
 
 function alertError(msg) {
-  Alert.alert(labels.shared.errorTitle, msg)
+  Alert.alert(sharedLabels.errorTitle, msg)
 }
 
 function importError(msg) {
-  const postFixed = `${msg}\n\n${labels.import.errors.postFix}`
+  const postFixed = `${msg}\n\n${settingsLabels.import.errors.postFix}`
   alertError(postFixed)
 }