Merge pull request #8141 from csbisa/fluent-fixes

Fix several translation usages

Author: NBKelly

resources/public/i18n/en.ftl

@@ -409,6 +409,8 @@ game_agenda-count-with-req = {$agenda-point ->
 
 game_approach-ice = Approach ice
 
+game_approach-server = Approach server
+
 game_archives = Archives ({$faceup} ↑ {$facedown} ↓)
 
 game_attempt-reconnect = Attempt reconnect

src/cljs/nr/gameboard/board.cljs

@@ -1537,12 +1537,16 @@
                    (<= pos (count run-ice)))
           (nth run-ice (dec pos))))))
 
-(def phase->title
-  {"initiation" (tr [:game_initiation "Initiation"])
-   "approach-ice" (tr [:game_approach-ice "Approach ice"])
-   "encounter-ice" (tr [:game_encounter-ice "Encounter ice"])
-   "movement" (tr [:game_movement "Movement"])
-   "success" (tr [:game_success "Success"])})
+(defn phase->title
+  [phase]
+  (case phase
+    "initiation" (tr [:game_initiation "Initiation"])
+    "approach-ice" (tr [:game_approach-ice "Approach ice"])
+    "approach-server" (tr [:game_approach-server "Approach server"])
+    "encounter-ice" (tr [:game_encounter-ice "Encounter ice"])
+    "movement" (tr [:game_movement "Movement"])
+    "success" (tr [:game_success "Success"])
+    nil))
 
 (defn phase->next-phase-title
   ([run] (phase->next-phase-title (:phase @run) (:position @run)))
@@ -1575,7 +1579,7 @@
         (when (or (:button @app-state) (get-in @app-state [:options :display-encounter-info]))
           [encounter-info-div ice])])
      (when @run
-       [:h4 (tr [:game_current-phase "Current phase"]) ":" [:br] (get phase->title (:phase @run) (tr [:game_unknown-phase "Unknown phase"]))])
+       [:h4 (tr [:game_current-phase "Current phase"]) ":" [:br] (or (phase->title (:phase @run)) (tr [:game_unknown-phase "Unknown phase"]))])
 
      (cond
        (and (= "approach-ice" (:phase @run))
@@ -1612,9 +1616,9 @@
        ;; initiation
        (= "initiation" (:phase @run))
        [cond-button
-        (str (tr [:game.continue-to "Continue to"]) " " (if (zero? (:position @run))
-                                                          (tr [:game.approach-server "Approach server"])
-                                                          (tr [:game.approach-ice "Approach ice"])))
+        (tr [:game_continue-to "Continue to"] {:phase (if (zero? (:position @run))
+                                                        (tr [:game_approach-server "Approach server"])
+                                                        (tr [:game_approach-ice "Approach ice"]))})
         (not= "corp" (:no-action @run))
         #(send-command "continue")]
 
@@ -1658,7 +1662,7 @@
         (when (or (:button @app-state)  (get-in @app-state [:options :display-encounter-info]))
           [encounter-info-div ice])])
      (when @run
-       [:h4 (tr [:game_current-phase "Current phase"]) ":" [:br] (get phase->title phase)])
+       [:h4 (tr [:game_current-phase "Current phase"]) ":" [:br] (phase->title phase)])
 
      (cond
        (and (:next-phase @run)
@@ -1671,9 +1675,9 @@
 
        (= "initiation" (:phase @run))
        [cond-button
-        (str (tr [:game.continue-to "Continue to"]) " " (if (zero? (:position @run))
-                                                          (tr [:game.approach-server "Approach server"])
-                                                          (tr [:game.approach-ice "Approach ice"])))
+        (tr [:game_continue-to "Continue to"] {:phase (if (zero? (:position @run))
+                                                        (tr [:game_approach-server "Approach server"])
+                                                        (tr [:game_approach-ice "Approach ice"]))})
         (not= "runner" (:no-action @run))
         #(send-command "continue")]
 

src/cljs/nr/navbar.cljs

@@ -9,54 +9,54 @@
    goog.history.Html5History))
 
 (def navbar-links
-  [{:title (tr [:nav_welcome "Welcome"])
+  [{:title [:nav_welcome "Welcome"]
     :cls "landing"
     :route "/"}
-    {:title (tr [:nav_chat "Chat"])
+    {:title [:nav_chat "Chat"]
     :cls "chat"
     :route "/chat"}
-   {:title (tr [:nav_cards "Cards"])
+   {:title [:nav_cards "Cards"]
     :cls "card"
     :route "/cards"}
-   {:title (tr [:nav_deck-builder "Deck Builder"])
+   {:title [:nav_deck-builder "Deck Builder"]
     :cls "deckbuilder"
     :route "/deckbuilder"}
-   {:title (tr [:nav_play "Play"])
+   {:title [:nav_play "Play"]
     :cls "play"
     :route "/play"}
-   {:title (tr [:nav_help "Help"])
+   {:title [:nav_help "Help"]
     :cls "help"
     :route "/help"}
-   {:title (tr [:nav_settings "Settings"])
+   {:title [:nav_settings "Settings"]
     :cls "settings"
     :route "/account"
     :show? :user}
-   {:title (tr [:nav_stats "Stats"])
+   {:title [:nav_stats "Stats"]
     :cls "stats"
     :route "/stats"
     :show? :user}
-   {:title (tr [:nav_about "About"])
+   {:title [:nav_about "About"]
     :cls "about"
     :route "/about"}
-   {:title (tr [:nav_tournaments "Tournaments"])
+   {:title [:nav_tournaments "Tournaments"]
     :cls "tournaments"
     :route "/tournament"
     :show? #(:tournament-organizer (:user %))}
-   {:title (tr [:nav_admin "Admin"])
+   {:title [:nav_admin "Admin"]
     :cls "admin"
     :route "/admin"
     :show? #(:isadmin (:user %))}
-   {:title (tr [:nav_users "Users"])
+   {:title [:nav_users "Users"]
     :cls "users"
     :route "/users"
     :show? #(or (:isadmin (:user %))
                 (:ismoderator (:user %)))}
-   {:title (tr [:nav_users "Prizes"])
+   {:title [:nav_prizes "Prizes"]
     :cls "prizes"
     :route "/prizes"
     :show? #(or (:isadmin (:user %))
                 (:ismoderator (:user %)))}
-   {:title (tr [:nav_features "Features"])
+   {:title [:nav_features "Features"]
     :cls "features"
     :route "/features"
     :show? #(:isadmin (:user %))}])
@@ -80,8 +80,8 @@
                  (show? @app-state))
          [:li {:class (if (= (:path @routes/current-view) route) "active" "")
                :id (str cls "-nav")
-               :key title
+               :key (tr title)
                ; :on-click #(.setToken history route)
                :data-target "#main"
                :data-slide-to idx}
-          [:a {:href route} title]])))])
+          [:a {:href route} (tr title)]])))])