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

Rename user_controller to users_controller

Browse source
This commit is contained in:
Andy Allan 2018-10-03 15:31:10 +02:00
parent c77429000c
commit 3ec67ea2d3
58 changed files with 297 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/changeset_helper.rb
View file

@ -1,7 +1,7 @@
module ChangesetHelper
def changeset_user_link(changeset)
if changeset.user.status == "deleted"
t("user.no_such_user.deleted")
t("users.no_such_user.deleted")
elsif changeset.user.data_public?
link_to(changeset.user.display_name, user_path(changeset.user))
else

4
app/helpers/note_helper.rb
View file

@ -16,9 +16,9 @@ module NoteHelper
if author.nil?
""
elsif author.status == "deleted"
t("user.no_such_user.deleted")
t("users.no_such_user.deleted")
else
link_to h(author.display_name), link_options.merge(:controller => "user", :action => "show", :display_name => author.display_name)
link_to h(author.display_name), link_options.merge(:controller => "users", :action => "show", :display_name => author.display_name)
end
end
end

6
app/helpers/user_helper.rb
View file

@ -45,15 +45,15 @@ module UserHelper
# External authentication support
def openid_logo
image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo"
image_tag "openid_small.png", :alt => t("users.login.openid_logo_alt"), :class => "openid_logo"
end
def auth_button(name, provider, options = {})
link_to(
image_tag("#{name}.png", :alt => t("user.login.auth_providers.#{name}.alt")),
image_tag("#{name}.png", :alt => t("users.login.auth_providers.#{name}.alt")),
auth_path(options.merge(:provider => provider)),
:class => "auth_button",
:title => t("user.login.auth_providers.#{name}.title")
:title => t("users.login.auth_providers.#{name}.title")
)
end

12
app/helpers/user_roles_helper.rb
View file

@ -9,21 +9,21 @@ module UserRolesHelper
if current_user&.administrator?
if user.has_role?(role)
image = "roles/#{role}"
alt = t("user.show.role.revoke.#{role}")
title = t("user.show.role.revoke.#{role}")
alt = t("users.show.role.revoke.#{role}")
title = t("users.show.role.revoke.#{role}")
url = revoke_role_path(:display_name => user.display_name, :role => role)
confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role)
else
image = "roles/blank_#{role}"
alt = t("user.show.role.grant.#{role}")
title = t("user.show.role.grant.#{role}")
alt = t("users.show.role.grant.#{role}")
title = t("users.show.role.grant.#{role}")
url = grant_role_path(:display_name => user.display_name, :role => role)
confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role)
end
elsif user.has_role?(role)
image = "roles/#{role}"
alt = t("user.show.role.#{role}")
title = t("user.show.role.#{role}")
alt = t("users.show.role.#{role}")
title = t("users.show.role.#{role}")
end
if image