Use Fluent instead of tempura

.clj-kondo/config.edn

@@ -69,4 +69,5 @@
            monger.query/with-collection clojure.core/->
            }
  :config-paths ["rewrite-clj/rewrite-clj"]
+ :output {:langs true}
  }

.gitignore

@@ -46,6 +46,8 @@ data/WiredTiger
 data/diagnostic.data
 data/journal
 data/storage.bson
+data/_mdb_catalog.wt.1
+data/sizeStorer.wt.1
 
 #Calva
 .calva/*

bin/restart-server

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+set -eux -o pipefail
+docker-compose down server
+docker-compose up -d --build server

bin/up

@@ -1,4 +1,3 @@
 #!/usr/bin/env sh
 
-docker-compose build
-docker-compose up -d
+docker-compose up -d --build

docker-compose.yml

@@ -13,6 +13,8 @@ services:
       - "./resources/public:/usr/src/app/resources/public"
       - "./resources/dev.edn:/usr/src/app/resources/dev.edn"
       - "./resources/logback.xml:/usr/src/app/resources/logback.xml"
+      - "./project.clj:/usr/src/app/project.clj"
+      - "./package.json:/usr/src/app/package.json"
       - "./src:/usr/src/app/src"
       - "./test:/usr/src/app/test"
       - "./docker/docker-prod.edn:/usr/src/app/resources/prod.edn" # Override server configs

package.json

@@ -9,10 +9,11 @@
 		"release": "npm run css:release && npm run cljs:release"
 	},
 	"devDependencies": {
-		"shadow-cljs": "^2.16.8",
+		"shadow-cljs": "^2.28.21",
 		"stylus": "^0.55.0"
 	},
 	"dependencies": {
+		"@fluent/bundle": "^0.18.0",
 		"@js-joda/core": "3.2.0",
 		"@js-joda/locale_en-us": "^4.4.0",
 		"howler": "^2.2.3",

project.clj

@@ -18,17 +18,16 @@
                  :init-ns web.dev
                  :init (go)}
 
-  :dependencies [[org.clojure/clojure "1.11.2"]
+  :dependencies [[org.clojure/clojure "1.12.0"]
                  [org.clojure/clojurescript "1.11.132"
                   :exclusions [org.clojure/google-closure-library
                                org.clojure/data.json
                                org.clojure/tools.reader
                                com.cognitect/transit-clj
                                com.cognitect/transit-java]]
-                 [com.google.javascript/closure-compiler-unshaded "v20211006"]
-                 [org.clojure/core.async "1.5.644"]
+                 [com.google.javascript/closure-compiler-unshaded "v20240317"]
+                 [org.clojure/core.async "1.7.701"]
                  [com.taoensso/sente "1.19.2" :exclusions [org.clojure/tools.reader]]
-                 [com.taoensso/tempura "1.2.1"]
                  [ring/ring-core "1.9.4"]
                  [ring/ring-devel "1.9.4" :exclusions [org.clojure/java.classpath]]
                  [ring/ring-anti-forgery "1.3.0"]
@@ -50,7 +49,7 @@
                  [com.draines/postal "2.0.5"]
                  [throttler "1.0.1"]
                  [clj-http "3.12.3"]
-                 [reagent "1.1.0"]
+                 [reagent "1.3.0"]
                  [org.clojure/tools.analyzer "1.1.0"]
                  [org.clojure/tools.analyzer.jvm "1.2.1"]
                  [org.clojars.frozenlock/reagent-modals "0.2.8"]
@@ -65,19 +64,23 @@
                  [integrant "0.8.0"]
                  [com.widdindustries/cljc.java-time "0.1.21"]
                  [time-literals "0.1.5"]
-                 [metosin/reitit "0.5.18"]]
+                 [metosin/reitit "0.7.2"]
+                 [org.flatland/ordered "1.15.12"]
+                 [io.github.noahtheduke/fluent-clj "0.0.1"]
+                 [net.xyzsd.fluent/fluent-base "0.70"]
+                 [net.xyzsd.fluent/fluent-functions-cldr "0.70"]]
 
   :test-selectors {:default (fn [m] (not (:kaocha/pending m)))}
 
-  :profiles {:dev {:dependencies [[binaryage/devtools "1.0.4"]
+  :profiles {:dev {:dependencies [[binaryage/devtools "1.0.7"]
                                   [cider/piggieback "0.5.3"]
                                   [com.clojure-goes-fast/clj-async-profiler "0.5.1"]
                                   [rewrite-clj "1.1.45"]
                                   [criterium "0.4.6"]
                                   [instaparse "1.5.0"]
                                   [integrant/repl "0.3.2"]
                                   [lambdaisland/kaocha "1.68.1059"]
-                                  [thheller/shadow-cljs "2.16.8"]]
+                                  [thheller/shadow-cljs "2.28.21"]]
                    :plugins [[lein-eftest "0.6.0"]
                              [cider/cider-nrepl "0.47.1"]]
                    :eftest {:report eftest.report.pretty/report
@@ -108,6 +111,6 @@
             "get-game-stats" ["run" "-m" "tasks.game-stats/all-games"]
             "get-user-stats" ["run" "-m" "tasks.user-stats/all-users"]
             "get-background-stats" ["run" "-m" "tasks.user-stats/all-backgrounds"]
-            "missing-translations" ^{:doc "Print translations in :en that aren't in other languages. Can be passed a language (fr, ko, ...) to filter to that language."} ["run" "-m" "tasks.translations/missing-translations"]
-            "undefined-translations" ^{:doc "Find usages of (tr [...]) in code that don't exist in :en translation."} ["run" "-m" "tasks.translations/undefined-translations"]
-            "unused-translations" ^{:doc "Find entries in :en translation that aren't used in code."} ["run" "-m" "tasks.translations/unused-translations"]})
+            "missing-translations" ^{:doc "Print translations in 'en' that aren't in other languages. Can be passed a language (fr, ko, ...) to filter to that language."} ["run" "-m" "tasks.translations/missing-translations"]
+            "undefined-translations" ^{:doc "Find usages of (tr [...]) in code that don't exist in 'en' translation."} ["run" "-m" "tasks.translations/undefined-translations"]
+            "unused-translations" ^{:doc "Find entries in 'en' translation that aren't used in code."} ["run" "-m" "tasks.translations/unused-translations"]})

resources/dev.edn

@@ -33,6 +33,7 @@
            :web/email #ig/ref :web/email}
  :web/banned-msg {:initial "Account Banned"
                   :mongo #ig/ref :mongodb/connection}
+ :web/i18n nil
  :frontend/version {:initial "1"
                     :mongo #ig/ref :mongodb/connection}
  :sente/router nil