Merge branch 'pull/4985'

[rails.git] / config / locales / my.yml

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 9cfc23f2c103ce2e57023113dadfd824911ee2c1..d214bd5ce559af385c03740212947e7a6f77f513 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -3,10 +3,16 @@
 # Export driver: phpyaml
 # Author: Dr Lotus Black
 # Author: Ninjastrikers
 # Export driver: phpyaml
 # Author: Dr Lotus Black
 # Author: Ninjastrikers

+# Author: Zyh333222

 # Author: ခွန်ပညာႏ(တောင်ႏကီꩻ)
 # Author: သူထွန်း
 ---
 my:
 # Author: ခွန်ပညာႏ(တောင်ႏကီꩻ)
 # Author: သူထွန်း
 ---
 my:

+  time:
+    formats:
+      friendly: |-
+        %e %B %Y
+         at %H:%M

   helpers:
     file:
       prompt: ဖိုင်ရွေးပါ
   helpers:
     file:
       prompt: ဖိုင်ရွေးပါ