Merge branch 'master' into 'master'

Master See merge request agenda-libre/agenda-libre-ruby!34
2019-05-10 10:24:04 +02:00 · 2019-05-10 10:24:04 +02:00 · 71a4972601
commit 71a4972601
parent 1bcedc5bf8 deddb9a949
2 changed files with 4 additions and 4 deletions
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -7,6 +7,6 @@ de:
      long: '%A %e %B %Y'
  time:
    formats:
-      at: '%A %e %B %Y um %Hh%M'
-      hours: '%Hh%M'
+      at: '%A %e %B %Y um %H:%M Uhr'
+      hours: '%H:%M Uhr'
      xml: '%Y/%m/%d %T'
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -7,6 +7,6 @@ nl:
      long: '%A %e %B %Y'
  time:
    formats:
-      at: '%A %e %B %Y om %Hh%M'
-      hours: '%Hh%M'
+      at: '%A %e %B %Y om %Hu%M'
+      hours: '%Hu%M'
      xml: '%Y/%m/%d %T'