better fix for reading multiline po-files

project.clj

@@ -1,4 +1,4 @@
-(defproject ua.kasta/i18n "1.0.5"
+(defproject ua.kasta/i18n "1.0.6"
   :description "Internationalization lib"
   :url "https://github.com/kasta-ua/i18n"
   :license {:name "EPL-2.0"

src/kasta/i18n.clj

@@ -37,7 +37,7 @@
 
 
 (defn get-trans [lang input]
-  (or (get (read-translations lang) input)
+  (or (not-empty (get (read-translations lang) input))
       input))
 
 

src/kasta/i18n/po.clj

@@ -8,15 +8,14 @@
 ;;; Utils
 
 (defn fmt-escaped [value]
-  (if (string? value)
-    value
-    (str "~" (pr-str value))))
+  (cond
+    (nil? value)    value
+    (string? value) value
+    :else           (str "~" (pr-str value))))
 
 
 (defn read-escaped [value]
-  ;; this looks like double-encoding since it is: first we generate string by
-  ;; `fmt-escaped`, and then it's put in double-quotes in `gen-po`
-  (let [value (edn/read-string value)]
+  (not-empty
     (if (= \~ (first value))
       (edn/read-string (subs value 1))
       value)))
@@ -75,7 +74,7 @@ msgstr \"\"
   (fn [[line & rest]]
     (let [[multiline-values rest] (split-with quoted-string? rest)
           values                  (->> (concat [line] multiline-values)
-                                       (remove empty-str?))]
+                                       (map edn/read-string))]
       [key (read-escaped (str/join values)) rest])))
 
 

test/kasta/i18n/po_test.clj

@@ -14,5 +14,9 @@
     (let [single (test-data "single.po")]
       (t/is (= {::po/msgid  '(utils/plural warehouses " отделение" " отделения" " отделений")
                 ::po/msgstr '(utils/plural warehouses " відділення" " відділення" " відділень")}
+               (po/parse-block single))))
+
+    (let [single (test-data "single2.po")]
+      (t/is (= {::po/msgid '(fmt (str "Заказ откорректирован на %s " "из-за нехватки доступных товаров") (utils/plural+ (- quantity new-quantity) "единицу" "единицы" "единиц"))}
                (po/parse-block single))))))