resolving merge conflicts

5 files changed, 0 insertions, 77 deletions

diff --git a/app_expo/i18n/en.json b/app_expo/i18n/en.json
deleted file mode 100644
index be5c35c..0000000
--- a/app_expo/i18n/en.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "common": {
-    "ok": "OK!",
-    "cancel": "Cancel",
-    "back": "Back"
-  },
-  "errors": {
-    "invalidEmail": "Invalid email address."
-  },
-  "welcomeScreen": {
-    "poweredBy": "POWERED BY IGNITE",
-    "readyForLaunch": "Ready for launch.",
-    "continue": "CONTINUE"
-  },
-  "demoScreen": {
-    "howTo": "HOW TO",
-    "title": "What’s In This Stack?",
-    "tagLine": "Congratulations, you’ve got a very advanced React Native app template here.  Take advantage of this boilerplate!",
-    "reactotron": "Demo Reactotron",
-    "demoList": "Demo List",
-    "androidReactotronHint": "If this doesn't work, ensure the Reactotron desktop app is running, run adb reverse tcp:9090 tcp:9090 from your terminal, and reload the app.",
-    "iosReactotronHint": "If this doesn't work, ensure the Reactotron desktop app is running and reload app.",
-    "macosReactotronHint": "If this doesn't work, ensure the Reactotron desktop app is running and reload app.",
-    "webReactotronHint": "If this doesn't work, ensure the Reactotron desktop app is running and reload app.",
-    "windowsReactotronHint": "If this doesn't work, ensure the Reactotron desktop app is running and reload app."
-  },
-  "demoListScreen": {
-    "title": "Demo List"
-  },
-  "storybook": {
-    "placeholder": "Placeholder",
-    "field": "Field"
-  }
-}
diff --git a/app_expo/i18n/i18n.ts b/app_expo/i18n/i18n.ts
deleted file mode 100644
index b29e80b..0000000
--- a/app_expo/i18n/i18n.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as Localization from 'expo-localization'
-import i18n from 'i18n-js'
-import en from './en.json'
-import ja from './ja.json'
-
-i18n.fallbacks = true
-i18n.translations = { en, ja }
-
-i18n.locale = Localization.locale || 'en'
-
-/**
- * Builds up valid keypaths for translations.
- * Update to your default locale of choice if not English.
- */
-type DefaultLocale = typeof en
-export type TxKeyPath = RecursiveKeyOf<DefaultLocale>
-
-type RecursiveKeyOf<TObj extends Record<string, any>> = {
-  [TKey in keyof TObj & string]: TObj[TKey] extends Record<string, any>
-    ? `${TKey}` | `${TKey}.${RecursiveKeyOf<TObj[TKey]>}`
-    : `${TKey}`
-}[keyof TObj & string]
diff --git a/app_expo/i18n/index.ts b/app_expo/i18n/index.ts
deleted file mode 100644
index b0ff148..0000000
--- a/app_expo/i18n/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import './i18n'
-export * from './i18n'
-export * from './translate'
diff --git a/app_expo/i18n/ja.json b/app_expo/i18n/ja.json
deleted file mode 100644
index 7f53c8c..0000000
--- a/app_expo/i18n/ja.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "common": {
-    "ok": "OK 🇯🇵",
-    "cancel": "Cancel 🇯🇵",
-    "back": "Back 🇯🇵"
-  }
-}
diff --git a/app_expo/i18n/translate.ts b/app_expo/i18n/translate.ts
deleted file mode 100644
index 6481874..0000000
--- a/app_expo/i18n/translate.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import i18n from 'i18n-js'
-import { TxKeyPath } from './i18n'
-
-/**
- * Translates text.
- *
- * @param key The i18n key.
- */
-export function translate(key: TxKeyPath, options?: i18n.TranslateOptions) {
-  return key ? i18n.t(key, options) : null
-}