From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Nov 2023 22:30:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4349'
X-Git-Tag: live~1292
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2fcee9625dcd192d0c524f27d9cb182c883e31b4?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/pull/4349'
---

2fcee9625dcd192d0c524f27d9cb182c883e31b4
diff --combined app/assets/stylesheets/common.scss
index f91f380b2,995c43f59..1f5d0398e
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -47,6 -47,10 +47,10 @@@ small, aside 
    font-size: 12px;
  }
  
+ time[title] {
+   text-decoration: underline dotted;
+ }
+ 
  #container { position: relative; }
  
  .small_icon {
@@@ -54,6 -58,10 +58,6 @@@
    margin-right: $lineheight * 0.25;
  }
  
 -[dir=rtl] { /* no-r2 */ text-align: right; }
 -
 -[dir=ltr] { /* no-r2 */ text-align: left; }
 -
  /* Rules for icons */
  
  .icon {
diff --combined app/helpers/application_helper.rb
index 2fc0d808d,4932bcc5e..17c36bdfe
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@@ -26,11 -26,11 +26,11 @@@ module ApplicationHelpe
    end
  
    def friendly_date(date)
-     tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly))
+     tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema)
    end
  
    def friendly_date_ago(date)
-     tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly))
+     tag.time(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly), :datetime => date.xmlschema)
    end
  
    def body_class
@@@ -48,8 -48,7 +48,8 @@@
    def application_data
      data = {
        :locale => I18n.locale,
 -      :preferred_editor => preferred_editor
 +      :preferred_editor => preferred_editor,
 +      :preferred_languages => preferred_languages.expand.map(&:to_s)
      }
  
      if current_user
diff --combined config/locales/en.yml
index ce84600d2,079f525a0..1a41dcce8
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -465,6 -465,7 +465,7 @@@ en
      contact:
        km away: "%{count}km away"
        m away: "%{count}m away"
+       latest_edit_html: "Latest edit (%{ago}):"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
@@@ -2731,7 -2732,6 +2732,6 @@@
        ct status: "Contributor terms:"
        ct undecided: Undecided
        ct declined: Declined
-       latest edit: "Latest edit (%{ago}):"
        email address: "Email address:"
        created from: "Created from:"
        status: "Status:"
@@@ -2739,15 -2739,12 +2739,15 @@@
        role:
          administrator: "This user is an administrator"
          moderator: "This user is a moderator"
 +        importer: "This user is a importer"
          grant:
            administrator: "Grant administrator access"
            moderator: "Grant moderator access"
 +          importer: "Grant importer access"
          revoke:
            administrator: "Revoke administrator access"
            moderator: "Revoke moderator access"
 +          importer: "Revoke importer access"
        block_history: "Active Blocks"
        moderator_history: "Blocks Given"
        comments: "Comments"
@@@ -2847,8 -2844,8 +2847,8 @@@
      revoke:
        title: "Revoking block on %{block_on}"
        heading_html: "Revoking block on %{block_on} by %{block_by}"
-       time_future: "This block will end in %{time}."
-       past: "This block ended %{time} and cannot be revoked now."
+       time_future_html: "This block will end in %{time}."
+       past_html: "This block ended %{time} and cannot be revoked now."
        confirm: "Are you sure you wish to revoke this block?"
        revoke: "Revoke!"
        flash: "This block has been revoked."