Implement code review suggestions

src/metabase/automagic_dashboards/core.clj

@@ -30,7 +30,7 @@
             [metabase.related :as related]
             [metabase.sync.analyze.classify :as classify]
             [metabase.util :as u]
-            [puppetlabs.i18n.core :as i18n :refer [tru]]
+            [puppetlabs.i18n.core :as i18n :refer [tru trs]]
             [ring.util.codec :as codec]
             [schema.core :as s]
             [toucan.db :as db]))
@@ -618,16 +618,16 @@
                                    ;; `first` realises one element at a time (no chunking).
                                    first))]
     (do
-      (log/info (format "Applying heuristic %s to %s." (:rule rule) full-name))
-      (log/info (format "Dimensions bindings:\n%s"
-                        (->> dashboard
-                             :context
-                             :dimensions
-                             (m/map-vals #(update % :matches (partial map :name)))
-                             u/pprint-to-str)))
-      (log/info (format "Using definitions:\nMetrics:\n%s\nFilters:\n%s"
-                        (-> dashboard :context :metrics u/pprint-to-str)
-                        (-> dashboard :context :filters u/pprint-to-str)))
+      (log/infof (trs "Applying heuristic %s to %s.") (:rule rule) full-name)
+      (log/infof (trs "Dimensions bindings:\n%s")
+                 (->> dashboard
+                      :context
+                      :dimensions
+                      (m/map-vals #(update % :matches (partial map :name)))
+                      u/pprint-to-str))
+      (log/infof (trs "Using definitions:\nMetrics:\n%s\nFilters:\n%s")
+                 (-> dashboard :context :metrics u/pprint-to-str)
+                 (-> dashboard :context :filters u/pprint-to-str))
       (-> (cond-> dashboard
             (or query-filter cell-query)
             (assoc :title (str (tru "A closer look at ") full-name)))
@@ -644,7 +644,7 @@
                                                :url         (format "%s#show=all"
                                                                     (:url root))}]
                                              []))))))
-    (throw (ex-info (format "Can't create dashboard for %s" full-name)
+    (throw (ex-info (format (trs "Can't create dashboard for %s") full-name)
              {:root            root
               :available-rules (map :rule (or (some-> rule rules/get-rule vector)
                                               (rules/get-rules rules-prefix)))}))))

src/metabase/automagic_dashboards/populate.clj

@@ -6,6 +6,7 @@
             [metabase.automagic-dashboards.filters :as magic.filters]
             [metabase.models.card :as card]
             [metabase.query-processor.util :as qp.util]
+            [puppetlabs.i18n.core :as i18n :refer [trs]]
             [toucan.db :as db]))
 
 (def ^Long ^:const grid-width
@@ -252,10 +253,10 @@
                                      ;; Height doesn't need to be precise, just some
                                      ;; safe upper bound.
                                      (make-grid grid-width (* n grid-width))]))]
-     (log/info (format "Adding %s cards to dashboard %s:\n%s"
-                       (count cards)
-                       title
-                       (str/join "; " (map :title cards))))
+     (log/infof (trs "Adding %s cards to dashboard %s:\n%s")
+                (count cards)
+                title
+                (str/join "; " (map :title cards)))
      (cond-> dashboard
        (not-empty filters) (magic.filters/add-filters filters max-filters)))))
 

src/metabase/automagic_dashboards/rules.clj

@@ -7,6 +7,7 @@
             [metabase.types]
             [metabase.util :as u]
             [metabase.util.schema :as su]
+            [puppetlabs.i18n.core :as i18n :refer [trs]]
             [schema
              [coerce :as sc]
              [core :as s]]
@@ -19,7 +20,7 @@
   100)
 
 (def ^:private Score (s/constrained s/Int #(<= 0 % max-score)
-                                    (str "0 <= score <= " max-score)))
+                                    (format (trs "0 <= score <= %s") max-score)))
 
 (def ^:private MBQL [s/Any])
 
@@ -80,7 +81,7 @@
 (def ^:private Visualization [(s/one s/Str "visualization") su/Map])
 
 (def ^:private Width  (s/constrained s/Int #(<= 1 % populate/grid-width)
-                                     (format "1 <= width <= %s"
+                                     (format (trs "1 <= width <= %s")
                                              populate/grid-width)))
 (def ^:private Height (s/constrained s/Int pos?))
 
@@ -202,13 +203,13 @@
     (s/optional-key :groups)            Groups
     (s/optional-key :indepth)           [s/Any]
     (s/optional-key :dashboard_filters) [s/Str]}
-   valid-metrics-references?            "Valid metrics references"
-   valid-filters-references?            "Valid filters references"
-   valid-group-references?              "Valid group references"
-   valid-order-by-references?           "Valid order_by references"
-   valid-dashboard-filters-references?  "Valid dashboard filters references"
-   valid-dimension-references?          "Valid dimension references"
-   valid-breakout-dimension-references? "Valid card dimension references"))
+   valid-metrics-references?            (trs "Valid metrics references")
+   valid-filters-references?            (trs "Valid filters references")
+   valid-group-references?              (trs "Valid group references")
+   valid-order-by-references?           (trs "Valid order_by references")
+   valid-dashboard-filters-references?  (trs "Valid dashboard filters references")
+   valid-dimension-references?          (trs "Valid dimension references")
+   valid-breakout-dimension-references? (trs "Valid card dimension references")))
 
 (defn- with-defaults
   [defaults]
@@ -292,13 +293,13 @@
           (update :applies_to #(or % entity-type))
           rules-validator))
     (catch Exception e
-      (log/error (format "Error parsing %s:\n%s"
-                         (.getFileName f)
-                         (or (some-> e
-                                     ex-data
-                                     (select-keys [:error :value])
-                                     u/pprint-to-str)
-                             e)))
+      (log/errorf (trs "Error parsing %s:\n%s")
+                  (.getFileName f)
+                  (or (some-> e
+                              ex-data
+                              (select-keys [:error :value])
+                              u/pprint-to-str)
+                      e))
       nil)))
 
 (defn- trim-trailing-slash