diff --git a/src/packer/core.clj b/src/packer/core.clj index b03e549..1d7152a 100644 --- a/src/packer/core.clj +++ b/src/packer/core.clj @@ -9,8 +9,11 @@ (str "### " (get i18n category))) (defn produce-item [item nights i18n] - (let [qnt (int (Math/ceil ((:quantity item) nights)))] - (str "- [ ] " (get i18n (:key item)) (if (> qnt 1) (str " x" qnt) "")))) + (let [quantity (if (= (type (:quantity item)) java.lang.Long) (:quantity item) ((:quantity item) nights)) + quantity-long (long (Math/ceil quantity)) + quantity-string (if (> quantity-long 1) (str " x" quantity-long) "") + name (or (get i18n (:key item)) (:name item))] + (str "- [ ] " name quantity-string))) (defn produce-items [items nights i18n] (->> items diff --git a/src/packer/model.clj b/src/packer/model.clj index 778010b..bed2aae 100644 --- a/src/packer/model.clj +++ b/src/packer/model.clj @@ -1,5 +1,5 @@ (ns packer.model (:gen-class)) -(defrecord Item [key quantity]) +(defrecord Item [key name quantity]) (defrecord Template [store i18n profile]) \ No newline at end of file