]> git.openstreetmap.org Git - rails.git/commitdiff
Show dates as <time> elements on issues pages
authorAnton Khorev <tony29@yandex.ru>
Tue, 9 Jan 2024 13:02:19 +0000 (16:02 +0300)
committerAnton Khorev <tony29@yandex.ru>
Tue, 9 Jan 2024 13:35:43 +0000 (16:35 +0300)
app/views/issues/_comments.html.erb
app/views/issues/_reports.html.erb
app/views/issues/show.html.erb
config/locales/en.yml

index 9c5695e0a88558c794a21ce94bb01aefb05e392a..7776d9ee398a89077a3899b1bbe9a79d83ece820 100644 (file)
@@ -7,7 +7,8 @@
       <div class="col">
         <p class="text-muted">
           <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
       <div class="col">
         <p class="text-muted">
           <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
-                                      :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+                                      :comment_created_at => tag.time(l(comment.created_at.to_datetime, :format => :friendly),
+                                                                      :datetime => comment.created_at.xmlschema) %>
         </p>
         <div class="richtext text-break"><%= comment.body.to_html %></div>
       </div>
         </p>
         <div class="richtext text-break"><%= comment.body.to_html %></div>
       </div>
index d11bca0a9d9c2a10174556276cdb242a0fbabd35..9ef28f1c29007c06664aed58894350b90fcc0081 100644 (file)
@@ -7,7 +7,8 @@
       <p class="text-muted">
         <%= t ".reported_by_html", :category => report.category,
                                    :user => link_to(report.user.display_name, user_path(report.user)),
       <p class="text-muted">
         <%= t ".reported_by_html", :category => report.category,
                                    :user => link_to(report.user.display_name, user_path(report.user)),
-                                   :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
+                                   :updated_at => tag.time(l(report.updated_at.to_datetime, :format => :friendly),
+                                                           :datetime => report.updated_at.xmlschema) %>
       </p>
       <div class="richtext text-break"><%= report.details.to_html %></div>
     </div>
       </p>
       <div class="richtext text-break"><%= report.details.to_html %></div>
     </div>
index 71b5b40f6fef543d58d2128833f3627c90dc4b97..2f1e45aa5edc1c76ee51b19496ff33c87068ba94 100644 (file)
@@ -9,15 +9,18 @@
     <% else %>
       | <%= t ".no_reports" %>
     <% end %>
     <% else %>
       | <%= t ".no_reports" %>
     <% end %>
-      | <%= t ".report_created_at",
-              :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
+      | <%= t ".report_created_at_html",
+              :datetime => tag.time(l(@issue.created_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.created_at.xmlschema) %>
     <% if @issue.resolved_at? %>
     <% if @issue.resolved_at? %>
-      | <%= t ".last_resolved_at",
-              :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly) %>
+      | <%= t ".last_resolved_at_html",
+              :datetime => tag.time(l(@issue.resolved_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.resolved_at.xmlschema) %>
     <% end %>
     <% if @issue.user_updated %>
     <% end %>
     <% if @issue.user_updated %>
-      | <%= t ".last_updated_at",
-              :datetime => l(@issue.updated_at.to_datetime, :format => :friendly),
+      | <%= t ".last_updated_at_html",
+              :datetime => tag.time(l(@issue.updated_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.updated_at.xmlschema),
               :displayname => @issue.user_updated.display_name %>
     <% end %>
   </small>
               :displayname => @issue.user_updated.display_name %>
     <% end %>
   </small>
index 6218bfea24fcb38c9b4fdca6a0e770377611a0b8..8114c8b10b5a26b99744b147b436bd9bd1e27430 100644 (file)
@@ -1439,9 +1439,9 @@ en:
         one: "%{count} report"
         other: "%{count} reports"
       no_reports: No reports
         one: "%{count} report"
         other: "%{count} reports"
       no_reports: No reports
-      report_created_at: "First reported at %{datetime}"
-      last_resolved_at: "Last resolved at %{datetime}"
-      last_updated_at: "Last updated at %{datetime} by %{displayname}"
+      report_created_at_html: "First reported at %{datetime}"
+      last_resolved_at_html: "Last resolved at %{datetime}"
+      last_updated_at_html: "Last updated at %{datetime} by %{displayname}"
       resolve: Resolve
       ignore: Ignore
       reopen: Reopen
       resolve: Resolve
       ignore: Ignore
       reopen: Reopen