From: Anton Khorev <tony29@yandex.ru>
Date: Tue, 11 Mar 2025 08:00:45 +0000 (+0300)
Subject: Merge branch 'pull/5783'
X-Git-Tag: live~16
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3932d97f31193c9c2c901f58446cdeccecebcd0d?hp=-c

Merge branch 'pull/5783'
---

3932d97f31193c9c2c901f58446cdeccecebcd0d
diff --combined config/locales/en.yml
index e86619062,b2f9272ec..04968211d
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1607,9 -1607,6 +1607,9 @@@ en
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
          note: "Note #%{note_id}"
 +      reportable_dates:
 +        created_on_html: "created on %{datetime_created}"
 +        created_on_updated_on_html: "created on %{datetime_created}, updated on %{datetime_updated}"
      reporters:
        index:
          title: "Issue #%{issue_id} Reporters"
@@@ -2951,6 -2948,9 +2951,9 @@@
            deleted: Deleted
          name_or_email: Name or Email
          ip_address: IP Address
+         edits: Edits?
+         has_edits: Has Edits
+         no_edits: No Edits
          search: Search
        page:
          found_users: