Merge pull request #8065 from NoahTheDuke/nb/fix-backgrounds

Further small fixes

Author: NoahTheDuke

resources/public/i18n/fr.ftl

@@ -108,7 +108,7 @@ deck-builder_agenda-points = Points de projet
 deck-builder_cancel = Annuler
 
 deck-builder_card-count = {$cnt ->
-    [one] 1 card
+    [one] {$cnt} card
     *[other] {$cnt} cards
 }
 
@@ -238,12 +238,12 @@ game_abilities = Capacités
 game_actions = Actions
 
 game_agenda-count = {$agenda-point ->
-    [one] 1 Point de projet
+    [one] {$agenda-point} Point de projet
     *[other] {$agenda-point} Points de projet
 }
 
 game_agenda-count-with-req = {$agenda-point ->
-    [one] 1 Point de projet
+    [one] {$agenda-point} Point de projet
     *[other] {$agenda-point} Points de projet
 } ({$agenda-point-req} required)
 

resources/public/i18n/la-pig.ftl

@@ -344,16 +344,7 @@ game_prompt = {$msg ->
     [r-d] R&DYAY
     [rez] ezray
     [score] orescay
-    [server-1] Erversay 1
-    [server-10] Erversay 10
-    [server-2] Erversay 2
-    [server-3] Erversay 3
-    [server-4] Erversay 4
-    [server-5] Erversay 5
-    [server-6] Erversay 6
-    [server-7] Erversay 7
-    [server-8] Erversay 8
-    [server-9] Erversay 9
+    [server-num] Erversay {$num}
     [trash] ashtray
     *[unknown] undefined
 }

resources/public/i18n/ru.ftl

@@ -562,16 +562,7 @@ game_prompt = {$msg ->
     [r-d] undefined
     [rez] развернуть
     [score] засчитать
-    [server-1] Сервер 1
-    [server-10] Сервер 10
-    [server-2] Сервер 2
-    [server-3] Сервер 3
-    [server-4] Сервер 4
-    [server-5] Сервер 5
-    [server-6] Сервер 6
-    [server-7] Сервер 7
-    [server-8] Сервер 8
-    [server-9] Сервер 9
+    [server-num] Сервер {$num}
     [trash] снести
     *[unknown] undefined
 }
@@ -1262,7 +1253,7 @@ settings_bespoke-sounds = {$sound ->
 settings_bg = {$slug ->
     [custom-bg] Индивидуальный фон
     [monochrome-bg] Монотонный
-    [worlds2020-bg] Чемпионат мира 2020
+    [worlds2020] Чемпионат мира 2020
     *[unknown] undefined
 }
 

resources/public/i18n/zh-simp.ftl

@@ -510,16 +510,7 @@ game_prompt = {$msg ->
     [r-d] 研发中心
     [rez] 激活
     [score] 计分
-    [server-1] 服务器 1
-    [server-10] 服务器 10
-    [server-2] 服务器 2
-    [server-3] 服务器 3
-    [server-4] 服务器 4
-    [server-5] 服务器 5
-    [server-6] 服务器 6
-    [server-7] 服务器 7
-    [server-8] 服务器 8
-    [server-9] 服务器 9
+    [server-num] 服务器 {$num}
     [trash] 销毁
     *[unknown] undefined
 }
@@ -1185,7 +1176,7 @@ settings_bg = {$slug ->
     [rumor-mill-bg] 谣言工厂
     [the-root-bg] 根基
     [traffic-jam-bg] 交通阻塞
-    [worlds2020-bg] 世界2020
+    [worlds2020] 世界2020
     *[unknown] undefined
 }
 

src/cljs/nr/appstate.cljs

@@ -30,11 +30,11 @@
     (if (empty? serialized) default-visible-formats (set (.parse js/JSON serialized)))))
 
 (def valid-background-slugs
-  #{"apex" "custom-bg"
-    "find-the-truth" "freelancer"
-    "monochrome" "mushin-no-shin"
-    "push-your-luck" "rumor-mill"
-    "the-root" "traffic-jam"
+  #{"apex-bg" "custom-bg"
+    "find-the-truth-bg" "freelancer-bg"
+    "monochrome-bg" "mushin-no-shin-bg"
+    "push-your-luck-bg" "rumor-mill-bg"
+    "the-root-bg" "traffic-jam-bg"
     "worlds2020"})
 
 (defn validate-options

src/cljs/nr/game_row.cljs

@@ -189,15 +189,15 @@
 
 (defn- open-decklists-span [precon open-decklists]
   (when (and open-decklists (not precon))
-    [:span.open-decklists (str " " (tr [:lobby_open-decklists-b "(open decklists)"]))]))
+    [:span.open-decklists " " (tr [:lobby_open-decklists-b "(open decklists)"])]))
 
 (defn game-format [{fmt :format singleton? :singleton turmoil? :turmoil precon :precon open-decklists :open-decklists}]
   [:div {:class "game-format"}
    [:span.format-label (tr [:lobby_format "Format"]) ":  "]
    [:span.format-type (tr-format (slug->format fmt "Unknown"))]
    [precon-span precon]
-   [:span.format-singleton (str (when singleton? (str " " (tr [:lobby_singleton-b "(singleton)"]))))]
-   [:span.turmoil (when turmoil? (str " " (tr [:lobby_span-turmoil "(turmoil)"])))]
+   (when singleton? [:span.format-singleton " " (tr [:lobby_singleton-b "(singleton)"])])
+   (when turmoil? [:span.turmoil " " (tr [:lobby_span-turmoil "(turmoil)"])])
    [open-decklists-span precon open-decklists]
    [precon-under-span precon]])
 

src/cljs/nr/gameboard/actions.cljs

@@ -44,9 +44,11 @@
 
 (defn handle-diff! [{:keys [gameid diff]}]
   (when (= gameid (str (current-gameid app-state)))
-    (reset! game-state (differ/patch @last-state diff))
+    (let [patch (differ/patch @last-state diff)]
+      (reset! game-state patch))
     (check-lock?)
-    (reset! last-state @game-state)))
+    (let [gs @game-state]
+      (reset! last-state gs))))
 
 (declare toast)
 (defn handle-timeout [gameid]