Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream

2023-09-15 20:57:40 +02:00
parent 526f457ebc 398635c0c4
commit 5d8c65f2a7
21 changed files with 123 additions and 49 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1739,6 +1739,7 @@ en:
      default: "%b %d, %Y, %H:%M"
      month: "%b %Y"
      time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
  translation:
    errors:
      quota_exceeded: The server-wide usage quota for the translation service has been exceeded.