Merge branch 'master' into openstreetbugs

[rails.git] / vendor / rails-locales / ja.yml

diff --git a/vendor/rails-locales/ja.yml b/vendor/rails-locales/ja.yml
index 60d706829c9eb2b718e989d18d5bff10b86c13ff..d32a2358023f625e1ae6f31e8a12600814f6b254 100644 (file)
--- a/vendor/rails-locales/ja.yml
+++ b/vendor/rails-locales/ja.yml
@@ -66,7 +66,7 @@ ja:
     formats:
       default: "%Y/%m/%d %H:%M:%S"
       short: "%y/%m/%d %H:%M"
-      long: "%Y年%m月%d日(%a) %H時%M分%S秒 %Z"
+      long: "%Y年%m月%d日(%a) %H時%M分%S秒 %z"
     am: "午前"
     pm: "午後"