master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
2 changed files with 4 additions and 1 deletions
Showing only changes of commit b61df09b94 - Show all commits

View File

@ -135,6 +135,6 @@ module ApplicationHelper
# Returns a more friendly/readable date time object
def view_date(date)
return "" if date.nil? # Handle invalid dates
local_time(date, "%b %d, %Y %-I:%M%P")
local_time(date, :default)
end
end

View File

@ -645,6 +645,9 @@ en:
test_install: >
This deployment is using a pre-configured testing server, you should replace this with your own.
For details, see the %{href}.
time:
formats:
default: "%b %d, %Y %-I:%M%P"
update: Update
verify:
accept: Verify