Merge branch 'master' of git://github.com/infinitered/ignite-ir-boile…

…rplate-bowser # Conflicts: # boilerplate/package.json.ejs
infinitered · Sep 27, 2018 · df7537a · df7537a
2 parents 05cd449 + 62e816e
commit df7537a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/boilerplate/package.json.ejs b/boilerplate/package.json.ejs
@@ -26,7 +26,8 @@
     "mobx-react": "5.1.2",
     "mobx-state-tree": "2.0.5",
     "ramda": "0.25.0",
-    "react-native-i18n": "2.0.15",
+    "react-native-languages": "^3.0.0",
+    "i18n-js": "^3.0.11",
     "react-native-keychain": "3.0.0",
     "react-native-splash-screen": "3.1.1",
     "react-navigation": "2.16.0",

diff --git a/boilerplate/src/i18n/i18n.ts b/boilerplate/src/i18n/i18n.ts
@@ -1,7 +1,9 @@
-import I18n from "react-native-i18n"
+import RNLanguages from "react-native-languages"
+import i18n from "i18n-js"
 
 const en = require("./en")
 const ja = require("./ja")
 
-I18n.fallbacks = true
-I18n.translations = { en, ja }
+i18n.locale = RNLanguages.language
+i18n.fallbacks = true
+i18n.translations = { en, ja }
diff --git a/boilerplate/src/i18n/translate.ts b/boilerplate/src/i18n/translate.ts
@@ -1,12 +1,12 @@
-import I18n from "react-native-i18n"
+import i18n from "i18n-js"
 
 /**
  * Translates text.
  *
  * @param key The i18n key.
  */
 export function translate(key: string) {
-  return key ? I18n.t(key) : null
+  return key ? i18n.t(key) : null
 }
 
 /**
@@ -16,5 +16,5 @@ export function translate(key: string) {
  * @param vars Additional values sure to replace.
  */
 export function translateWithVars(key: string, vars: object) {
-  return key ? I18n.t(key, vars) : null
+  return key ? i18n.t(key, vars) : null
 }
diff --git a/boilerplate/src/services/reactotron/reactotron.ts b/boilerplate/src/services/reactotron/reactotron.ts
@@ -24,17 +24,20 @@ if (__DEV__) {
 } else {
   // attach a mock so if things sneaky by our __DEV__ guards, we won't crash.
   console.tron = {
+    benchmark: noop,
+    clear: noop,
+    close: noop,
     configure: noop,
     connect: noop,
-    use: noop,
-    useReactNative: noop,
-    clear: noop,
-    log: noop,
-    logImportant: noop,
     display: noop,
     error: noop,
     image: noop,
+    log: noop,
+    logImportant: noop,
     reportError: noop,
+    use: noop,
+    useReactNative: noop,
+    warn: noop,
   }
 }
 

diff --git a/boilerplate/test/mock-i18n.ts b/boilerplate/test/mock-i18n.ts
@@ -1,4 +1,4 @@
-jest.mock("react-native-i18n", () => {
+jest.mock("i18n-js", () => {
   return {
     t: key => `${key}.test`,
   }