fix: solve issues with strings

xmartlabs · Nov 25, 2022 · 9b6856a · 9b6856a
1 parent f602eb7
commit 9b6856a
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 392 deletions.
diff --git a/.typesafe-i18n.json b/.typesafe-i18n.json
diff --git a/package.json b/package.json
@@ -19,8 +19,7 @@
     "snap-update": "jest --updateSnapshot",
     "coverage": "jest --coverage",
     "publish:release": "npm publish",
-    "semantic-release": "semantic-release",
-    "typesafe-i18n": "typesafe-i18n"
+    "semantic-release": "semantic-release"
   },
   "files": [
     "build",
@@ -54,8 +53,7 @@
     "figlet": "1.5.2",
     "gluegun": "5.1.2",
     "pino": "8.7.0",
-    "pino-pretty": "9.1.1",
-    "typesafe-i18n": "5.16.2"
+    "pino-pretty": "9.1.1"
   },
   "devDependencies": {
     "@semantic-release/changelog": "6.0.1",

diff --git a/src/i18n/formatters.ts b/src/i18n/formatters.ts
diff --git a/src/i18n/i18n-node.ts b/src/i18n/i18n-node.ts
diff --git a/src/i18n/i18n-types.ts b/src/i18n/i18n-types.ts
diff --git a/src/i18n/i18n-util.async.ts b/src/i18n/i18n-util.async.ts
diff --git a/src/i18n/i18n-util.sync.ts b/src/i18n/i18n-util.sync.ts
diff --git a/src/i18n/i18n-util.ts b/src/i18n/i18n-util.ts
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
diff --git a/src/i18n/en/index.ts → src/strings.ts b/src/i18n/en/index.ts → src/strings.ts
@@ -1,6 +1,4 @@
-import type { BaseTranslation } from '../i18n-types'
-
-const en: BaseTranslation = {
+export const strings = {
   Github: {
     Ask: {
       Repo: 'Do you have a repository for the project?',
@@ -11,15 +9,17 @@ const en: BaseTranslation = {
     Repository: 'In your project repository folder',
   },
   Error: {
-    logFile: `An error happens, for more info please check the log file {filePath:string}!`,
-    operation: 'Error: {message: string}',
+    logFile: (filePath: string) =>
+      `An error happens, for more info please check the log file ${filePath}!`,
+    operation: (message: string) => `Error: ${message}`,
   },
   Navigation: {
     Ask: {
       Config: 'Do you want to add React Navigation base config?',
     },
     DontForget: `DON'T FORGET TO MODIFY THIS IN ANDROID!`,
-    AddCode: 'Add the following code to the body of {activity: string} class:`',
+    AddCode: (activity: string) =>
+      `Add the following code to the body of ${activity} class:`,
     makeSure: `and make sure to add an import statement at the top of this file:`,
   },
   Operations: {
@@ -34,5 +34,3 @@ const en: BaseTranslation = {
     CloneRepoAndMoveProject: 'Cloning repo & moving RN project',
   },
 }
-
-export default en