cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use lazy lookups for user_blocks translations

Browse source
This commit is contained in:
Andy Allan 2018-04-25 11:20:50 +08:00
parent 4a9846b078
commit a0de9b780d
11 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/user_blocks_helper.rb
View file

@ -7,19 +7,19 @@ module UserBlocksHelper
# if the block hasn't expired yet show the date, if the user just needs to login show that
if block.needs_view?
if block.ends_at > Time.now.getutc
I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe
I18n.t("user_blocks.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe
else
I18n.t("user_block.helper.until_login")
I18n.t("user_blocks.helper.until_login")
end
else
I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe
I18n.t("user_blocks.helper.time_future", :time => friendly_date(block.ends_at)).html_safe
end
else
# the max of the last update time or the ends_at time is when this block finished
# either because the user viewed the block (updated_at) or it expired or was
# revoked (ends_at)
last_time = [block.ends_at, block.updated_at].max
I18n.t("user_block.helper.time_past", :time => friendly_date(last_time)).html_safe
I18n.t("user_blocks.helper.time_past", :time => friendly_date(last_time)).html_safe
end
end
end