if user.terms_agreed?
can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
can :create, ChangesetComment
- can [:create, :update, :delete], Node
- can [:create, :update, :delete], Way
- can [:create, :update, :delete], Relation
+ can [:create, :update, :delete], [Node, Way, Relation]
end
if user.moderator?
can [:destroy, :restore], ChangesetComment
can :destroy, Note
- if user.terms_agreed?
- can :redact, OldNode
- can :redact, OldWay
- can :redact, OldRelation
- end
+ can :redact, [OldNode, OldWay, OldRelation] if user.terms_agreed?
end
end
end
if user.terms_agreed?
can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset if scope?(token, :write_api)
can :create, ChangesetComment if scope?(token, :write_api)
- can [:create, :update, :delete], Node if scope?(token, :write_api)
- can [:create, :update, :delete], Way if scope?(token, :write_api)
- can [:create, :update, :delete], Relation if scope?(token, :write_api)
+ can [:create, :update, :delete], [Node, Way, Relation] if scope?(token, :write_api)
end
if user.moderator?
can [:destroy, :restore], ChangesetComment if scope?(token, :write_api)
can :destroy, Note if scope?(token, :write_notes)
- if user&.terms_agreed?
- can :redact, OldNode if scope?(token, :write_api) || scope?(token, :write_redactions)
- can :redact, OldWay if scope?(token, :write_api) || scope?(token, :write_redactions)
- can :redact, OldRelation if scope?(token, :write_api) || scope?(token, :write_redactions)
- end
+ can :redact, [OldNode, OldWay, OldRelation] if user&.terms_agreed? && (scope?(token, :write_api) || scope?(token, :write_redactions))
end
end
end
discussion: "Discussion"
leave_a_comment: "Leave a comment"
login_to_leave_a_comment_html: "%{login_link} to leave a comment"
- login: "Login"
+ login: "Log in"
no_such_entry:
title: "No such diary entry"
heading: "No entry with the id: %{id}"
one: "%{count} muted message"
other: "You have %{count} muted messages"
reply:
- wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
+ wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
show:
title: "Read message"
reply_button: "Reply"
unread_button: "Mark as unread"
destroy_button: "Delete"
back: "Back"
- wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
+ wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
sent_message_summary:
destroy_button: "Delete"
heading:
failure: Couldn't update profile.
sessions:
new:
- title: "Login"
- heading: "Login"
+ title: "Log in"
+ heading: "Log in"
email or username: "Email Address or Username"
password: "Password"
openid_html: "%{logo} OpenID"
remember: "Remember me"
lost password link: "Lost your password?"
- login_button: "Login"
+ login_button: "Log in"
register now: Register now
- with external: "Alternatively, use a third party to login:"
+ with external: "Alternatively, use a third party to log in:"
no account: Don't have an account?
auth failure: "Sorry, could not log in with those details."
openid_logo_alt: "Log in with an OpenID"
auth_providers:
openid:
- title: Login with OpenID
- alt: Login with an OpenID URL
+ title: Log in with OpenID
+ alt: Log in with an OpenID URL
google:
- title: Login with Google
- alt: Login with a Google OpenID
+ title: Log in with Google
+ alt: Log in with a Google OpenID
facebook:
- title: Login with Facebook
- alt: Login with a Facebook Account
+ title: Log in with Facebook
+ alt: Log in with a Facebook Account
microsoft:
- title: Login with Microsoft
- alt: Login with a Microsoft Account
+ title: Log in with Microsoft
+ alt: Log in with a Microsoft Account
github:
- title: Login with GitHub
- alt: Login with a GitHub Account
+ title: Log in with GitHub
+ alt: Log in with a GitHub Account
wikipedia:
- title: Login with Wikipedia
- alt: Login with a Wikipedia Account
+ title: Log in with Wikipedia
+ alt: Log in with a Wikipedia Account
wordpress:
- title: Login with Wordpress
- alt: Login with a Wordpress OpenID
+ title: Log in with Wordpress
+ alt: Log in with a Wordpress OpenID
aol:
- title: Login with AOL
- alt: Login with an AOL OpenID
+ title: Log in with AOL
+ alt: Log in with an AOL OpenID
destroy:
title: "Logout"
heading: "Logout from OpenStreetMap"
paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
display name description: "Your publicly displayed username. You can change this later in the preferences."
external auth: "Third Party Authentication:"
- use external auth: "Alternatively, use a third party to login"
+ use external auth: "Alternatively, use a third party to log in"
auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!"
If you are new to OpenStreetMap, please create a new account
using the form below.
option_2: |
- If you already have an account, you can login to your account
+ If you already have an account, you can log in to your account
using your username and password and then associate the account
with your ID in your user settings.
user_role:
within "form", :text => "Email Address or Username" do
fill_in "username", :with => user.email
fill_in "password", :with => "test"
- click_on "Login"
+ click_on "Log in"
end
end
# Check that we can't reply to somebody else's message
get message_reply_path(:message_id => unread_message)
assert_redirected_to login_path(:referer => message_reply_path(:message_id => unread_message.id))
- assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice]
+ assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
# Login as the right user
session_for(recipient_user)
# Check that we can't read the message
get message_path(:id => unread_message)
assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
- assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it.", flash[:notice]
+ assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice]
# Login as the message sender
session_for(user)
def test_auth_button
button = auth_button("google", "google")
- assert_equal("<a class=\"auth_button\" title=\"Login with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\"><img alt=\"Login with a Google OpenID\" class=\"rounded-3\" src=\"/images/google.svg\" /></a>", button)
+ img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-3\" src=\"/images/google.svg\" />"
+ assert_equal("<a class=\"auth_button\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
end
private
projects / rails.git / commitdiff