Remove usage of inline require

Revert translations

remove inline require

Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>

src/mocks/js_dependencies.cljs

@@ -1,5 +1,4 @@
 (ns mocks.js-dependencies
-  (:require-macros [status-im.utils.slurp :refer [slurp]])
   (:require [status-im.default-fleet :refer (default-fleets)]))
 
 (def action-button          #js {:default #js {:Item #js {}}})
@@ -192,20 +191,4 @@
     "react-native-mail" react-native-mail
     "react-native-image-resizer" image-resizer
     "./fleets.js" default-fleets
-    "../translations/ar.json" (js/JSON.parse (slurp "./translations/ar.json"))
-    "../translations/de.json" (js/JSON.parse (slurp "./translations/de.json"))
-    "../translations/en.json" (js/JSON.parse (slurp "./translations/en.json"))
-    "../translations/es.json" (js/JSON.parse (slurp "./translations/es.json"))
-    "../translations/es_419.json" (js/JSON.parse (slurp "./translations/es_419.json"))
-    "../translations/fil.json" (js/JSON.parse (slurp "./translations/fil.json"))
-    "../translations/fr.json" (js/JSON.parse (slurp "./translations/fr.json"))
-    "../translations/id.json" (js/JSON.parse (slurp "./translations/id.json"))
-    "../translations/it.json" (js/JSON.parse (slurp "./translations/it.json"))
-    "../translations/ko.json" (js/JSON.parse (slurp "./translations/ko.json"))
-    "../translations/pt_br.json" (js/JSON.parse (slurp "./translations/pt_br.json"))
-    "../translations/ru.json" (js/JSON.parse (slurp "./translations/ru.json"))
-    "../translations/tr.json" (js/JSON.parse (slurp "./translations/tr.json"))
-    "../translations/zh.json" (js/JSON.parse (slurp "./translations/zh.json"))
-    "../translations/zh_hant.json" (js/JSON.parse (slurp "./translations/zh_hant.json"))
-    "../translations/zh_TW.json" (js/JSON.parse (slurp "./translations/zh_TW.json"))
     nil))

src/status_im/i18n.clj

@@ -0,0 +1,21 @@
+(ns status-im.i18n
+  (:require [clojure.string :as string]))
+
+(defn read-file [f]
+  (when (.isFile f)
+    (let [locale  (-> f
+                      .getName
+                      (string/split #"\.")
+                      first)
+          content (slurp f)]
+      [(keyword locale) content])))
+
+(defn read-translations []
+  (->>
+   (java.io.File. "translations")
+   file-seq
+   (keep read-file)
+   vec))
+
+(defmacro translations [languages]
+  (select-keys (into {} (read-translations)) languages))

src/status_im/i18n_resources.cljs

@@ -1,66 +1,21 @@
 (ns status-im.i18n-resources
-  (:require [clojure.string :as string]
-            ["i18n-js" :as i18n-js]
+  (:require-macros [status-im.i18n :as i18n])
+  (:require [status-im.utils.types :as types]
+            [clojure.string :as string]
             ["react-native-languages" :default react-native-languages]))
 
 (def default-device-language
   (keyword (.-language react-native-languages)))
 
-;; Update js_dependencies.cljs
-(def languages [:ar :de :en :es :es_419 :fil :fr :id :in :it :ko :pt_BR :ru :tr :zh :zh_Hant :zh_TW])
-
-(defonce loaded-languages
-  (atom
-   (conj #{:en} default-device-language)))
-
-(def translations
-  {:ar         (js/require "../translations/ar.json")
-   :de         (js/require "../translations/de.json")
-   :en         (js/require "../translations/en.json")
-   :es         (js/require "../translations/es.json")
-   :es_419     (js/require "../translations/es_419.json")
-   :fil        (js/require "../translations/fil.json")
-   :fr         (js/require "../translations/fr.json")
-   :id         (js/require "../translations/id.json")
-   :in         (js/require "../translations/id.json")
-   :it         (js/require "../translations/it.json")
-   :ko         (js/require "../translations/ko.json")
-   :pt_BR      (js/require "../translations/pt_br.json")
-   :ru         (js/require "../translations/ru.json")
-   :tr         (js/require "../translations/tr.json")
-   :zh         (js/require "../translations/zh.json")
-   :zh_Hant    (js/require "../translations/zh_hant.json")
-   :zh_TW      (js/require "../translations/zh_TW.json")})
-
-(defn valid-language [lang]
-  (if (contains? translations lang)
-    (keyword lang)
-    (let [parts (string/split (name lang) #"[\-\_]")
-          short-lang (keyword (str (first parts) "_" (second parts)))
-          shortest-lang (keyword (first parts))]
-      (if (and (> (count parts) 2) (contains? translations short-lang))
-        short-lang
-        (when (contains? translations shortest-lang)
-          shortest-lang)))))
-
-(defn require-translation [lang-key]
-  (when-let [lang (valid-language (keyword lang-key))]
-    (get translations lang)))
-
 ;; translations
 (def translations-by-locale
-  (cond->
-   {:en (require-translation :en)}
-    (not= :en default-device-language)
-    (assoc default-device-language
-           (require-translation (-> (name default-device-language)
-                                    (string/replace "-" "_")
-                                    keyword)))))
+  (->> (i18n/translations [:ar :en :es :es_419 :fil :fr :it :ko :ru :in :id :tr :zh :zh_Hant :zh_TW])
+       (map (fn [[k t]]
+              (let [k' (-> (name k)
+                           (string/replace "_" "-")
+                           keyword)]
+                [k' (types/json->clj t)])))
+       (into {})))
 
-(defn load-language [lang]
-  (when-let [lang-key (valid-language (keyword lang))]
-    (when-not (contains? @loaded-languages lang-key)
-      (aset (.-translations i18n-js)
-            lang
-            (require-translation lang-key))
-      (swap! loaded-languages conj lang-key))))
+;; API compatibility
+(defn load-language [_])

src/status_im/i18n_test.cljs

@@ -7,15 +7,14 @@
             [clojure.string :as string]))
 
 ;; english as source of truth
-(def labels (set (keys (js->clj (:en i18n-resources/translations-by-locale)
-                                :keywordize-keys true))))
+(def labels (set (keys (:en i18n-resources/translations-by-locale))))
 
 (spec/def ::label labels)
 (spec/def ::labels (spec/coll-of ::label :kind set? :into #{}))
 
 (defn labels-for-all-locales []
   (->> i18n-resources/translations-by-locale
-       (mapcat #(-> % val (js->clj :keywordize-keys true) keys))
+       (mapcat #(-> % val keys))
        set))
 
 ;; checkpoints
@@ -1031,7 +1030,7 @@
 (spec/def ::locales (spec/coll-of ::locale :kind set? :into #{}))
 
 (defn locale->labels [locale]
-  (-> i18n-resources/translations-by-locale (get locale)  (js->clj :keywordize-keys true) keys set))
+  (-> i18n-resources/translations-by-locale (get locale) keys set))
 
 (defn locale->checkpoint [locale]
   (let [locale-labels (locale->labels locale)

src/status_im/node/core.cljs

@@ -7,7 +7,8 @@
             [status-im.utils.config :as config]
             [status-im.utils.fx :as fx]
             [status-im.utils.platform :as utils.platform]
-            [status-im.utils.types :as types]))
+            [status-im.utils.types :as types])
+  (:require-macros [status-im.utils.slurp :refer [slurp]]))
 
 (defn- add-custom-bootnodes [config network all-bootnodes]
   (let [bootnodes (as-> all-bootnodes $
@@ -69,8 +70,10 @@
   [limit nodes]
   (take limit (shuffle nodes)))
 
+(def default-fleets (slurp "resources/config/fleets.json"))
+
 (defn fleets [{:keys [custom-fleets]}]
-  (as-> [(js/require "./fleets.js")] $
+  (as-> [default-fleets] $
     (mapv #(:fleets (types/json->clj %)) $)
     (conj $ custom-fleets)
     (reduce merge $)))