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

[rails.git] / app / views / layouts / _offline_flash.erb

diff --git a/app/views/layouts/_offline_flash.erb b/app/views/layouts/_offline_flash.erb
index de4d156323def7c6a74bd17c64e5f0db914be524..364788dcf002d2b4d684e7fd3f0bc47de8c8485c 100644 (file)
--- a/app/views/layouts/_offline_flash.erb
+++ b/app/views/layouts/_offline_flash.erb
@@ -9,6 +9,15 @@
     </p>
   <% end %>
 
     </p>
   <% end %>
 

+  <% if Settings.status_expected_restore_date %>
+    <% expected_restore_time = Time.parse(Settings.status_expected_restore_date).utc %>
+    <% if expected_restore_time > Time.now.utc %>
+      <p class="mb-0">
+        <%= t ".expected_restore_html", :time => friendly_date(expected_restore_time) %>
+      </p>
+    <% end %>
+  <% end %>
+

   <% if Settings.status_announcement_url %>
     <p class="mb-0">
       <%= link_to t(".announcement"), Settings.status_announcement_url %>
   <% if Settings.status_announcement_url %>
     <p class="mb-0">
       <%= link_to t(".announcement"), Settings.status_announcement_url %>