trim key used for i18n

zbryikt · Jan 23, 2021 · a7f32f5 · a7f32f5
1 parent b48a3a6
commit a7f32f5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/bin/lib/build/pug.js b/bin/lib/build/pug.js
diff --git a/lib/build/pug.ls b/lib/build/pug.ls
@@ -32,9 +32,9 @@ pug-extapi = do
 main = do
   opt: (opt = {}) ->
     if opt.i18n =>
-      pug-extapi.i18n = -> opt.i18n.t(it)
+      pug-extapi.i18n = -> opt.i18n.t((it or '').trim!)
       pug-extapi.intlbase = (p = "") -> if opt.i18n.language => path.join("/intl",opt.i18n.language,p) else p
-      pug-extapi.{}filters.i18n = (t, o) -> opt.i18n.t(t)
+      pug-extapi.{}filters.i18n = (t, o) -> opt.i18n.t((t or '').trim!)
       lc.i18n = opt.i18n
   map: (list) ->
     list

diff --git a/src/pug/index.pug b/src/pug/index.pug
@@ -20,5 +20,6 @@ html
     div: :i18n
       i18n key filter
     div= i18n("i18n key")
+    div: :i18n i18n key
     div= i18n("alternative:namespace-test")
     div= intlbase("/")
diff --git a/static/index.html b/static/index.html
@@ -9,4 +9,4 @@
 div.textContent = "livescript filter test";</script><script type="application/json">{
   "output": "lson test ok"
 }
-</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div></body></html>
+</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div></body></html>
diff --git a/static/intl/en/index.html b/static/intl/en/index.html
@@ -9,4 +9,4 @@
 div.textContent = "livescript filter test";</script><script type="application/json">{
   "output": "lson test ok"
 }
-</script><div>i18n translation test ( compile time filter )</div><div>i18n translation test ( runtime function )</div><div>namespace test ok.</div><div>/intl/en/</div></body></html>
+</script><div>i18n translation test ( compile time filter )</div><div>i18n translation test ( runtime function )</div><div>i18n translation test ( runtime function )</div><div>namespace test ok.</div><div>/intl/en/</div></body></html>
diff --git a/static/intl/zh-TW/index.html b/static/intl/zh-TW/index.html
@@ -9,4 +9,4 @@
 div.textContent = "livescript filter test";</script><script type="application/json">{
   "output": "lson test ok"
 }
-</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div></body></html>
+</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div></body></html>