Rails/SkipsModelValidations:
Exclude:
- 'db/migrate/*.rb'
- - 'app/controllers/user_controller.rb'
+ - 'app/controllers/users_controller.rb'
Style/BracesAroundHashParameters:
EnforcedStyle: context_dependent
Style/IfInsideElse:
Enabled: false
-Style/GlobalVars:
- Exclude:
- - 'lib/quad_tile/extconf.rb'
-
Style/GuardClause:
Enabled: false
- 'app/controllers/geocoder_controller.rb'
- 'app/controllers/notes_controller.rb'
- 'app/controllers/traces_controller.rb'
- - 'app/controllers/user_controller.rb'
+ - 'app/controllers/users_controller.rb'
- 'app/controllers/user_preferences_controller.rb'
- 'app/helpers/application_helper.rb'
- 'app/helpers/browse_helper.rb'
Lint/HandleExceptions:
Exclude:
- 'app/controllers/amf_controller.rb'
- - 'app/controllers/user_controller.rb'
+ - 'app/controllers/users_controller.rb'
# Offense count: 692
Metrics/AbcSize:
# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
- Max: 259
+ Max: 262
# Offense count: 11
# Configuration parameters: CountBlocks.
# Offense count: 20
Rails/OutputSafety:
Exclude:
- - 'app/controllers/user_controller.rb'
+ - 'app/controllers/users_controller.rb'
- 'app/helpers/application_helper.rb'
- 'app/helpers/changeset_helper.rb'
- 'app/helpers/geocoder_helper.rb'
session.delete(:user)
session_expires_automatically
- redirect_to :controller => "user", :action => "suspended"
+ redirect_to :controller => "users", :action => "suspended"
# don't allow access to any auth-requiring part of the site unless
# the new CTs have been seen (and accept/decline chosen).
elsif !current_user.terms_seen && flash[:skip_terms].nil?
flash[:notice] = t "user.terms.you need to accept or decline"
if params[:referer]
- redirect_to :controller => "user", :action => "terms", :referer => params[:referer]
+ redirect_to :controller => "users", :action => "terms", :referer => params[:referer]
else
- redirect_to :controller => "user", :action => "terms", :referer => request.fullpath
+ redirect_to :controller => "users", :action => "terms", :referer => request.fullpath
end
end
elsif session[:token]
def require_user
unless current_user
if request.get?
- redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+ redirect_to :controller => "users", :action => "login", :referer => request.fullpath
else
head :forbidden
end
##
# render a "no such user" page
def render_unknown_user(name)
- @title = t "user.no_such_user.title"
+ @title = t "users.no_such_user.title"
@not_found_user = name
respond_to do |format|
- format.html { render :template => "user/no_such_user", :status => :not_found }
+ format.html { render :template => "users/no_such_user", :status => :not_found }
format.all { head :not_found }
end
end
render :action => "new"
else
flash[:notice] = t ".wrong_user", :user => current_user.display_name
- redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+ redirect_to :controller => "users", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t "messages.no_such_message.title"
@message.save
else
flash[:notice] = t ".wrong_user", :user => current_user.display_name
- redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+ redirect_to :controller => "users", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t "messages.no_such_message.title"
# Destroy the message.
def destroy
- @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
+ @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:id])
@message.from_user_visible = false if @message.sender == current_user
@message.to_user_visible = false if @message.recipient == current_user
if @message.save && !request.xhr?
@notes = @notes.visible unless current_user&.moderator?
@notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
else
- @title = t "user.no_such_user.title"
+ @title = t "users.no_such_user.title"
@not_found_user = params[:display_name]
- render :template => "user/no_such_user", :status => :not_found
+ render :template => "users/no_such_user", :status => :not_found
end
end
end
-class UserController < ApplicationController
+class UsersController < ApplicationController
layout "site", :except => [:api_details]
skip_before_action :verify_authenticity_token, :only => [:api_read, :api_users, :api_details, :api_gpx_files, :auth_success]
if request.xhr?
render :partial => "terms"
else
- @title = t "user.terms.title"
+ @title = t "users.terms.title"
if current_user&.terms_agreed?
# Already agreed to terms, so just show settings
end
def save
- @title = t "user.new.title"
+ @title = t "users.new.title"
if params[:decline]
if current_user
current_user.terms_seen = true
- flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save
+ flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save
if params[:referer]
redirect_to params[:referer]
redirect_to :action => :account, :display_name => current_user.display_name
end
else
- redirect_to t("user.terms.declined")
+ redirect_to t("users.terms.declined")
end
elsif current_user
unless current_user.terms_agreed?
current_user.terms_agreed = Time.now.getutc
current_user.terms_seen = true
- flash[:notice] = t "user.new.terms accepted" if current_user.save
+ flash[:notice] = t "users.new.terms accepted" if current_user.save
end
if params[:referer]
current_user.errors.add(attribute, error)
end
end
- @title = t "user.account.title"
+ @title = t "users.account.title"
end
def go_public
current_user.data_public = true
current_user.save
- flash[:notice] = t "user.go_public.flash success"
+ flash[:notice] = t "users.go_public.flash success"
redirect_to :action => "account", :display_name => current_user.display_name
end
def lost_password
- @title = t "user.lost_password.title"
+ @title = t "users.lost_password.title"
if params[:user] && params[:user][:email]
user = User.visible.find_by(:email => params[:user][:email])
if user
token = user.tokens.create
Notifier.lost_password(user, token).deliver_now
- flash[:notice] = t "user.lost_password.notice email on way"
+ flash[:notice] = t "users.lost_password.notice email on way"
redirect_to :action => "login"
else
- flash.now[:error] = t "user.lost_password.notice email cannot find"
+ flash.now[:error] = t "users.lost_password.notice email cannot find"
end
end
end
def reset_password
- @title = t "user.reset_password.title"
+ @title = t "users.reset_password.title"
if params[:token]
token = UserToken.find_by(:token => params[:token])
if current_user.save
token.destroy
- flash[:notice] = t "user.reset_password.flash changed"
+ flash[:notice] = t "users.reset_password.flash changed"
successful_login(current_user)
end
end
else
- flash[:error] = t "user.reset_password.flash token bad"
+ flash[:error] = t "users.reset_password.flash token bad"
redirect_to :action => "lost_password"
end
else
end
def new
- @title = t "user.new.title"
+ @title = t "users.new.title"
@referer = params[:referer] || session[:referer]
append_content_security_policy_directives(
end
def logout
- @title = t "user.logout.title"
+ @title = t "users.logout.title"
if params[:session] == session.id
if session[:token]
if request.post?
token = UserToken.find_by(:token => params[:confirm_string])
if token&.user&.active?
- flash[:error] = t("user.confirm.already active")
+ flash[:error] = t("users.confirm.already active")
redirect_to :action => "login"
elsif !token || token.expired?
- flash[:error] = t("user.confirm.unknown token")
+ flash[:error] = t("users.confirm.unknown token")
redirect_to :action => "confirm"
else
user = token.user
end
if token.nil? || token.user != user
- flash[:notice] = t("user.confirm.success")
+ flash[:notice] = t("users.confirm.success")
redirect_to :action => :login, :referer => referer
else
token.destroy
token = UserToken.find_by(:token => session[:token])
if user.nil? || token.nil? || token.user != user
- flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
+ flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
else
Notifier.signup_confirm(user, user.tokens.create).deliver_now
- flash[:notice] = t("user.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
+ flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
end
redirect_to :action => "login"
gravatar_enabled = gravatar_enable(current_user)
if current_user.save
flash[:notice] = if gravatar_enabled
- t("user.confirm_email.success") + " " + gravatar_status_message(current_user)
+ t("users.confirm_email.success") + " " + gravatar_status_message(current_user)
else
- t("user.confirm_email.success")
+ t("users.confirm_email.success")
end
else
flash[:errors] = current_user.errors
session[:user] = current_user.id
redirect_to :action => "account", :display_name => current_user.display_name
elsif token
- flash[:error] = t "user.confirm_email.failure"
+ flash[:error] = t "users.confirm_email.failure"
redirect_to :action => "account", :display_name => token.user.display_name
else
- flash[:error] = t "user.confirm_email.unknown_token"
+ flash[:error] = t "users.confirm_email.unknown_token"
end
end
end
friend.befriender = current_user
friend.befriendee = @new_friend
if current_user.is_friends_with?(@new_friend)
- flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
+ flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
elsif friend.save
- flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
+ flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name
Notifier.friend_notification(friend).deliver_now
else
- friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
+ friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
end
if params[:referer]
if request.post?
if current_user.is_friends_with?(@friend)
Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all
- flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
+ flash[:notice] = t "users.remove_friend.success", :name => @friend.display_name
else
- flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name
+ flash[:error] = t "users.remove_friend.not_a_friend", :name => @friend.display_name
end
if params[:referer]
when "active", "confirmed" then
successful_login(user, request.env["omniauth.params"]["referer"])
when "suspended" then
- failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe
+ failed_login t("users.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe
else
- failed_login t("user.login.auth failure")
+ failed_login t("users.login.auth failure")
end
else
redirect_to :action => "new", :nickname => name, :email => email,
##
# omniauth failure callback
def auth_failure
- flash[:error] = t("user.auth_failure." + params[:message])
+ flash[:error] = t("users.auth_failure." + params[:message])
redirect_to params[:origin] || login_url
end
elsif user = User.authenticate(:username => username, :password => password, :pending => true)
unconfirmed_login(user)
elsif User.authenticate(:username => username, :password => password, :suspended => true)
- failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username
+ failed_login t("users.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username
else
- failed_login t("user.login.auth failure"), username
+ failed_login t("users.login.auth failure"), username
end
end
set_locale(true)
if user.new_email.blank? || user.new_email == user.email
- flash.now[:notice] = t "user.account.flash update success"
+ flash.now[:notice] = t "users.account.flash update success"
else
user.email = user.new_email
if user.valid?
- flash.now[:notice] = t "user.account.flash update success confirm needed"
+ flash.now[:notice] = t "users.account.flash update success confirm needed"
begin
Notifier.email_confirm(user, user.tokens.create).deliver_now
# and return them to the user page.
def require_administrator
if current_user && !current_user.administrator?
- flash[:error] = t("user.filter.not_an_administrator")
+ flash[:error] = t("users.filter.not_an_administrator")
if params[:display_name]
redirect_to user_path(:display_name => params[:display_name])
# display a message about th current status of the gravatar setting
def gravatar_status_message(user)
if user.image_use_gravatar
- t "user.account.gravatar.enabled"
+ t "users.account.gravatar.enabled"
else
- t "user.account.gravatar.disabled"
+ t "users.account.gravatar.disabled"
end
end
end
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
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
# 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
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
def signup_confirm(user, token)
with_recipient_locale user do
- @url = url_for(:controller => "user", :action => "confirm",
+ @url = url_for(:controller => "users", :action => "confirm",
:display_name => user.display_name,
:confirm_string => token.token)
def email_confirm(user, token)
with_recipient_locale user do
@address = user.new_email
- @url = url_for(:controller => "user", :action => "confirm_email",
+ @url = url_for(:controller => "users", :action => "confirm_email",
:confirm_string => token.token)
mail :to => user.new_email,
def lost_password(user, token)
with_recipient_locale user do
- @url = url_for(:controller => "user", :action => "reset_password",
+ @url = url_for(:controller => "users", :action => "reset_password",
:token => token.token)
mail :to => user.email,
@text = message.body
@title = message.title
@readurl = message_url(message)
- @replyurl = reply_message_url(message)
+ @replyurl = message_reply_url(message)
@author = @from_user
attach_user_avatar(message.sender)
with_recipient_locale friend.befriendee do
@friend = friend
@viewurl = user_url(@friend.befriender)
- @friendurl = url_for(:controller => "user", :action => "make_friend",
+ @friendurl = url_for(:controller => "users", :action => "make_friend",
:display_name => @friend.befriender.display_name)
@author = @friend.befriender.display_name
<% unless current_user %>
<div class="notice">
- <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
+ <%= link_to(t(".join_discussion"), :controller => 'users', :action => 'login', :referer => request.fullpath) %>
</div>
<% end %>
-xml.a(user.display_name, :href => url_for(:controller => "user", :action => "view", :display_name => user.display_name))
+xml.a(user.display_name, :href => url_for(:controller => "users", :action => "view", :display_name => user.display_name))
<div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<% end %>
<% else %>
- <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
+ <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'users', :action => 'login', :referer => request.fullpath)) %></h3>
<% end %>
</div>
<li>
<%= link_to inbox_messages_path do %>
<span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
- <%= t('user.show.my messages') %>
+ <%= t('users.show.my messages') %>
<% end %>
</li>
<li>
- <%= link_to t('user.show.my profile'), user_path(current_user) %>
+ <%= link_to t('users.show.my profile'), user_path(current_user) %>
</li>
<li>
- <%= link_to t('user.show.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
+ <%= link_to t('users.show.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
</li>
<li class="divider"></li>
<li>
<td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
<td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
<td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
- <td class="inbox-mark-unread"><%= button_to t('.unread_button'), mark_message_path(message_summary, :mark => 'unread'), { :remote => true } %></td>
- <td class="inbox-mark-read"><%= button_to t('.read_button'), mark_message_path(message_summary, :mark => 'read'), { :remote => true } %></td>
- <td class="inbox-destroy"><%= button_to t('.destroy_button'), destroy_message_path(message_summary, :referer => request.fullpath), { :remote => true } %></td>
+ <td class="inbox-mark-unread"><%= button_to t('.unread_button'), message_mark_path(message_summary, :mark => 'unread'), { :remote => true } %></td>
+ <td class="inbox-mark-read"><%= button_to t('.read_button'), message_mark_path(message_summary, :mark => 'read'), { :remote => true } %></td>
+ <td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(message_summary, :referer => request.fullpath), { :method => :delete, :remote => true } %></td>
</tr>
<td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
<td class="inbox-subject"><%= link_to h(sent_message_summary.title), message_path(sent_message_summary) %></td>
<td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
- <td class="inbox-destroy"><%= button_to t('.destroy_button'), destroy_message_path(sent_message_summary, :referer => request.fullpath), { :remote => true } %></td>
+ <td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(sent_message_summary, :referer => request.fullpath), { :method => :delete, :remote => true } %></td>
</tr>
<div class="richtext"><%= @message.body.to_html %></div>
<div class='message-buttons buttons'>
- <%= button_to t('.reply_button'), reply_message_path(@message), :class => 'reply-button' %>
- <%= button_to t('.unread_button'), mark_message_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %>
- <%= button_to t('.destroy_button'), destroy_message_path(@message), :class => 'destroy-button' %>
+ <%= button_to t('.reply_button'), message_reply_path(@message), :class => 'reply-button' %>
+ <%= button_to t('.unread_button'), message_mark_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %>
+ <%= button_to t('.destroy_button'), message_path(@message), :method => 'delete', :class => 'destroy-button' %>
<% else %>
</p>
<ul class='secondary-actions clearfix deemphasize'>
- <li><%= link_to t('user.show.send message'), new_message_path(contact) %></li>
+ <li><%= link_to t('users.show.send message'), new_message_path(contact) %></li>
<li>
<% if current_user.is_friends_with?(contact) %>
- <%= link_to t('user.show.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
+ <%= link_to t('users.show.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% else %>
- <%= link_to t('user.show.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
+ <%= link_to t('users.show.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% end %>
</li>
</ul>
<td>
<p>
<% if user.creation_ip %>
- <%= raw t 'user.index.summary',
+ <%= raw t 'users.index.summary',
:name => link_to(h(user.display_name), user_path(user)),
:ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
:date => l(user.creation_time, :format => :friendly)
%>
<% else %>
- <%= raw t 'user.index.summary_no_ip',
+ <%= raw t 'users.index.summary_no_ip',
:name => link_to(h(user.display_name), user_path(user)),
:date => l(user.creation_time, :format => :friendly)
%>
<h1><%= t '.my settings' %></h1>
<ul class='secondary-actions clearfix'>
<li><%= link_to t('.return to profile'), user_path(current_user) %></li>
- <li><%= link_to t('user.show.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+ <li><%= link_to t('users.show.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
</ul>
<% end %>
<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %>
<fieldset>
<div class="form-row">
- <label class="standard-label"><%= t 'user.new.display name' %></label>
+ <label class="standard-label"><%= t 'users.new.display name' %></label>
<%= f.text_field :display_name %>
</div>
</fieldset>
<fieldset>
<div class="form-row">
- <label class="standard-label"><%= t 'user.new.password' %></label>
+ <label class="standard-label"><%= t 'users.new.password' %></label>
<%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
</div>
<div class="form-row">
- <label class="standard-label"><%= t 'user.new.confirm password' %></label>
+ <label class="standard-label"><%= t 'users.new.confirm password' %></label>
<%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
</div>
</fieldset>
<% end %>
<% else %>
<%= t '.contributor terms.not yet agreed' %>
- <%= link_to t('.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
+ <%= link_to t('.contributor terms.review link text'), :controller => 'users', :action => 'terms' %>
<% end %>
</span>
</div>
<%= password_field_tag "password", "", :tabindex => 2 %>
</div>
<span class="form-help deemphasize">
- <%= link_to t('.lost password link'), :controller => 'user', :action => 'lost_password' %>
+ <%= link_to t('.lost password link'), :controller => 'users', :action => 'lost_password' %>
</span>
</fieldset>
<div id='login_openid_url' class='form-row'>
<label for='openid_url' class="standard-label"><%= raw t '.openid', :logo => openid_logo %></label>
<%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %>
- <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
+ <span class="minorNote">(<a href="<%= t 'users.account.openid.link' %>" target="_new"><%= t 'users.account.openid.link text' %></a>)</span>
</div>
<div class='form-row'>
<%= link_to t('.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => current_user.display_name %>
</li>
<li>
- <%= link_to t('.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
+ <%= link_to t('.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
</li>
<% if current_user.blocks.exists? %>
<% if current_user and @user.id == current_user.id %>
<% if @user.home_lat.nil? or @user.home_lon.nil? %>
<div id="map" class="content_map">
- <p id="no_home_location"><%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %></p>
+ <p id="no_home_location"><%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'users', :action => 'account', :display_name => current_user.display_name)) %></p>
</div>
<% else %>
<% content_for :head do %>
allow_write_api: wysig die kaart.
not_found:
sorry: Jammer, die %{type} blyk onverkrygbaar te wees.
- user:
+ users:
login:
title: Meld aan
heading: Meld aan
flash: Përditësuar më të dhënat e klientit me sukses
destroy:
flash: Shkatërruar kërkesë e klientit regjistrimit
- user:
+ users:
login:
title: Kyçu
heading: Kycu
intro_text: إن OpenStreetMap هي خريطة العالم, أنشئت بواسطة أشخاص مثلك وحرة الاستخدام
برخصة مفتوحة.
intro_2_create_account: أنشئ حساب مستخدم
- partners_html: الضيافة مدعومة من %{ucl}, %{ic} و %{bytemark}, و %{partners} آخرون.
+ hosting_partners_html: يتم دعم الاستضافة بواسطة %{ucl} و%{bytemark} و%{partners}
+ آخرين.
partners_ucl: UCL
- partners_ic: كلية امبراطورية لندن
partners_bytemark: استضافة Bytemark
partners_partners: الشركاء
osm_offline: حاليًا قاعدة بيانات خريطة الشارع المفتوحة مغلقة بينما يتم الانتهاء
flash: تم تحديث معلومات العميل بنجاح
destroy:
flash: دمّر تسجيل التطبيق
- user:
+ users:
login:
title: تسجيل الدخول
heading: تسجيل الدخول
pass_crypt: كلمه المرور
browse:
changeset:
- title: حزمه التغييرات
+ title: 'حزمه التغييرات: %{id}'
changesetxml: حزمه التغييرات إكس إم إل
osmchangexml: osmChange XML
feed:
load_data: تحميل البيانات
loading: تحميل...
tag_details:
- tags: 'الوسوم:'
+ tags: الوسوم
changeset:
changeset_paging_nav:
- showing_page: إظÙ\87ار اÙ\84صÙ\81ØÙ\87 %{page}
+ showing_page: الصفحه %{page}
next: التالى »
previous: «السابق
changeset:
layouts:
logo:
alt_text: شعار خريطه الشارع المفتوحة
- home: اÙ\84صÙ\81ØÙ\87 اÙ\84رئÙ\8aسÙ\8aØ©
+ home: رÙ\88Ø Ù\84Ù\84صÙ\81ØÙ\87 اÙ\84رئÙ\8aسÙ\8aÙ\87
logout: اخرج
log_in: دخول
log_in_tooltip: سجّل الدخول مع حساب موجود
- sign_up: Ø£Ù\86شئ ØسابÙ\8bا
+ sign_up: اعÙ\85Ù\84 Øساب
sign_up_tooltip: أنشئ حسابًا كى تستطيع المساهمة
edit: عدّل هذه الخريطة
history: تاريخ
export: صدِّر
gps_traces: آثار جى بى أس
- gps_traces_tooltip: عاÙ\84ج اÙ\84آثار
+ gps_traces_tooltip: اتØÙ\83Ù\85 Ù\81Ù\89 اثار GPS
user_diaries: يوميات المستخدمين
user_diaries_tooltip: اعرض يوميات المستخدمين
tag_line: ويكى خريطه العالم الحرة
loaded_successfully: تم تحميل بنجاح %{trace_points} نقطه من أصل %{possible_points}
نقطه ممكنه.
signup_confirm:
- subject: '[خريطه الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني'
+ subject: '[خريطه الشارع المفتوحه] اهلا بيك فى اوبن ستريت ماب'
email_confirm:
subject: '[خريطه الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني'
email_confirm_plain:
flash: تم تحديث معلومات العميل بنجاح
destroy:
flash: دمّر تسجيل التطبيق
- user:
+ users:
login:
title: ولوج
heading: ولوج
flash changed: كلمه المرور الخاصه بك قد تغيرت.
flash token bad: لم تجد تلك المعلومات، تحقق من الرابط ربما؟
new:
- title: Ø£Ù\86شئ حساب
+ title: اعÙ\85Ù\84 حساب
no_auto_account_create: للأسف نحن غير قادرين فى الوقت الحالى على إنشاء حساب
لك تلقائيًا.
contact_webmaster: يرجى الاتصال <a href="mailto:webmaster@openstreetmap.org">بمسؤول
public editing:
heading: 'تعديل عام:'
enabled: مفعّل. غير مجهول ويمكنك تعديل البيانات.
- enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+ enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
enabled link text: ما هذا؟
disabled: مُعطل ولا يمكن تعديل البيانات، جميع التعديلات السابقه مجهوله الهويه.
disabled link text: لماذا لا أستطيع التعديل؟
بريدك الإلكترونى لمذكره تأكيد العنوان الإلكترونى الجديد.
flash update success: تم تحديث معلومات المستخدم بنجاح.
confirm:
- heading: Ø£Ù\83Ù\91د Øساب اÙ\84Ù\85ستخدÙ\85
+ heading: راجع اÙ\8aÙ\85Ù\8aÙ\84Ù\83!
press confirm button: اضغط على زر التأكيد أدناه لتنشيط حسابك.
button: أكّد
success: تم تأكيد حسابك، شكرًا للاشتراك!
press confirm button: اضغط على زر تأكيد أدناه لتأكيد عنوان بريدك الإلكترونى
الجديد.
button: أكّد
- success: تÙ\85 تأÙ\83Ù\8aد عÙ\86Ù\88اÙ\86 برÙ\8aدÙ\83 اÙ\84Ø¥Ù\84Ù\83ترÙ\88Ù\86Ù\89Ø\8c Ø´Ù\83رÙ\8bا Ù\84Ù\84اشتراÙ\83!
+ success: تÙ\85 تأÙ\83Ù\8aد تغÙ\8aÙ\8aر عÙ\86Ù\88اÙ\86 برÙ\8aدÙ\83 اÙ\84Ø¥Ù\84Ù\83ترÙ\88Ù\86Ù\89!
failure: عنوان بريد إلكترونى تم تفعيله مسبقًا بهذه البيانات.
set_home:
flash success: موقع المنزل حُفظ بنجاح
go_public:
flash success: جميع تعديلاتك الآن عامه، ومسموح لك بالتعديل الآن.
make_friend:
- success: '%{name} الآن صديقك.'
+ success: '%{name} الآن صديقك!'
failed: عفوًا، تعذر إضافه %{name} كصديق.
already_a_friend: حاليًا أنت و %{name} أصدقاء.
remove_friend:
intro_text: OpenStreetMap ye un mapa del mundu, creáu por persones como tu y d'usu
llibre baxo una llicencia abierta.
intro_2_create_account: Crear una cuenta d'usuariu
- partners_html: L'agospiamientu tien l'encontu de %{ucl}, %{bytemark}, %{ic}, y
- otros %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College de Londres
partners_bytemark: Bytemark Hosting
partners_partners: asociaos
osm_offline: La base de datos d'OpenStreetMap anguaño ta desconectada mentanto
flash: S'anovó la información del cliente correutamente
destroy:
flash: Se destruyó'l rexistru de l'aplicación cliente
- user:
+ users:
login:
title: Entrar
heading: Entrar
edit_with: '%{editor} köməyi ilə dəyişdir'
tag_line: Azad Viki Dünya Xəritəsi
intro_2_create_account: İstifadəçi hesabı yarat
- partners_ic: London İmperial Kolleci tərəfindən
partners_bytemark: Bytemark Hosting
partners_partners: partnyorlar
help: Kömək
revoke: Ləğv et!
form:
name: Ad
- user:
+ users:
login:
title: Daxil olun
heading: Daxil olun
edit_with: Рэдагаваць праз %{editor}
tag_line: Вольная Wiki-мапа сьвету
intro_2_create_account: Стварыце рахунак
- partners_html: Гостынг падтрымліваецца %{ucl}, %{bytemark}, %{ic} і іншымі %{partners}.
partners_ucl: UCL
- partners_ic: Лёнданскім імпэрскім каледжам
osm_offline: База зьвестак OpenStreetMap у цяперашні момант недаступная, таму
што праводзяцца неабходныя тэхнічныя работы.
osm_read_only: База зьвестак OpenStreetMap у цяперашні момант даступная толькі
flash: Кліенцкая інфармацыя была абноўленая пасьпяхова
destroy:
flash: Зьнішчаная рэгістрацыя кліенцкага дастасаваньня
- user:
+ users:
login:
title: Увайсьці
heading: Уваход
intro_text: OpenStreetMap - гэта карта свету, створаная людзьмі, як вы, і бясплатная
для выкарыстання на ўмовах адкрытай ліцэнзіі.
intro_2_create_account: Стварыць рахунак удзельніка
- partners_html: Хостынг падтрымліваецца %{ucl}, %{ic} і %{bytemark}, і іншымі %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: партнёрамi
osm_offline: База дадзеных OpenStreetMap зараз па-за сецівам, таму што праходзіць
flash: Кліенцкая інфармацыя была абноўленая паспяхова
destroy:
flash: Знішчаная рэгістрацыя кліенцкага дастасавання
- user:
+ users:
login:
title: Уваход
heading: Уваход
form:
name: Име
allow_write_api: промяна на картата.
- user:
+ users:
login:
title: Вписване
heading: Вписване
intro_text: ওপেনস্ট্রীটম্যাপ বিশ্বের, একটি মানচিত্র; যা আপনার মতো মানুষের দ্বারা
নির্মিত এবং এটি মুক্ত লাইসেন্সের অধীনে বিনামূল্যে ব্যবহারযোগ্য।
intro_2_create_account: একটি ব্যবহারকারী অ্যাকাউন্ট তৈরি করুন
- partners_html: হোস্টিং %{ucl}, %{bytemark}, %{ic}, এবং অন্যান্য %{partners} কর্তৃক
- সমর্থিত।
partners_ucl: UCL
- partners_ic: ইম্পেরিয়াল মহাবিদ্যালয় লন্ডন
partners_partners: সহযোগীগণ
help: সাহায্য
about: পরিচিতি
issued_at: অনুমোদনের তারিখ
form:
name: নাম
- user:
+ users:
login:
title: প্রবেশ
heading: প্রবেশ
pennadoù deizlevr-mañ
post: Postañ
when: Peur
- comment: Addipleg
+ comment: Addispleg
ago: '%{ago} zo'
newer_comments: Evezhiadennoù nevesoo'h
older_comments: Evezhiadennoù koshañ
water_park: Kreizenn dour
"yes": Diduamantoù
man_made:
+ adit: Toullenn moned d'ar mengleuz
beacon: Tour-tan
beehive: Ruskenn
breakwater: Diwagenner
accountant: Kontour
administrative: Melestradur
architect: Ti-savour
- association: kevredigezh
+ association: Kevredigezh
company: Embregerezh
educational_institution: Ensavadur desavadurel
employment_agency: Ajañs evit al labour
results:
no_results: N'eus bet kavet respont ebet
more_results: Muioc'h a zisoc'hoù
+ issues:
+ index:
+ title: Kudennoù
+ select_status: Diuzañ ur statud
+ select_last_updated_by: Diuzañ an hizivadenn diwezhañ gant
+ not_updated: Nann hizvivaet
+ search: Klask
+ search_guidance: 'Kudennoù enklask :'
+ user_not_found: N'eus ket eus an implijer
+ status: Statud
+ reports: Danevelloù
+ last_updated: Hizivaet da ziwezhañ
+ last_updated_time_html: <abbr title='%{title}'>%{time} zo</abbr>
+ last_updated_time_user_html: <abbr title='%{title}'>%{time} zo</abbr> by %{user}
+ link_to_reports: Gwelet an danevelloù
+ reports_count:
+ one: 1 Danevell
+ other: '%{count} Danevelloù'
+ states:
+ ignored: Lezet a-gostez
+ open: Digor
+ resolved: Diskoulmet
+ update:
+ new_report: Enrollet mat eo bet ho tanevell
+ successful_update: Hizivaet mat eo bet ho tanevell
+ show:
+ title: '%{status} Kudenn #%{issue_id}'
+ reports:
+ zero: Danevell ebet
+ one: 1 rapport
+ other: '%{count} danevelloù'
+ resolve: Diskoulmañ
+ ignore: Lezel a-gostez
+ reopen: Addigeriñ
+ read_reports: Lenn an danevelloù
+ new_reports: Danevelloù nevez
+ other_issues_against_this_user: Kudennoù all a sell ouzh an implijer-mañ
+ no_other_issues: Kudenn all ebet gant an implijer-mañ.
+ comments_on_this_issue: Displegadennoù war ar gudenn-mañ
+ comments:
+ created_at: D'an %{datetime}
+ reports:
+ updated_at: D'an %{datetime}
+ helper:
+ reportable_title:
+ note: 'Notenn #%{note_id}'
+ issue_comments:
+ create:
+ comment_created: Krouet mat eo bet hoc'h evezhiadenn.
layouts:
logo:
alt_text: Logo OpenStreetMap
intro_text: Ur gartenn eus ar bed eo OprenStreetMap, krouet gant tud eveldoc'h
ha frank hec'h implij dindan un aotre-implij digor.
intro_2_create_account: Krouiñ ur gont implijer
- partners_html: '%{ucl}, %{ic}, %{bytemark}, ha %{partners} all a ra war-dro an
- herberc''hiañ.'
partners_ucl: ↓"Universiy College" Londrez
- partners_ic: Skolaj impalaerel Londrez
partners_bytemark: ↓Herberc'hiañ Bytemark
partners_partners: Kevelourien
osm_offline: Ezlinenn eo diaz roadennoù OpenStreetMap evit bremañ e-pad ma pleder
flash: Hizivaet eo bet titouroù an arval
destroy:
flash: Distrujet eo bet marilhadur an arload arval
- user:
+ users:
login:
title: Kevreañ
heading: Kevreañ
intro_text: OpenStreetMap predstavlja mapu svijeta, kreiranu od strane ljudi kao
što ste vi i može se besplatno koristiti.
intro_2_create_account: Napravite korisnički račun
- partners_html: Hosting je podržan od strane %{ucl}, %{ic} i %{bytemark}, i drugih
- %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnera
osm_offline: OpenStreetMap baza podataka je trenutno nedostupna dok se ne završe
flash: Informacije o klijentu uspješno osvježene
destroy:
flash: Uništena registracija klijent aplikacije
- user:
+ users:
login:
title: Prijava
heading: Prijava
intro_text: L'OpenStreetMap és un mapa del món, creat per persones com tu i d'ús
lliure sota una llicència oberta.
intro_2_create_account: Crea un compte d'usuari
- partners_html: L'allotjament és a càrrec de %{ucl}, %{ic}, %{bytemark} i d'altres
- %{partners}.
partners_ucl: el Centre UCL VR
- partners_ic: Imperial College Londres
partners_bytemark: Allotjament Bytemark
partners_partners: socis
osm_offline: La base de dades OpenStreetMap és fora de línia, mentre es fan actuacions
flash: La informació de client ha actualitzat correctament
destroy:
flash: S'ha destruït el registre de l'aplicació client
- user:
+ users:
login:
title: Accés
heading: Accés
application: ТӀетохаран цӀе
form:
required: Оьшу
- user:
+ users:
new:
continue: Кхин дӀа
show:
intro_text: OpenStreetMap je mapa světa, vytvořená lidmi jako vy a volně využitelná
pod otevřenou licencí.
intro_2_create_account: Vytvořit uživatelský účet
- partners_html: Hosting podporují %{ucl}, %{bytemark}, %{ic} a další %{partners}.
+ hosting_partners_html: Hosting podporují %{ucl}, %{bytemark}, a další %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partneři
osm_offline: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné
flash: Klientské informace úspěšně aktualizovány
destroy:
flash: Registrace klientské aplikace zrušena
- user:
+ users:
login:
title: Přihlásit se
heading: Přihlášení
intro_text: Mae OpenStreetMap yn fap o'r byd, wedi'i greu gan bobl fel chi ac
sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd.
intro_2_create_account: Creu cyfrif defnyddiwr
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: Partneriaid
osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith
allow_read_gpx: ddarllen eu dargopiadau GPS preifat.
allow_write_gpx: uwchlwytho dargopiadau GPS.
allow_write_notes: addasu nodiadau.
- user:
+ users:
login:
title: Mewngofnodi
heading: Mewngofnodi
reopen: Genåbn
read_reports: Læs rapporter
new_reports: Nye rapporter
+ comments:
+ created_at: Den %{datetime}
+ reports:
+ updated_at: Den %{datetime}
reports:
new:
missing_params: Kan ikke oprette en ny rapport
edit: Redigér
history: Historik
export: Eksportér
+ issues: Problemer
data: Data
export_data: Eksporter data
gps_traces: GPS-spor
intro_text: OpenStreetMap er et kort over verden, skabt af folk som dig og gratis
at bruge under en åben licens.
intro_2_create_account: Opret en brugerkonto
- partners_html: Driften støttes af %{ucl}, %{ic}, %{bytemark} og andre %{partners}.
partners_ucl: University College London
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnere
osm_offline: OpenStreetMap-databasen er for øjeblikket offline på grund af nødvendig
flash: Opdateret klientoplysninger
destroy:
flash: Annulerede klient programmets registrering
- user:
+ users:
login:
title: Log på
heading: Log på
intro_text: OpenStreetMap ist eine Karte der Welt, erstellt von Menschen wie dir
und frei verwendbar unter einer offenen Lizenz.
intro_2_create_account: Erstelle ein Benutzerkonto
- partners_html: Das Hosting wird von %{ucl}, %{bytemark}, %{ic} und weiteren %{partners}
+ hosting_partners_html: Das Hosting wird von %{ucl}, %{bytemark} und anderen %{partners}
unterstützt.
partners_ucl: UCL
- partners_ic: dem Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: Partnern
osm_offline: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten
flash: Client-Informationen erfolgreich aktualisiert
destroy:
flash: Die registrierte Client-Anwendung wurde entfernt
- user:
+ users:
login:
title: Anmelden
heading: Anmelden
terms declined: Wir bedauern es, dass du dich dazu entschieden hast, den neuen
Bedingungen für Mitwirkende nicht zuzustimmen. Weitere Informationen findest
du auf <a href="%{url}">dieser Wikiseite</a>.
+ terms declined url: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined
terms:
title: Bedingungen für Mitwirkende
heading: Bedingungen für Mitwirkende
consider_pd: Zusätzlich zu den oben genannten Bedingungen betrachte ich meine
Beiträge als gemeinfrei (Public Domain)
consider_pd_why: Was bedeutet dies?
+ consider_pd_why_url: https://www.osmfoundation.org/wiki/DE:License/Why_would_I_want_my_contributions_to_be_public_domain
guidance: 'Informationen die dabei helfen, diese Bedingungen zu verstehen: eine
<a href="%{summary}">verständliche Zusammenfassung</a> sowie einige <a href="%{translations}">inoffizielle
Übersetzungen</a>'
form:
name: Name
required: Mecburiyo
- user:
+ users:
login:
title: Cıkewtış
heading: Cıkewtış
intro_text: OpenStreetMap jó kórta swěta, napórana wót luźi ako ty a dajo se licho
pód wótwórjoneju licencu wužywaś.
intro_2_create_account: Załož wužywarske konto
- partners_html: Hostowanje pódpěra se wót %{ucl}, %{ic}, %{bytemark} a drugich
- %{partners}.
partners_ucl: z UCL VR Centre
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnerow
osm_offline: Datowa banka OpenStreetMap jo tuchylu offline, dokulaž se wažne źěło
flash: Informacije wó klienśe wuspěšnje zaktualizěrowane
destroy:
flash: Registrěrowanje aplikacije znicone
- user:
+ users:
login:
title: Pśizjawjenje
heading: Pśizjawjenje
intro_text: Το OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους
σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης.
intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη
- partners_html: Η λειτουργία υποστηρίζεται από το %{ucl}, %{bytemark}, %{ic}, και
- άλλους %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College του Λονδίνου
partners_bytemark: Bytemark Hosting
partners_partners: συνεργάτες
osm_offline: Η βάση δεδομένων του OpenStreetMap είναι προσωρινά εκτός λειτουργίας
flash: Οι πληροφορίες του πελάτη ενημερώθηκαν με επιτυχία
destroy:
flash: Η εισαγωγή του προγράμματος του πελάτη χάλασε
- user:
+ users:
login:
title: Σύνδεση
heading: Σύνδεση
intro_text: OpenStreetMap is a map of the world, created by people like you and
free to use under an open licence.
intro_2_create_account: Create a user account
- partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other
- %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partners
osm_offline: The OpenStreetMap database is currently offline while essential database
flash: Updated the client information successfully
destroy:
flash: Destroyed the client application registration
- user:
+ users:
login:
title: Login
heading: Login
flash: "Updated the client information successfully"
destroy:
flash: "Destroyed the client application registration"
- user:
+ users:
login:
title: "Login"
heading: "Login"
intro_text: OpenStreetMap estas mapo de la mondo, kreata de homoj kiel vi, kaj
libere uzebla laŭ malferma permesilo.
intro_2_create_account: Krei konton
- partners_html: Retgastigo estas liverata de %{ucl}, %{bytemark}, %{ic} kaj aliaj
+ hosting_partners_html: Retgastigo estas subtenata de %{ucl}, %{bytemark} kaj aliaj
%{partners}.
partners_ucl: University College London
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: kunlaborantoj
osm_offline: La OpenStreetMap-datumbazo estas nuntempe nealireabla pro necesaj
flash: Informoj pri kliento estas ĝisdatigitaj sukcese
destroy:
flash: La porklienta aplikaĵo forigita
- user:
+ users:
login:
title: Ensaluti
heading: Ensaluti
intro_text: OpenStreetMap es un mapa del mundo, creado por gente como tú y de
uso libre bajo una licencia abierta.
intro_2_create_account: Crear una cuenta de usuario
- partners_html: El alojamiento de los servidores está respaldado por %{ucl}, %{ic}
- y %{bytemark}, y otros %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College de Londres
partners_bytemark: Bytemark Hosting
partners_partners: socios
osm_offline: La base de datos de OpenStreetMap no está disponible en estos momentos
flash: Actualizada la información del cliente exitosamente
destroy:
flash: Destruido el registro de aplicación del cliente
- user:
+ users:
login:
title: Iniciar sesión
heading: Iniciar sesión
intro_text: OpenStreetMap on maailma kaart, mille on loonud inimesed nagu sina
ja seda võib vabalt kasutada avatud litsentsi tingimustel.
intro_2_create_account: loo oma konto
- partners_html: Majutust toetavad %{ucl}, %{ic} ja %{bytemark} ning teised %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnerid
osm_offline: OpenStreetMapi andmebaas ei ole hetkel juurdepääsetav sest teostatakse
flash: Kliendi informatsioon uuendati edukalt
destroy:
flash: Klientrakenduse registratsioon hävitati
- user:
+ users:
login:
title: Sisselogimise leht
heading: Logi sisse
intro_text: OpenStreetMap munduko mapa da, zu bezalako jendeak sortutakoa eta
doako lizentzia irekiarekin erabiltzeko dagoena.
intro_2_create_account: Erabiltzaile kontua sortu
- partners_html: '%{ucl}, %{bytemark}, %{ic}, eta beste %{partners}-k babestua.'
partners_ucl: UCLa
- partners_ic: Londreseko Imperial College
partners_bytemark: Bytemark Ostatua
partners_partners: bazkideak
osm_offline: OpenStreetMap datu-basea orain konexiorik gabe dago funtsezko datu-basearen
flash: Bezero informazioa arrakastaz eguneratu da
destroy:
flash: Bezeroaren eskaera erregistroa suntsitua
- user:
+ users:
login:
title: Saio-hasiera
heading: Saio-hasiera
other: '%{count} گزارش'
reports_of_this_issue: گزارشهای این مشکل
new_reports: گزارشهای تازه
+ comments:
+ created_at: در %{datetime}
reports:
+ updated_at: در %{datetime}
reported_by_html: '%{user} آن را بهعنوان %{category} گزارش کرد'
helper:
reportable_title:
new:
title_html: گزارش %{link}
missing_params: ایجاد گزارش جدید ممکن نیست
+ details: لطفاً جزئیات بیشتری از مشکل ارائه دهید (ضروری است).
select: 'دلیل گزارش شما:'
+ disclaimer:
+ intro: 'پیش از اینکه گزارش خود را برای مدیران سایت ارسال کنید، مطمئن شوید
+ که:'
+ not_just_mistake: قطعاً این مسئله سهوی نبوده
+ unable_to_fix: بهتنهایی یا با کمک نقشهکشهای همکارتان نمیتوانید مشکل را
+ حل کنید
+ resolve_with_user: قبلاً تلاش کردهاید مشکل را با کاربر مربوطه برطرف کنید
categories:
diary_entry:
spam_label: این روزنوشت هرزنامه است/دارد
threat_label: این روزنوشت تهدیدآمیز است
+ other_label: سایر
diary_comment:
spam_label: این نظر (بر روزنوشت) هرزنامه است/دارد
threat_label: این نظر (بر روزنوشت) تهدیدآمیز است
+ other_label: سایر
+ user:
+ other_label: سایر
note:
spam_label: این یادداشت هرزنامه است
+ personal_label: این یادداشت حاوی دادههای شخصی است
abusive_label: این یادداشت زشت است
+ other_label: سایر
create:
successful_report: گزارشتان با موفقیت ثبت شد
+ provide_details: لطفاً جزئیات لازم را ارائه دهید
layouts:
logo:
alt_text: لوگوی OpenStreetMap
intro_text: OpenStreetMap یک نقشه از جهان است، که توسط افرادی مثل شما ایجاد شده
و تحت یک مجوز آزاد برای استفاده رایگان همگان است.
intro_2_create_account: ایجاد حساب کاربری
- partners_html: میزبانی وب توسط %{ucl}, %{bytemark}, %{ic} و سایر %{partners} پشتیبانی
- میشود.
partners_ucl: UCL
- partners_ic: کالج سلطنتی لندن
partners_bytemark: میزبانی Bytemark
partners_partners: شرکای تجاری
osm_offline: دیتابیس OpenStreetMap در حال حاضر آفلاین است در حالی که کار تعمیر
ارتباط برقرار نمی کنید؟
people_mapping_nearby: افراد نقشه کش نزدیک
message_summary:
- unread_button: علامتگذاری به عنوان خواندهشده
- read_button: علامتگذاری به عنوان خواندهشده
+ unread_button: نشان بزن نخواندم
+ read_button: نشان بزن که خواندم
reply_button: پاسخ
destroy_button: حذف
new:
subject: عنوان
date: تاریخ
reply_button: پاسخ
- unread_button: علامتگذاری به عنوان خواندهشده
+ unread_button: نشان بزن نخواندم
destroy_button: حذف
back: برگشت
to: به
partners_title: شرکای تجاری
copyright:
foreign:
- title: درباره این ترجمهها
- text: در زÙ\85اÙ\86 بÙ\87 Ù\88جÙ\88د Ø¢Ù\85دÙ\86 تداخÙ\84 بÛ\8cÙ\86 برگرداÙ\86 Ù\81ارسÛ\8c Ù\88 %{english_original_link}Ø\8c
- نوشتهٔ انگلیسی برتری دارد
+ title: دربارهٔ این ترجمه
+ text: اگر بÛ\8cÙ\86 برگرداÙ\86 Ù\81ارسÛ\8c Ù\88 %{english_original_link} Ù\86اسازگارÛ\8c باشدØ\8c صÙ\81ØÙ\87Ù\94
+ انگلیسی برتری دارد
english_link: اصل انگلیسی
native:
title: درباره این صفحه
OpenStreetMap <i> داده باز است</i>، تحت مجوز <a
href="http://opendatacommons.org/licenses/odbl/">Open Data
Commons Open Database License</a> (ODbL).
- intro_2_html: Ø´Ù\85ا براÛ\8c Ú©Ù¾Û\8c بردارÛ\8cØ\8c تÙ\88زÛ\8cعØ\8c اÙ\86تÙ\82اÙ\84 Ù\88 اÙ\86طباÙ\82 دادÙ\87 Ù\87اÛ\8c Ù\85ا آزاد
- هستید، تا زمانی که معتبران و همکاران OpenStreetMap باشید. اگر شما تغییر
- دهید یا بسازید داده های ما را، شما باید نتایج را فقط تحت همین مجوز توزیع
- کنید. اطلاعات کامل <a href="http://opendatacommons.org/licenses/odbl/1.0/">کد
- قانونی</a> حقوق و وظایف شما را توضیح میدهد.
+ intro_2_html: تا زÙ\85اÙ\86Û\8c Ú©Ù\87 از OpenStreetMap Ù\88 Ù\85شارکتâ\80\8cÚ©Ù\86Ù\86دگاÙ\86 Ø¢Ù\86 Û\8cاد Ú©Ù\86Û\8cدØ\8c براÛ\8c
+ کپیبرداری، توزیع، انتقال و اقتباس (از) دادههای ما آزاد هستید. اگر دادههای
+ ما را تغییر دهید یا بر پایهٔ آنها تولید کنید، باید نتایج را فقط تحت همان
+ مجوز توزیع کنید. نسخهٔ کامل <a href="http://opendatacommons.org/licenses/odbl/1.0/">بایدونبایدهای
+ قانونی</a> حقوق و وظایف شما را توضیح میدهد.
intro_3_html: |-
- نقشه کشی در کاشی های نقشه ی ما، و مدارک ما، تحت مجوز <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a>هستند ، مجوز (CC BY-SA).
- credit_title_html: چگونه از OpenStreetMap اعتبار بگیریم
- credit_1_html: ما نیاز داریم که شما استفاده کنید از اعتبار “© همکاران
- OpenStreetMap”.
- credit_2_html: همچنین مطمئن باشید که پاک کردن داده ها تحت یک مجوز دیتابیس
- باز است، و اگر از کاشیهای نقشهٔ ما استفاده میکنید، نقشهبرداری تحت مجوز
- CC BY-SA است. میتوانید با پیونددادن به <a href="http://www.openstreetmap.org/copyright">این
- صفحه حق نشر</a> متناوبا آن را انجام دهید، و به عنوان یک درخواست اگر شما
- توزیع کنندهٔ نوع دادههای OSM هستید، میتوانید نام و پیوند را بطور مستقیم
- به مجوز بدهید. در رسانهها جاهایی که پیوندها مقدور نیستند(مثل کارهای چاپی)،
- پیشنهاد میکنیم خوانندگانتان را به openstreetmap.org راهنمایی کنید(شاید
- با گسترش 'OpenStreetMap' به این نشانی کامل)، به opendatacommons.org، و اگر
- مناسب باشد، به creativecommons.org.
+ نقشهنگاریهای ارائهشده در کاشیهای نقشهٔ ما و در مستنداتمان، همگی تحت پروانهٔ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Attribution-ShareAlike 2.0</a>هستند (CC BY-SA).
+ credit_title_html: چگونه از OpenStreetMap یاد کنیم
+ credit_1_html: |-
+ بایسته است که اینگونه از ما یاد کنید:
+ “©مشارکتکنندگان OpenStreetMap”.
+ credit_2_html: همچنین باید روشن کنید که دادهها تحت پروانهٔ پایگاهدادهٔ باز
+ یا Open Database License قرار دارند و اگر کاشیهای نقشهٔ ما را استفاده کردید
+ بهروشنی بیان کنید که نقشهنگاریها تحت پروانهٔ CC BY-SA است. این کار را
+ با پیونددادن به <a href="https://www.openstreetmap.org/copyright"> این صفحهٔ
+ حق نشر</a> انجام دهید. بهعنوان جایگزین، میتوانید با نام و پیوند مستقیماً
+ به مجوز(ها) ارجاع بدهید (اگر OSM را در قالب داده توزیع میکنید انجام این
+ کار ضروری است). در رسانههایی که درج پیوند ممکن نیست ( مثلاً کارهای چاپی)،
+ توصیه میکنیم که خوانندگان خود را به openstreetmap.org (شاید با گسترش OpenStreetMap
+ به این نشانی کامل)، به opendatacommons.org و در صورت تناسب به creativecommons.org
+ هدایت کنید.
credit_3_html: |-
- براÛ\8c Û\8cÚ© Ù\86Ù\82Ø´Ù\87 اÙ\84کترÙ\88Ù\86Û\8cÚ©Û\8c Ù\82ابÙ\84 Ù\85رÙ\88رØ\8c اعتبار باÛ\8cد در Ú¯Ù\88Ø´Ù\87 اÛ\8c از نقشه ظاهر شود.
+ در Û\8cÚ© Ù\86Ù\82Ø´Ù\87Ù\94 اÙ\84کترÙ\88Ù\86Û\8cÚ©Û\8c Ù\82ابÙ\84 Ù\85رÙ\88رØ\8c Û\8cادکرد باÛ\8cد در Ú¯Ù\88Ø´Ù\87Ù\94 نقشه ظاهر شود.
برای مثال:
attribution_example:
- alt: مثال برای چگونه OpenStreetMap را در صفحه ی وبی نسبت دهیم
+ alt: مثالی از شیوهٔ انتساب به OpenStreetMap در صفحهٔ وبی.
title: مثال انتساب
- more_title_html: پیدا کردن اطلاعات بیشتر
- more_1_html: |-
- درباره استفاده از داده های ما، و چگونه به ما اعتبار دهید بیشتر بخوانید، در <a
- href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
- FAQ</a>.
- more_2_html: اگرچه OpenStreetMap داده باز است، ما نمی توانیم API نقشه را به
- رایگان در اختیار توسعه دهندگان شخص ثالث قرار دهیم. <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API
- Usage Policy</a> ما را ببینید، <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile
- Usage Policy</a> و <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim
- Usage Policy</a>.
+ more_title_html: یافتن اطلاعات بیشتر
+ more_1_html: برای اطلاعات بیشتر دربارهٔ استفاده از دادههای ما و چگونگی یادکرد
+ ما <a href="https://osmfoundation.org/Licence">صفحهٔ مجوز بنیاد OSM</a>
+ را بخوانید.
+ more_2_html: اگرچه OpenStreetMap داده باز است، اما نمیتوانیم API نقشه را
+ بهرایگان در اختیار توسعهدهندگان شخص ثالث قرار دهیم. <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">سیاست
+ استفاده از API </a> ، <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">سیاست
+ استفاده از کاشیها</a> و <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">سیاست
+ استفاده از Nominatim</a> را ببینید.
contributors_title_html: همکاران ما
- contributors_intro_html: 'شرکای ما هزاران شخص هستند. ما همچنین جواز علنی داده
- از سازمان نقشه برداری ملی و دیگر منابع را شامل میشویم، در بین آنها:'
+ contributors_intro_html: 'مشارکتکنندگانی که با ما همکاری میکنند هزاران شخص
+ هستند. دادههایی با مجوز باز از سازمانهای نقشهبرداری ملی و دیگر منابع
+ را نیز در کنار آنها داریم، از جمله:'
contributors_at_html: |-
<strong>Austria</strong>: Contains data from
<a href="http://data.wien.gv.at/">Stadt Wien</a> (under
<strong>United Kingdom</strong>: Contains Ordnance
Survey data © Crown copyright and database right
2010-12.
- contributors_footer_1_html: برای اطلاعات بیشتر درباره این منابع و سایر منابع
- مورد استفاده برای پیشرفت اوپناستریتمپ، لطفاً این پیوند را نگاه کنید.
+ contributors_footer_1_html: |-
+ برای اطلاعات بیشتر درباره اینها و سایر منابعی که برای پیشرفت اوپناستریتمپ استفاده شدهاند، لطفاً <a
+ href="https://wiki.openstreetmap.org/wiki/Contributors">صفحهٔ مشارکتکنندگان</a> را در ویکی نگاه کنید.
contributors_footer_2_html: ورود دادهها در OpenStreetMap به این معنی نیست
که ارائهدهندهٔ اصلی دادهها توسط OpenStreetMap تأییدشده، هر گونه ضمانتی
فراهم میکند، یا هر گونه مسئولیت را میپذیرد.
- infringement_title_html: نقض کپی رایت
- infringement_1_html: شرکای OSM یادآوری میکنند هرگز داده ای را از منابع حق
- نشر اضافه نکنید(مثلا نقشه های گوگل یا نقشه های چاپ شده) بدون اجازه صریح
- از دارندگان حق تکثیر.
- infringement_2_html: اگر فکر میکنید که این حق نشر داده شده بهطور نامناسب
- به پایگاه دادههای OpenStreetMap یا این سایت اضافه شدهاست، لطفاً به <a
- href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">رویهٔ
- حذف</a> ما یا پرونده مستقیم در <a href="http://dmca.openstreetmap.org/">صفحهٔ
- بایگانی برخط</a> ما مراجعه کنید.
- trademarks_title_html: <span id="trademarks"></span>علائم ثبت شده تجاری
+ infringement_title_html: نقض کپیرایت
+ infringement_1_html: به مشارکتکنندگان OSM یادآوری می کنیم که هرگز دادهای
+ را از منابع دارای حق نشر اضافه نکنند (مثلاً نقشههای گوگل یا نقشههای چاپشده)،
+ مگر با اجازهٔ صریح و آشکار از صاحبان حق نشر.
+ infringement_2_html: اگر بر این باورید که دادههای مشمول حق نشر بهطور نامناسبی
+ به پایگاهدادهٔ OpenStreetMap یا به این وبسایت افزوده شده، لطفاً به <a
+ href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">روندنامهٔ
+ حذف</a> مراجعه کنید یا دادخواست خود را مستقیماً در <a href="http://dmca.openstreetmap.org/">صفحهٔ
+ دادخواهی برخط</a> تسلیم کنید.
+ trademarks_title_html: <span id="trademarks"></span>نشانهای تجاری
+ trademarks_1_html: OpenStreetMap، نشانوارهٔ ذرهبیندار و State of the Map
+ نشانهای تجاری ثبتشده و متعلق به بنیاد OpenStreetMap هستند. برای یافتن
+ پاسخ پرسشهای خود دربارهٔ استفاده از این نشانها، لطفاً <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">سسیاستنامهٔ
+ نشان تجاری</a> را ببینید.
index:
js_1: شما در حال استفاده از مرورگری هستید که جاوا اسکریپت را پشتیبانی نمی کند،
یا جاوا اسکریپت را غیر فعال کرده اید.
tags: 'برچسبها:'
tags_help: جداشده با کاما (,)
visibility: 'پدیداری:'
- visibility_help: این به چه معناست؟
+ visibility_help: این چیست؟
upload_button: بارگذاری
help: کمک
create:
tags_help: جداشده با کاما (,)
save_button: ذخیرهٔ تغییرات
visibility: 'پدیداری:'
- visibility_help: بÙ\87 Ú\86Ù\87 Ù\85عÙ\86Û\8c است؟
+ visibility_help: اÛ\8cÙ\86 Ú\86Û\8cست؟
update:
updated: رد بهروز شد
trace_optionals:
require_moderator:
not_a_moderator: برای انجام آن عمل نیاز هست مدیر باشید.
setup_user_auth:
+ blocked_zero_hour: در وبسایت OpenStreetMap یک پیام خیلی مهم برایتان ارسال شده.
+ برای اینکه بتوانید ویرایشهای خود را ذخیره کنید باید ابتدا آن را بخوانید.
blocked: دسترسی شما به API مسدود شده. برای یافتن اطلاعات بیشتر لطفاً به رابط
کاربری وب وارد شوید (log in).
need_to_see_terms: دسترسی شما به API بطور موقت معلق شدهاست. برای مشاهدهٔ شرایط
flash: بهروزرسانی اطلاعات کارخواه موفقیتآمیز بود
destroy:
flash: ثبتنام برنامه کارخواه از بین رفت
- user:
+ users:
login:
title: ورود
heading: ورود
gps: ردهای GPS عمومی
overlays: برای اشکالزدایی از نقشه رولایهها را فعال کنید
title: لایهها
- copyright: © <a href='%{copyright_url}'>شرکت کنندگانOpenStreetMap</a>
+ copyright: © <a href='%{copyright_url}'>مشارکتکنندگان OpenStreetMap</a>
donate_link_text: <a class='donate-attr' href='%{donate_url}'>کمک مالی</a>
site:
edit_tooltip: ویرایش نقشه
mapquest_car: اتومبیل (MapQuest)
mapquest_foot: پیاده (MapQuest)
osrm_car: اتومبیل (OSRM)
- directions: جÙ\87ت
+ directions: دستÙ\88راÙ\84عÙ\85Ù\84
distance: مسافت
errors:
- no_route: نتوانستیم بین آن دو مکان، مسیری بیابیم.
+ no_route: بین این دو مکان، مسیری پیدا نشد.
no_place: متاسفیم - محل پیدا نشد.
instructions:
continue_without_exit: به مسیر %{name} ادامه دهید
end_oneway_without_exit: انتهای مسیر یطرفه در %{name}
roundabout_with_exit: در میدان، خروجی %{exit} به طرف %{name} را انتخاب کنید
unnamed: بی نام
- courtesy: جÙ\87ت از %{link}
+ courtesy: دستÙ\88راÙ\84عÙ\85Ù\84â\80\8cÙ\87ا با Ù\87Ù\85کارÛ\8c %{link}
exit_counts:
first: اول
second: دوم
intro_text: OpenStreetMap on tavallisten ihmisten luoma maailmankartta. Palvelun
käyttäminen on ilmaista avoimen lisenssin ansiosta.
intro_2_create_account: luomalla ensin käyttäjätunnuksen
- partners_html: Palvelinta ylläpitävät %{ucl}, %{bytemark}, %{ic} sekä muut %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: kumppanimme
osm_offline: OpenStreetMapin tietokanta ei toistaiseksi ole käytettävissä välttämättömien
flash: Sovelluksen tiedot on päivitetty.
destroy:
flash: Sovelluksen käyttöoikeus on poistettu.
- user:
+ users:
login:
title: Kirjautumissivu
heading: Kirjaudu
# Author: Wladek92
# Author: Yodaspirine
# Author: Yvecai
+# Author: Zarisi
---
fr:
time:
intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous
et libre d’utilisation sous licence libre.
intro_2_create_account: Créez un compte d’utilisateur
- partners_html: L’hébergement est pris en charge par %{ucl}, %{bytemark}, %{ic}
+ hosting_partners_html: L’hébergement est pris en charge par %{ucl}, %{bytemark},
et d’autres %{partners}.
partners_ucl: L’University College de Londres
- partners_ic: le Collège impérial de Londres
partners_bytemark: l'hébergeur Bytemark
partners_partners: partenaires
osm_offline: La base de données OpenStreetMap est actuellement hors ligne ; une
flash: Informations du client enregistrées avec succès
destroy:
flash: Enregistrement de l’application cliente supprimé
- user:
+ users:
login:
title: Se connecter
heading: Connexion
intro_text: OpenStreetMap e je une mape dal mont, creade di int come te e di ûs
libar sot di une licence vierte.
intro_2_create_account: Cree il to profîl utent
- partners_html: L'hosting al è sostignût di %{ucl}, %{ic}, %{bytemark} e altris
- %{partners}.
partners_ucl: UCL VR Centre
- partners_ic: Imperial College di Londre
partners_bytemark: Bytemark Hosting
osm_offline: La base di dâts di OpenStreetMap e je par cumò fûr linie parcè che
o sin daûr a fâ lavôrs essenziâi di manutenzion de base di dâts.
allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs.
allow_write_api: modificâ la mape.
allow_write_notes: cambiâ lis notis.
- user:
+ users:
login:
title: Jentre
heading: Jentre
intro_text: Is léarscáil den domhan é OpenStreetMap, a chruthaigh daoine cosúil
leatsa agus atá saor in aisce le húsáid faoi cheadúnas oscailte.
intro_2_create_account: Cruthaigh cuntas úsáideora
- partners_html: Tugann %{ucl}, %{bytemark}, %{ic} agus %{partners} eile tacaíocht
- don óstáil.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: comhpháirtithe
osm_offline: Tá bunachar sonraí OpenStreetMap as líne faoi láthair fad agus atá
flash: Tugadh an fhaisnéis faoin gcliant cothrom le dáta
destroy:
flash: Scriosadh clárú an chliant-fheidhmchláir
- user:
+ users:
login:
title: Logáil isteach
heading: Logáil isteach
intro_text: '''S e mapa an t-saoghail a tha san OpenStreetMap a chaidh a chruthachadh
le daoine mar thu fhèin ''s a tha saor fo cheadachas fhosgailte.'
intro_2_create_account: Cruthaich cunntas cleachdaiche
- partners_html: Cuiridh an %{ucl}, an %{ic}, %{bytemark} agus %{partners} eile
- taic ris an òstadh.
partners_ucl: UCL VR Centre
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: com-pàirtichean eile
osm_offline: Tha an stòr-dàta aig OpenStreetMap far loidhńe an-dràsta on a tha
flash: Chaidh fiosrachadh a' chliant ùrachadh gu soirbheachail
destroy:
flash: Chaidh clàradh na h-aplacaid cliant a mhilleadh
- user:
+ users:
login:
title: Clàraich a-steach
heading: Clàraich a-steach
intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma vostede
e de libre uso baixo unha licenza aberta.
intro_2_create_account: Cree unha conta de usuario
- partners_html: O aloxamento é posible grazas ao %{ucl}, %{bytemark}, %{ic}, e
- outros %{partners}.
+ hosting_partners_html: O hosting é apoiado por %{ucl}, %{bytemark} e outros %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: socios
osm_offline: A base de datos do OpenStreetMap atópase desconectada mentres realizamos
flash: Actualizou correctamente a información do cliente
destroy:
flash: Destruíu o rexistro da aplicación de cliente
- user:
+ users:
login:
title: Rexistrarse
heading: Rexistro
intro_text: OpenStreetMap היא מפה של העולם, שנוצרת על־ידי אנשים כמוך, וחופשית
לשימוש תחת רישיון פתוח.
intro_2_create_account: נא ליצור חשבון משתמש
- partners_html: האירוח נתמך על־ידי %{ucl}, %{bytemark}, %{ic}, ו%{partners} אחרים
partners_ucl: UCL
- partners_ic: המכללה המלכותית של לונדון
partners_bytemark: Bytemark Hosting
partners_partners: שותפים
osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל עבודות תחזוקה
flash: מידע הלקוח עודכן בהצלחה
destroy:
flash: רישום יישום הלקוח נהרס
- user:
+ users:
login:
title: כניסה
heading: כניסה
flash: Informacije o klijentu uspješno ažurirane
destroy:
flash: Uništena registracija klijent aplikacije
- user:
+ users:
login:
title: Prijava
heading: 'Prijava:'
intro_text: OpenStreetMap je karta swěta, wutworjena wot ludźi kaž tebje a hodźi
so swobodnje pod wotewrjenej licencu wužiwać.
intro_2_create_account: Załož wužiwarske konto
- partners_html: Hostowanje so wot %{ucl}, %{ic}, %{bytemark} a druhich %{partners}
- podpěruje.
partners_ucl: z UCL VR Centre
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnerow
osm_offline: Datowa banka OpenStreetMap je tuchwilu offline, dokelž so wažne wobhladowankse
flash: Klientowe informacije wuspěšnje zaktualizowane
destroy:
flash: Registrowanje klientoweje aplikacije bu zničene
- user:
+ users:
login:
title: Přizjewjenje
heading: Přizjewjenje
intro_text: Az OpenStreetMap egy világtérkép, amelyet hozzád hasonló emberek készítenek
és szabad licenc alatt elérhető.
intro_2_create_account: Felhasználói fiók létrehozása
- partners_html: A szerver üzemeltetését az %{ucl}, a %{bytemark}, az %{ic} és további
- %{partners} támogatják.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnerek
osm_offline: Az OpenStreetMap-adatbázis jelenleg offline, miközben alapvető adatbázis-karbantartási
flash: A kliens információi sikeresen frissítve
destroy:
flash: A kliensalkalmazás regisztrációja törölve
- user:
+ users:
login:
title: Bejelentkezés
heading: Bejelentkezés
intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere
de usar sub un licentia aperte.
intro_2_create_account: Crea un conto de usator
- partners_html: Le allogiamento web es supportate per %{ucl}, %{bytemark}, %{ic}
- e altere %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partners
osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite
flash: Le information del cliente ha essite actualisate con successo
destroy:
flash: Le registration del application cliente ha essite destruite
- user:
+ users:
login:
title: Aperir session
heading: Aperir session
intro_text: OpenStreetMap adalah peta dunia, diciptakan oleh orang-orang seperti
Anda dan bebas untuk digunakan di bawah lisensi terbuka.
intro_2_create_account: Buat Akun
- partners_html: Hosting didukung oleh %{ucl}, %{ic} dan %{bytemark} dan %{partners}
- lainnya.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Hosting Bytemark
partners_partners: mitra
osm_offline: Database OpenStreetMap saat ini sedang dimatikan karena sedang dilakukan
flash: Informasi klien telah sukses diperbarui.
destroy:
flash: Registrasi aplikasi klien telah dibatalkan.
- user:
+ users:
login:
title: Login
heading: Login
intro_text: OpenStreetMap er heimskort búið til af fólki eins og þér. Það er gefið
út með opnu hugbúnaðarleyfi og það kostar ekkert að nota það.
intro_2_create_account: Búa til notandaaðgang
- partners_html: Vefhýsing er studd af %{ucl}, %{bytemark}, %{ic}, og öðrum %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: samstarfsaðilum
osm_offline: OpenStreetMap gagnagrunnurinn er niðri vegna viðhalds.
flash: Uppfærði upplýsingar biðlaraforritsins
destroy:
flash: Eyðilagði skráningu biðlaraforritsins
- user:
+ users:
login:
title: Innskrá
heading: Innskrá
intro_text: OpenStreetMap è una mappa del mondo, creata da persone come te e libera
da utilizzare secondo una licenza aperta.
intro_2_create_account: Crea un account utente
- partners_html: L'hosting è supportato da %{ucl}, %{bytemark}, %{ic} e da altri
- %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College (Londra)
partners_bytemark: Bytemark Hosting
partners_partners: partner
osm_offline: Il database di OpenStreetMap è al momento non in linea per permettere
flash: Aggiornate con successo le informazioni sul client
destroy:
flash: Distrutta la registrazione dell'applicazione client
- user:
+ users:
login:
title: Entra
heading: Entra
intro_header: OpenStreetMap へようこそ!
intro_text: OpenStreetMap は、あなたのような人々が作成した世界地図であり、オープン ライセンスの下で自由に利用できます。
intro_2_create_account: 新しい利用者アカウントを作成
- partners_html: 'ホスティング支援者: %{ucl}、%{bytemark}、%{ic}及びその他の%{partners}'
partners_ucl: UCL
- partners_ic: インペリアル カレッジ ロンドン
partners_bytemark: バイトマーク ホスティング
partners_partners: パートナー
osm_offline: OpenStreetMap のデータベースはメンテナンスのため一時的に停止しています。
flash: クライアント情報の更新が正常に終了しました
destroy:
flash: 破棄されたクライアント アプリケーションの登録
- user:
+ users:
login:
title: ログイン
heading: ログイン
name: სახელი
required: სავალდებულოა
allow_write_api: რუკის რედაქტირება.
- user:
+ users:
login:
title: შესვლა
heading: შესვლა
geocoder:
search:
title:
- latlon: Igmaḍ <a href="http://openstreetmap.org/">igensanen</a>
- ca_postcode: Igmaḍ si <a href="http://geocoder.ca/">Geocoder.CA</a>
- osm_nominatim: Igmaḍ si <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+ latlon: Igmaḍ seg <a href="https://openstreetmap.org/">igensanen</a>
+ ca_postcode: Igmaḍ si <a href="https://geocoder.ca/">Geocoder.CA</a>
+ osm_nominatim: Igmaḍ si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
Nominatim</a>
geonames: Igmaḍ si <a href="http://www.geonames.org/">GeoNames</a>
- osm_nominatim_reverse: Igmaḍ si <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+ osm_nominatim_reverse: Igmaḍ si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
Nominatim</a>
geonames_reverse: Igmaḍ si <a href="http://www.geonames.org/">GeoNames</a>
search_osm_nominatim:
level10: Talast n ugmama
description:
title:
- osm_nominatim: Asideg si <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+ osm_nominatim: Asideg si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
Nominatim</a>
geonames: Adig si <a href="http://www.geonames.org/">GeoNames</a>
types:
intro_text: OpenStreetMap d takarḍa n umadal, rnna-tt yemdanen am kečč d tilellit
i useqdec ddaw n turagt tilellit.
intro_2_create_account: Rnu amiḍan n useqdac
- partners_html: Tanezduɣt muddentt-id %{ucl},%{bytemark}, %{ic}, d %{partners}
- nniḍen.
partners_ucl: UCL
- partners_ic: Aɣerbaz impiryal n Lundun
partners_bytemark: Tanezduɣt n Bytemark
partners_partners: imendiden
osm_offline: Taffa n isefka n OpenStreetMap ur teqqin ara yakan tura imi aseǧǧem
get_directions: Awi iwellihen
from: Seg
to: I
- where_am_i: Anida lliɣ?
+ where_am_i: Anida yella waya?
submit_text: Ddu
key:
table:
richtext_area:
edit: Ẓreg
markdown_help:
- title_html: Yettwasleḍ s <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+ title_html: Yettwasleḍ s <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
headings: Izwal
heading: Azwel
subheading: Azwel asnawan
allow_read_gpx: ɣeṛ lǧerrat GPS usligen.
allow_write_gpx: azen lǧerrat GPS.
allow_write_notes: snifel tizmilin.
- user:
+ users:
login:
title: Qqen
heading: Qqen
form:
name: ឈ្មោះ
allow_write_api: កែសម្រួលផែនទី
- user:
+ users:
login:
title: កត់ឈ្មោះចូល
heading: កត់ឈ្មោះចូល
map: ನಕ್ಷೆ
edit: ಸಂಪಾದಿಸಿ
description: 'ವಿವರ:'
- user:
+ users:
login:
title: ಲಾಗ್ ಇನ್
password: 'ಪ್ರವೇಶಪದ:'
diary_entry:
spam_label: 이 일기 항목은 스팸입니다
offensive_label: 이 일기 항목은 음란물이거나 모욕적입니다
+ threat_label: 이 일기 항목은 위협을 포함합니다
other_label: 기타
diary_comment:
spam_label: 이 일기 댓글은 스팸입니다
+ offensive_label: 이 일기 댓글은 타당치 않거나 공격적입니다
+ threat_label: 이 일기 댓글은 위협을 포함합니다
other_label: 기타
user:
spam_label: 이 사용자 프로필은 스팸이거나 스팸을 포함합니다
+ offensive_label: 이 사용자 프로필은 타당치 않거나 공격적입니다
threat_label: 이 사용자 프로필에 위협이 포함되어 있습니다
vandal_label: 이 사용자는 문서 훼손자입니다
other_label: 기타
intro_header: OpenStreetMap에 오신 것을 환영합니다!
intro_text: OpenStreetMap은 여러분과 같은 사람들이 만들어, 개방형 라이선스에 따라 자유롭게 사용할 수 있는 세계 지도입니다.
intro_2_create_account: 사용자 계정을 만드세요
- partners_html: 호스팅은 %{ucl}, %{ic}, %{bytemark}, 다른 %{partners}에서 지원합니다.
+ hosting_partners_html: 호스팅은 %{ucl}, %{bytemark}, 다른 %{partners}에서 지원합니다.
partners_ucl: UCL
- partners_ic: 임페리얼 칼리지 런던 대학
partners_bytemark: 바이트마크 호스팅
partners_partners: 협력단체
osm_offline: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 오프라인입니다.
flash: 성공적으로 클라이언트 정보를 업데이트했습니다
destroy:
flash: 클라이언트 애플리케이션 등록을 파기했습니다
- user:
+ users:
login:
title: 로그인
heading: 로그인
intro_text: OpenStreetMap xerîteyekî dinyayê ye ku ji aliyê kesên wek te ve tê
çêkirin û emilandina we belaş e û di bin lîsansa azad de ye.
intro_2_create_account: Ji xwe re hesabekî çêbike
- partners_html: Pêşkêşkirina bernameyê ji alî %{ucl}, %{bytemark}, %{ic} û %{partners}
- ve tê piştgirîkirin.
partners_ucl: University College London
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: şirîkên me
osm_offline: Databasa OpenStreetMapê vê gavê offline e ji ber ku niha xebatên
flash: Agahiyên mişteriyê bi serkeftinî hate nûkirin.
destroy:
flash: Sepana telebkar qeyda xwe ji holê rakir
- user:
+ users:
login:
title: Têkeve
heading: Têkeve
name: Numm
required: Obligatoresch
allow_write_api: Kaart änneren
- user:
+ users:
login:
title: Umellen
heading: Umellen
intro_text: OpenStreetMap yra pasaulio žemėlapis, kuriamas žmonių, tokių kaip
jūs. Jis atviras ir laisvas - naudojamas pagal atvirą licenciją.
intro_2_create_account: sukurti naudotojo paskyrą
- partners_html: Serveris palaikomas %{ucl}, %{bytemark}, %{ic} ir kiti %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark serveris
partners_partners: partneriai
osm_offline: Šiuo metu OpenStreetMap duomenų bazė išjungta, nes vykdomi svarbūs
flash: Kliento informacija sėkmingai atnaujinta
destroy:
flash: Panaikinta kliento programos registracija
- user:
+ users:
login:
title: Prisijungti
heading: Prisijungti
intro_text: OpenStreetMap ir pasaules karte, kuru veido cilvēki kā tu, un tā ir
bezmaksas lietošanai zem atvērtas licences.
intro_2_create_account: Izveidot lietotāja kontu
- partners_html: Servera vietu atbalsta %{ucl}, %{ic} un %{bytemark}, un citi %{partners}.
partners_ucl: UCL
- partners_ic: Londonas Imperiālā Koledža
partners_bytemark: Bytemark Hosting
partners_partners: partneri
osm_offline: OpenStreetMap datubāze šobrīd nav pieejama, tiek veikti svarīgi datubāzes
flash: Klienta informācija atjaunināta veiksmīgi
destroy:
flash: Iznīcināja klienta aplikācijas reģistrāciju
- user:
+ users:
login:
title: Pieslēgties
heading: Pieslēgties
intro_text: OpenStreetMap е карта на светот создадена од луѓе како вас и се нуди
за слободна употреба под отворена лиценца.
intro_2_create_account: Создајте корисничка сметка
- partners_html: Вдомувањето е поддржано од %{ucl}, %{bytemark}, %{ic} како и други
+ hosting_partners_html: Вдомувањето е поддржано од %{ucl}, %{bytemark} и други
%{partners}.
partners_ucl: UCL
- partners_ic: Империјалниот колеџ - Лондон
partners_bytemark: вдомителот „Bytemark“
partners_partners: партнери
osm_offline: Базата на податоци на OpenStreetMap моментално е исклучена додека
flash: Клиентските информации се успешно подновени
destroy:
flash: Уништена е пријавната регистрација за клиентскиот програм.
- user:
+ users:
login:
title: Најава
heading: Најава
old_relation_tag: Маркаж пентру релация веке
old_way: Кале веке
relation: Релацие
+ relation_member: Мембру ал релацией
session: Сесиуне
trace: Маршрутэ
user: Утилизатор
intro_text: OpenStreetMap есте о хартэ а лумий, креатэ де оамень ка ши думнявоастрэ,
ши поате фи утилизатэ ын мод либер суб о личенцэ дескисэ.
intro_2_create_account: Креаць ун конт де утилизатор
- partners_html: Хостингул есте сусцинут де %{ucl}, %{bytemark} ши %{ic}, прекум
- ши де кэтре алць %{partners}.
partners_ucl: Колеӂиул Университар дин Лондра (UCL)
- partners_ic: Колеӂиул Империал дин Лондра
partners_bytemark: Хостингул Bytemark
partners_partners: партенерь
help: Ажутор
site:
export:
title: Експортаре
- user:
+ users:
login:
title: Презентаци-вэ
heading: Презентаци-вэ
heading: Аць уйтат парола?
email address: 'Адреса де поштэ електроникэ:'
new password button: Рестабилиря паролей
+ reset_password:
+ password: 'Паролэ:'
+ confirm password: 'Конфирмаць парола:'
+ new:
+ display name: 'Нумеле афишат:'
+ password: 'Паролэ:'
+ confirm password: 'Конфирмаць парола:'
show:
my diary: Журналул меу
my messages: Месажеле меле
my friends: Приетений мей
account:
my settings: Реглажеле меле
+ current email address: 'Адреса де поштэ електроникэ курентэ:'
+ new email address: 'Адреса де поштэ електроникэ ноуэ:'
+ email never displayed publicly: (ну се афишязэ публик)
+ external auth: 'Ынтраря ын конт екстернэ:'
+ openid:
+ link text: че май есте ши аста?
+ public editing:
+ enabled link text: че май есте ши аста?
+ contributor terms:
+ link text: че май есте ши аста?
+ preferred editor: 'Редактор преферат:'
+ gravatar:
+ link text: че май есте ши аста?
...
आहे, व जो खुल्या परवान्यांतर्गत वापरास मुक्त आहे.
intro_2_create_account: सदस्यखाते तयार करा
partners_ucl: UCL VR सेंटर
- partners_ic: इम्पिरियल कॉलेज लंडन
partners_bytemark: बाईटमार्क होस्टिंग
partners_partners: भागीदार
osm_offline: डाटाबेसचे आवश्यक देखरेखीचे काम असल्यामुळे ओपनस्ट्रीटमॅप डाटाबेस ही
required: आवश्यक
url: मुख्य अनुप्रयोग URL
requests: 'सदस्याकडून खालील परवानग्यांची मागणी करा:'
- user:
+ users:
login:
title: सनोंद प्रवेश करा
heading: सनोंद प्रवेश करा
intro_text: OpenStreetMap ialah peta dunia yang diwujudkan oleh insan seperti
anda, dan bebas digunakan dengan berlandaskan lesen terbuka.
intro_2_create_account: Buka akaun pengguna
- partners_html: Pengehosan disokong oleh %{ucl}, %{ic} dan %{bytemark}, serta %{partners}
- yang lain.
partners_ucl: Pusat VR UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: rakan-rakan kongsi
osm_offline: Pangkalan data OpenStreetMap kini diputuskan sambungannya sementara
flash: Maklumat klien berjaya dikemaskinikan
destroy:
flash: Permohonan aplikasi klien dihapuskan
- user:
+ users:
login:
title: Log masuk
heading: Log masuk
intro_text: OpenStreetMap er et kart over verden, skapt av mennesker som deg,
og gratis å bruke under en åpen lisens.
intro_2_create_account: Opprett en brukerkonto
- partners_html: Hosting støttes av %{ucl}, %{bytemark}, %{ic}, og andre %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnere
osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt
flash: Oppdaterte klientinformasjonen
destroy:
flash: Ødelagt klientapplikasjonsregistreringen
- user:
+ users:
login:
title: Logg inn
heading: Logg inn
name: Naam
required: Nödig
allow_write_api: Koort ännern.
- user:
+ users:
login:
title: Anmellen
heading: Anmellen
अगाडि</abbr> पुनःसक्रिय गरिएको
hidden_by: '%{user}द्वारा <abbr title=''%{exact_time}''>%{when} अगाडि</abbr>
लुकाइएको'
+ report: यस टिपोटलाई उजुरी गर्नुहोस्
query:
title: क्वेरी गुणहरू
introduction: नजिकैका फिचरहरू भेटाउन नक्सामा क्लिक गर्नुहोस्
edit_link: यो प्रविष्टी सम्पादन गर्ने
hide_link: यो प्रविष्टी लुकाउने
confirm: निश्चित गर्ने
+ report: यो प्रविष्टीको उजुरी गर्ने
diary_comment:
comment_from: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी'
hide_link: यो टिप्पणी लुकाउनुहोस्
track: ट्रयाक
cycleway: साइकल मार्ग
rail: रेलमार्ग
+ subway: सबवे
cable:
- केबल कार
- कुर्सी लिफ्ट
form:
name: नाम
required: आवश्यक पर्दछ
- user:
+ users:
login:
title: प्रवेश
heading: प्रवेश
intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals
u en vrij te gebruiken onder een open licentie.
intro_2_create_account: Maak een gebruiker aan
- partners_html: De hosting wordt ondersteund door %{ucl}, %{ic} en %{bytemark},
- en andere %{partners}.
partners_ucl: het UCL VR Centre
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partners
osm_offline: De OpenStreetMap-database is op het moment niet beschikbaar wegens
flash: De informatie voor de client is bijgewerkt
destroy:
flash: De clientapplicatieregistratie is verwijderd
- user:
+ users:
login:
title: Aanmelden
heading: Aanmelden
intro_text: OpenStreetMap er eit verdskart, laga av folks som deg, det er ope
og gratis å bruke, med ein open lisens.
intro_2_create_account: Opprett ein brukarkonto
- partners_html: Drifta er støtta av %{ucl}, %{ic}, %{bytemark} og andre %{partners}.
partners_ucl: UCL VR-senteret
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partnarar
osm_offline: OpenStreetMap databasen er for augneblunken utilgjengelig medan essensielt
inbox: innboks
outbox: utboks
messages:
- one: Du har %{count} sendt melding
- other: Du har %{count} sendte meldingar
+ one: Du har %{count} send melding
+ other: Du har %{count} sende meldingar
to: Til
subject: Emne
date: Dato
flash: Oppdaterte klientinformasjonen
destroy:
flash: Øydelagt klientapplikasjonsregistreringen
- user:
+ users:
login:
title: Logg inn
heading: Logg inn
intro_text: OpenStreetMap es una mapa del mond, creada per de personas coma vos
e liura d’utilizacion jos licéncia liura.
intro_2_create_account: Creatz un compte d'utilizaire
- partners_html: L'albergament es pres en carga per %{ucl}, %{ic} e %{bytemark},
- e d'autres %{partners}.
partners_ucl: UCL
- partners_ic: lo Collègi Imperial de Londres
partners_bytemark: Albergament Bytemark
partners_partners: partenaris
osm_offline: La basa de donadas de OpenStreetMap es actualament fòra linha; una
flash: Informacions del client enregistradas amb succès
destroy:
flash: Enregistrament de l'aplicacion clienta suprimit
- user:
+ users:
login:
title: Se connectar
heading: Connexion
export_data: ਸਮੱਗਰੀ ਬਰਾਮਦ ਕਰੋ
edit_with: '%{editor} ਨਾਲ ਸੋਧੋ'
intro_2_create_account: ਇੱਕ ਵਰਤੋਂਕਾਰ ਖਾਤਾ ਬਣਾਉ
- partners_ic: ਇੰਪੀਰੀਅਲ ਕਾਲਜ ਲੰਡਨ
partners_bytemark: ਬਾਈਟਮਾਰਕ ਹੋਸਟਿੰਗ
partners_partners: ਜੋੜੀਦਾਰ
help: ਮਦਦ
name: ਨਾਂ
required: ਲੋੜੀਂਦਾ
support_url: ਮਦਦ URL
- user:
+ users:
login:
title: ਦਾਖ਼ਲਾ
heading: ਦਾਖ਼ਲਾ
intro_text: OpenStreetMap to mapa świata, stworzona przez ludzi, takich jak ty,
i z możliwością użycia pod otwartą licencją.
intro_2_create_account: Utwórz konto
- partners_html: Hosting obsługuje %{ucl}, %{ic}, %{bytemark}, a także %{partners}.
partners_ucl: University College London
- partners_ic: Imperial College London
partners_bytemark: Hosting Bytemark
partners_partners: partnerzy
osm_offline: Baza danych OpenStreetMap jest niedostępna na czas ważnych zadań
flash: Informacje o kliencie zostały pomyślnie zaktualizowane
destroy:
flash: Usunięto rejestrację aplikacji
- user:
+ users:
login:
title: Logowanie
heading: Logowanie
intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e
de uso livre sob uma licença aberta.
intro_2_create_account: Criar uma conta de usuário
- partners_html: A hospedagem é apoiada por %{ucl}, %{bytemark}, %{ic}, e outros
+ hosting_partners_html: A hospedagem é suportada por %{ucl}, %{bytemark} e outros
%{partners}.
partners_ucl: UCL
- partners_ic: Imperial College de Londres
partners_bytemark: Hospedagem Bytemark
partners_partners: parceiros
osm_offline: A base de dados do OpenStreetMap está fora do ar para manutenção.
flash: Sucesso ao atualizar as informações do cliente
destroy:
flash: O registro da aplicação cliente foi apagado
- user:
+ users:
login:
title: Entrar
heading: Entrar
reopened_by_anonymous: Reaberto por um anónimo há <abbr title='%{exact_time}'>%{when}
atrás</abbr>
hidden_by: Ocultado por %{user} há <abbr title='%{exact_time}'>%{when} atrás</abbr>
+ report: Denunciar este erro reportado
query:
title: Consultar elementos em redor
introduction: Clique no mapa para descobrir elementos em redor.
edit_link: Editar esta entrada
hide_link: Ocultar esta entrada
confirm: Confirmar
+ report: Denunciar esta entrada
diary_comment:
comment_from: Comentário de %{link_user} em %{comment_created_at}
hide_link: Ocultar este comentário
confirm: Confirmar
+ report: Denunciar este comentário
location:
location: 'Localização:'
view: Ver
issues:
index:
title: Problemas
+ select_status: Selecionar Estado
+ select_type: Selecionar Tipo
+ select_last_updated_by: Selecionar Último Atualizado por
+ reported_user: Denunciar Utilizador
+ not_updated: Não Atualizado
search: Pesquisar
+ search_guidance: 'Pesquisar Problemas:'
+ user_not_found: O utilizador não existe
+ issues_not_found: Não foi encontrado nenhum problema desse tipo
status: Estado
+ reports: Denúncias
+ last_updated: Última Atualização
+ last_updated_time_html: <abbr title='%{title}'>%{time} atrás</abbr>
+ last_updated_time_user_html: <abbr title='%{title}'>%{time} atrás</abbr> por
+ %{user}
+ link_to_reports: Ver Denúncias
+ reports_count:
+ one: 1 denúncia
+ other: '%{count} denúncias'
+ reported_item: Item Denunciado
+ states:
+ ignored: Ignorado
+ open: Aberto
+ resolved: Resolvido
+ update:
+ new_report: A sua denúncia por registada com sucesso
+ successful_update: A sua denúncia foi atualizada com sucesso
+ provide_details: Por favor forneça os detalhes necessários
show:
+ title: '%{status} Denúncia #%{issue_id}'
+ reports:
+ zero: Sem denúncias
+ one: 1 denúncia
+ other: '%{count} denúncias'
+ report_created_at: Denunciado primeiro em %{datetime}
+ last_resolved_at: Último resolvido em %{datetime}
+ last_updated_at: Último atualizado em %{datetime} por %{displayname}
+ resolve: Resolver
ignore: Ignorar
+ reopen: Reabrir
+ reports_of_this_issue: Denúncias deste Problema
+ read_reports: Ler Denúncias
+ new_reports: Novas Denúncias
+ other_issues_against_this_user: Outros problemas sobre este utilizador
+ no_other_issues: Nenhum outro problema com este utilizador.
+ comments_on_this_issue: Comentários sobre este problema
+ resolve:
+ resolved: O estado do problema foi alterado para 'Resolvido'
+ ignore:
+ ignored: O estado do problema foi alterado para 'Ignorado'
+ reopen:
+ reopened: O estado do problema foi alterado para 'Aberto'
+ comments:
+ created_at: Em %{datetime}
+ reassign_param: Reatribuir o problema?
+ reports:
+ updated_at: Em %{datetime}
+ reported_by_html: Denunciado como %{category} por %{user}
+ helper:
+ reportable_title:
+ diary_comment: '%{entry_title}, comentário #%{comment_id}'
+ note: 'Erro reportado #%{note_id}'
+ issue_comments:
+ create:
+ comment_created: O seu comentário foi criado com sucesso
+ reports:
+ new:
+ title_html: Denunciar %{link}
+ missing_params: Não foi possível criar uma denúncia
+ details: Por favor forneça mais alguns detalhes sobre o problema (obrigatório).
+ select: Selecione um motivo para a sua denúnciaː
+ disclaimer:
+ intro: Antes de enviar a sua denúncia aos moderadores, por favor certifique-se
+ queː
+ not_just_mistake: Tem a certeza que o problema não é um mero engano
+ unable_to_fix: Não consegue corrigir o problema por si próprio nem com a ajuda
+ dos membros da comunidade
+ resolve_with_user: Já tentou resolver o problema com o utilizador em questão
+ categories:
+ diary_entry:
+ spam_label: Esta entrada do diário é ou contém SPAM/publicidade
+ offensive_label: Esta entrada do diário é obscena ou ofensiva
+ threat_label: Esta entrada do diário contém uma ameaça
+ other_label: Outro
+ diary_comment:
+ spam_label: Este comentário na entrada do diário é ou contém SPAM/publicidade
+ offensive_label: Este comentário na entrada do diário é obsceno ou ofensivo
+ threat_label: Este comentário na entrada do diário contém uma ameaça
+ other_label: Outro
+ user:
+ spam_label: Este perfil de utilizador é ou contém SOAM/publicidade
+ offensive_label: Este perfil de utilizador é obsceno ou ofensivo
+ threat_label: Este perfil de utilizador contém uma ameaça
+ vandal_label: Este utilizador é um vândalo
+ other_label: Outro
+ note:
+ spam_label: Este erro reportado é SPAM/publicidade
+ personal_label: Este erro reportado contém dados pessoais
+ abusive_label: Este erro reportado é abusivo
+ other_label: Outro
+ create:
+ successful_report: A sua denúncia foi registada com sucesso
+ provide_details: Por favor forneça os detalhes necessários
layouts:
logo:
alt_text: Logotipo do OpenStreetMap
edit: Editar
history: Histórico
export: Exportar
+ issues: Problemas
data: Dados
export_data: Exportar dados
gps_traces: Trilhos GPS
intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e
de uso livre sob uma licença aberta.
intro_2_create_account: Crie uma conta de utilizador
- partners_html: O alojamento é suportado por %{ucl}, %{bytemark}, %{ic}, e outros
+ hosting_partners_html: O alojamento é suportado por %{ucl}, %{bytemark} e outros
%{partners}.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: parceiros
osm_offline: A base de dados do OpenStreetMap não está disponível neste momento
trace_uploaded: O seu ficheiro GPX (GPS) foi enviado e está a aguardar a inclusão
na base de dados. Normalmente este processo dura cerca de uma hora. Quando
for incluído na base de dados será enviado um email a informá-lo.
+ upload_failed: Desculpe, o envio do GPX falhou. Foi enviado um alerta a um administrador
+ sobre o erro. Por favor tente novamente
traces_waiting:
one: Tem %{count} trilho GPS na fila para ser colocado na base de dados do
OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco
save_button: Gravar Alterações
visibility: 'Visibilidade:'
visibility_help: o que significa isto?
+ update:
+ updated: Trilho atualizado
trace_optionals:
tags: Etiquetas
show:
require_cookies:
cookies_needed: Parece que tem os "cookies" desativados - por favor ative-os
no seu navegador de Internet antes de continuar.
+ require_admin:
+ not_an_admin: Tem de ser um administrador para realizar essa ação.
require_moderator:
not_a_moderator: Tem de ser um moderador para poder fazer essa ação.
+ require_moderator_or_admin:
+ not_a_moderator_or_admin: Tem de ser um moderador ou um administrador para realizar
+ essa ação
setup_user_auth:
blocked_zero_hour: Tem uma mensagem urgente no site do OpenStreetMap. Tem de
ler a mensagem antes de poder gravar as suas edições.
flash: A atualização da informação do programa foi feita com sucesso
destroy:
flash: O registo do programa foi eliminado
- user:
+ users:
login:
title: Entrar
heading: Iniciar sessão
email or username: 'E-mail ou Utilizador:'
password: 'Palavra-passe:'
openid: '%{logo} OpenID:'
- remember: 'Lembrar-me:'
+ remember: Permanecer autenticado entre sessões
lost password link: Perdeu a sua palavra-passe?
login_button: Entrar
register now: Criar conta agora
form:
name: Nume
required: Necesar
- user:
+ users:
login:
email or username: 'Adresa de e-mail sau numele de utilizator:'
password: 'Parolă:'
# Author: Helpau
# Author: Ignatus
# Author: Iluvatar
+# Author: Infovarius
# Author: Irus
# Author: Kaganer
# Author: Komzpa
intro_text: OpenStreetMap является картой мира, созданной такими же людьми, как
и вы, и может свободно использоваться под открытой лицензией.
intro_2_create_account: Создайте учётную запись
- partners_html: Хостинг поддерживается %{ucl}, %{bytemark} и %{ic}, а также другими
- %{partners}.
+ hosting_partners_html: Хостинг поддерживается %{ucl}, %{bytemark} и другими %{partners}.
partners_ucl: UCL
- partners_ic: Имперским колледжем Лондона
partners_bytemark: Bytemark Hosting
partners_partners: партнёрами
osm_offline: База данных OpenStreetMap в данный момент не доступна, так как проводится
flash: Клиентская информация успешно обновлена
destroy:
flash: Уничтожена регистрация клиентского приложения
- user:
+ users:
login:
title: Представьтесь
heading: Представьтесь
intro_text: OpenStreetMap è na cartina dû munnu, criata di genti comu a tìa e
lìbbira a adupirari secunnu na licenza graputa.
intro_2_create_account: Crea un cuntu d'utenti
- partners_html: L'hosting veni sustinutu di %{ucl}, %{ic} e %{bytemark}, e àutri
- %{partners}.
partners_ucl: the UCL VR Centre
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: cullabburatura
osm_offline: La basi di dati d'OpenStreetMap comu a ora nun è n lìnia pirchì si
flash: Li nfurmazzioni dû clienti foru aggiurnati boni
destroy:
flash: Fu distruiuta la riggistrazzioni di l'applicazzioni clienti
- user:
+ users:
login:
title: Trasi
heading: Trasi
intro_text: OpenStreetMap is a cairt o the warld, creatit bi fowk lik ye an free
tae uise unner an open license.
intro_2_create_account: Create a uiser accoont
- partners_html: Hostin is supportit bi %{ucl}, %{ic} an %{bytemark}, an ither %{partners}.
partners_ucl: the UCL VR Centre
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: pairtners
osm_offline: The OpenStreetMap database is currently offline while essential database
traces:
create:
upload_trace: Uplaid GPS Trace
- user:
+ users:
login:
auth_providers:
google:
intro_text: OpenStreetMap je mapa sveta, vytvorené ľuďmi ako vy, voľne využiteľná
pod slobodnou licenciou.
intro_2_create_account: Založte si konto
- partners_html: Prevádzku podporujú %{ucl}, %{ic}, %{bytemark} a iní %{partners}.
partners_ucl: VR centrum UCL
- partners_ic: Imperial College v Londýne
partners_bytemark: Bytemark Hosting
partners_partners: partneri
osm_offline: OpenStreetMap databáza je teraz offline, zatiaľ čo potrebná údržba
flash: Úspešne aktualizované informácie o klientovi
destroy:
flash: Registrácia klientskej aplikácie bola zrušená
- user:
+ users:
login:
title: Prihlásiť sa
heading: Prihlásenie
intro_text: OpenStreetMap je zemljevid sveta, ki ga ustvarjajo ljudje kot ste
vi, brezplačen za uporabo z odprto licenco.
intro_2_create_account: Ustvarite uporabniški račun
- partners_html: Gostovanje podpira %{ucl}, %{bytemark} in %{ic}, ter ostali %{partners}.
partners_ucl: UCL
- partners_ic: Imperial College v Londonu
partners_bytemark: Bytemark Hosting
partners_partners: partnerji
osm_offline: Baza OpenStreetMap zaradi izvajanja nujnih vzdrževalnih del trenutno
flash: Informacije odjemalca uspešno posodobljene
destroy:
flash: Registracija odjemalske aplikacije uničena
- user:
+ users:
login:
title: Prijava
heading: Prijava
intro_text: OpenStreetMap është hartë e botës, e krijuar nga njerëz si ti dhe
për përdorim të lirshëm në kuadrin e një licence të hapur.
intro_2_create_account: Krijo një llogari përdoruesi
- partners_html: Hostingu mbështetet nga %{ucl}, %{ic} dhe %{bytemark}, dhe të tjerë
- %{partners}.
partners_partners: partnerët
help: Ndihmë
about: Rreth
confirm: A je i sigurt?
form:
name: Emri
- user:
+ users:
login:
title: Identifikohu
heading: Identifikohu
edit_with: Uredi uređivačem %{editor}
tag_line: Slobodna viki mapa sveta
intro_2_create_account: Otvorite nalog
- partners_html: Hosting podržava %{ucl}, %{ic} i %{bytemark}, kao i drugi %{partners}.
partners_ucl: VR centar UCL-a
- partners_ic: Londonski kraljevski koledž
partners_bytemark: Hosting „Bajtmark“
partners_partners: partneri
osm_offline: Baza podataka Openstritmapa je trenutno nedostupna dok se ne završe
flash: Podaci o klijentu su uspešno ažurirani
destroy:
flash: Upis programa je ukinut
- user:
+ users:
login:
title: Prijava
heading: Prijava
friendly: '%e %B %Y у %H:%M'
activerecord:
models:
- acl: СпиÑ\81ак огÑ\80аниÑ\87еÑ\9aа приступа
+ acl: Ð\9bиÑ\81Ñ\82а конÑ\82Ñ\80оле приступа
changeset: Скуп измена
changeset_tag: Ознака скупа измена
country: Земља
intro_text: OpenStreetMap је мапа света коју су направили људи попут вас. Слободна
је за коришћење под отвореном лиценцом.
intro_2_create_account: Отворите кориснички налог
- partners_html: Хостинг омогућују %{ucl}, %{bytemark}, %{ic}, као и други %{partners}.
partners_ucl: UCL
- partners_ic: Краљевски колеџ у Лондону
partners_bytemark: хостинг Bytemark
partners_partners: партнери
osm_offline: База OpenStreetMap-а је тренутно недоступна док се не заврше неопходни
headings: Наслови
heading: Наслов
subheading: Поднаслов
- unordered: Ð\9dеÑ\81вÑ\80Ñ\81Ñ\82ан Ñ\81пиÑ\81ак
- ordered: СвÑ\80Ñ\81Ñ\82ан Ñ\81пиÑ\81ак
+ unordered: Ð\9dеÑ\83Ñ\80еÑ\92ена лиÑ\81Ñ\82а
+ ordered: УÑ\80еÑ\92ена лиÑ\81Ñ\82а
first: Прва ставка
second: Друга ставка
link: Веза
flash: Подаци о клијенту су успешно ажурирани
destroy:
flash: Уништена је регистрација клијентског програма
- user:
+ users:
login:
title: Пријава
heading: Пријава
success: Блокада је ажурирана.
index:
title: Корисничке блокаде
- heading: СпиÑ\81ак корисничких блокада
+ heading: Ð\9bиÑ\81Ñ\82а корисничких блокада
empty: Није направљена ниједна блокада.
revoke:
title: Опозивање блокаде на %{block_on}
time_past: Завршено пре %{time}.
blocks_on:
title: Блокаде за %{name}
- heading: СпиÑ\81ак блокада за %{name}
+ heading: Ð\9bиÑ\81Ñ\82а блокада за %{name}
empty: '%{name} још није био блокиран/а.'
blocks_by:
title: Блокаде од %{name}
- heading: СпиÑ\81ак блокада од %{name}
+ heading: Ð\9bиÑ\81Ñ\82а блокада од %{name}
empty: '%{name} још увек није блокирао никога.'
show:
title: '%{block_on} је блокиран/а од %{block_by}'
title: Уређивање редакције
index:
empty: Нема редакција.
- heading: СпиÑ\81ак редакција
- title: СпиÑ\81ак редакција
+ heading: Ð\9bиÑ\81Ñ\82а редакција
+ title: Ð\9bиÑ\81Ñ\82а редакција
new:
description: Опис
heading: Унесите податке за нову редакцију
intro_text: OpenStreetMap är en karta över världen, skapad av människor som du
och fri att använda under en öppen licens.
intro_2_create_account: Skapa ett användarkonto
- partners_html: Drivs via %{ucl}, %{ic}, %{bytemark}, %{ic} och andra %{partners}.
+ hosting_partners_html: Drivs via %{ucl}, %{bytemark} och andra %{partners}.
partners_ucl: University College London
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: partners
osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, då nödvändigt
flash: Uppdaterade klientinformationen framgångsrikt
destroy:
flash: Annullerade registreringen av klientprogrammet
- user:
+ users:
login:
title: Logga in
heading: Logga in
form:
name: பெயர்
required: தேவைப்படும்
- user:
+ users:
login:
title: புகுபதிகை
heading: புகுபதிகை
form:
name: పేరు
required: తప్పనిసరి
- user:
+ users:
login:
title: ప్రవేశం
heading: ప్రవేశం
intro_header: ยินดีต้อนรับสู่ OpenStreetMap!
intro_text: OpenStreetMap เป็นแผนที่โลกที่สร้างโดยผู้คนเช่นท่าน และใช้งานได้ไม่เสียค่าใช้จ่ายภายใต้สัญญาอนุญาตแบบเปิด
intro_2_create_account: สร้างบัญชีผู้ใช้ใหม่
- partners_html: เซิร์ฟเวอร์สนับสนุนโดย %{ucl}, %{bytemark}, %{ic}, และ%{partners}อื่น
- ๆ
partners_ucl: ยูซีแอล (วิทยาลัยอุดมศึกษาลอนดอน)
- partners_ic: วิทยาลัยอิมพีเรียลลอนดอน
partners_bytemark: ไบต์มาร์กโฮสติง
partners_partners: องค์กรพันธมิตร
osm_offline: ฐานข้อมูลของ OpenStreetMap กำลังออฟไลน์เพื่อให้สามารถดำเนินการบำรุงรักษาตามปกติได้
flash: ปรับปรุงข้อมูลฝั่งผู้ใช้เรียบร้อยแล้ว
destroy:
flash: ถอนการลงทะเบียนแอปพลิเคชันฝั่งผู้ใช้แล้ว
- user:
+ users:
login:
title: ลงชื่อเข้าใช้
heading: ลงชื่อเข้าใช้
intro_text: Ang OpenStreetMap ay isang mapa ng mundo na nilikha ng mga taong katulad
mo at malayang gamitin sa ilalim ng isang bukas na lisensya.
intro_2_create_account: Lumikha ng isang akawnt ng tagagamit
- partners_html: Ang pagpapasinaya ay sinusuportahan ng %{ucl}, %{bytemark}, %{ic},
- at iba pang %{partners}.
partners_ucl: UCL
- partners_ic: Dalubhasaang Pang-imperyo Londres
partners_bytemark: Pagpapasinaya ng Bytemark
partners_partners: mga kawaksi
osm_offline: Ang kalipunan ng dato ng OpenStreetMap ay pangkasalukuyang nakapatay
flash: Matagumpay na naisapanhon ang kabatiran sa kliyente
destroy:
flash: Winasak ang pagpapatala ng aplikasyon ng kliyente
- user:
+ users:
login:
title: Lumagda
heading: Lumagda
intro_text: OpenStreetMap senin gibi insanlar tarafından oluşturulan, kullanımı
serbest ve açık lisans altında olan bir dünya haritasıdır.
intro_2_create_account: hesap oluşturunuz
- partners_html: Barındırma hizmeti, %{ucl}, %{ic}, %{bytemark}, %{ic} ve diğer
- %{partners} tarafından desteklenmektedir.
partners_ucl: UCL
- partners_ic: Imperial College London
partners_bytemark: Bytemark Hosting
partners_partners: ortaklar
osm_offline: OpenStreetMap veritabanı bakım çalışmaları yürütüldüğü için veritabanı
flash: Müşteri bilgilerini başarıyla güncelleştirildi
destroy:
flash: İstemci uygulaması kaydını yok etti
- user:
+ users:
login:
title: Giriş
heading: Giriş
intro_text: OpenStreetMap — мапа світу, створена такими ж людьми, як і ви, для
вільного використання під відкритою ліцензією.
intro_2_create_account: Створіть обліковий запис
- partners_html: Хостинг підтримується %{ucl}, %{ic} та %{bytemark}, а також іншими
- %{partners}.
partners_ucl: UCL
- partners_ic: Імперський коледж Лондона
partners_bytemark: Bytemark Hosting
partners_partners: партнерами
osm_offline: База даних OpenStreetMap в даний момент недоступна, бо саме проводиться
flash: Інформацію клієнта успішно оновлено
destroy:
flash: Знищено реєстрацію клієнтського застосунку
- user:
+ users:
login:
title: Ласкаво просимо
heading: Ласкаво просимо
intro_text: OpenStreetMap là bản đồ thế giới do những người như bạn xây dựng và
cho phép sử dụng thoải mái theo một giấy phép nguồn mở.
intro_2_create_account: Mở tài khoản mới
- partners_html: Dịch vụ nhờ sự hỗ trợ hosting của %{ucl}, %{bytemark}, %{ic}, và
- %{partners} khác.
partners_ucl: UCL
- partners_ic: Đại học Hoàng gia Luân Đôn
partners_bytemark: Bytemark Hosting
partners_partners: các công ty bảo trợ
osm_offline: Cơ sở dữ liệu OpenStreetMap đang ngoại tuyến trong lúc đang thực
flash: Đã cập nhật thông tin trình khách thành công
destroy:
flash: Đã xóa đăng ký trình khách
- user:
+ users:
login:
title: Đăng nhập
heading: Đăng nhập
# Author: Xiaomingyan
# Author: Yfdyh000
# Author: 乌拉跨氪
+# Author: 夢蝶葬花
# Author: 阿pp
# Author: 아라
---
intro_header: 欢迎访问 OpenStreetMap！
intro_text: OpenStreetMap 是一个世界地图，由像您一样的人们所构筑，可依据开放许可协议自由使用。
intro_2_create_account: 创建用户账户
- partners_html: 主机由%{ucl}、%{bytemark}、%{ic}，以及其他%{partners}所支持。
partners_ucl: 伦敦大学学院
- partners_ic: 伦敦帝国学院
partners_bytemark: Bytemark主机
partners_partners: 合作伙伴
osm_offline: 由于正在进行基本的数据库维护工作，OpenStreetMap 数据库目前处于脱机状态。
create:
upload_trace: 上传 GPS 轨迹
trace_uploaded: 您的 GPX 文件已经被上传，正等待被输入数据库。这通常在半小时之内，当上传结束后会发邮件通知您。
+ upload_failed: 抱歉，GPX上传失败。管理员已收到错误警报。请再试一次
traces_waiting: 您有 %{count} 条轨迹正等待上传，请在上传更多轨迹前等待这些传完，以确保不会给其他用户造成队列拥堵。
edit:
title: 编辑轨迹 %{name}
visibility: 可见性：
visibility_help: 这是什么意思？
visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+ update:
+ updated: 地点已更新！
trace_optionals:
tags: 标签
show:
flash: 更新客户端信息成功
destroy:
flash: 已破坏此客户端应用程序注册
- user:
+ users:
login:
title: 登录
heading: 登录
intro_header: 歡迎來到 OpenStreetMap！
intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
intro_2_create_account: 建立使用者帳號
- partners_html: 主機由 %{ucl}、%{bytemark}、%{ic}，和其他 %{partners} 所支援。
+ hosting_partners_html: 主機由 %{ucl}、%{bytemark}，和其他 %{partners} 所支援。
partners_ucl: 倫敦大學學院
- partners_ic: 倫敦帝國學院
partners_bytemark: Bytemark 主機代管
partners_partners: 合作夥伴
osm_offline: OpenStreetMap 資料庫目前正在離線，直到必要的資料庫維護工作完成為止。
flash: 更新客戶端資訊成功
destroy:
flash: 已銷毀此用戶端應用程式註冊
- user:
+ users:
login:
title: 登入
heading: 登入
get "relations/search" => "search#search_relations"
get "nodes/search" => "search#search_nodes"
- get "user/:id" => "user#api_read", :id => /\d+/
- get "user/details" => "user#api_details"
- get "user/gpx_files" => "user#api_gpx_files"
- get "users" => "user#api_users", :as => :api_users
+ get "user/:id" => "users#api_read", :id => /\d+/
+ get "user/details" => "users#api_details"
+ get "user/gpx_files" => "users#api_gpx_files"
+ get "users" => "users#api_users", :as => :api_users
get "user/preferences" => "user_preferences#read"
get "user/preferences/:preference_key" => "user_preferences#read_one"
get "/history/feed" => "changeset#feed", :defaults => { :format => :atom }
get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" }
get "/export" => "site#export"
- match "/login" => "user#login", :via => [:get, :post]
- match "/logout" => "user#logout", :via => [:get, :post]
+ match "/login" => "users#login", :via => [:get, :post]
+ match "/logout" => "users#logout", :via => [:get, :post]
get "/offline" => "site#offline"
get "/key" => "site#key"
get "/id" => "site#id"
get "/query" => "browse#query"
- get "/user/new" => "user#new"
- post "/user/new" => "user#create"
- get "/user/terms" => "user#terms"
- post "/user/save" => "user#save"
- get "/user/:display_name/confirm/resend" => "user#confirm_resend"
- match "/user/:display_name/confirm" => "user#confirm", :via => [:get, :post]
- match "/user/confirm" => "user#confirm", :via => [:get, :post]
- match "/user/confirm-email" => "user#confirm_email", :via => [:get, :post]
- post "/user/go_public" => "user#go_public"
- match "/user/reset-password" => "user#reset_password", :via => [:get, :post]
- match "/user/forgot-password" => "user#lost_password", :via => [:get, :post]
- get "/user/suspended" => "user#suspended"
+ get "/user/new" => "users#new"
+ post "/user/new" => "users#create"
+ get "/user/terms" => "users#terms"
+ post "/user/save" => "users#save"
+ get "/user/:display_name/confirm/resend" => "users#confirm_resend"
+ match "/user/:display_name/confirm" => "users#confirm", :via => [:get, :post]
+ match "/user/confirm" => "users#confirm", :via => [:get, :post]
+ match "/user/confirm-email" => "users#confirm_email", :via => [:get, :post]
+ post "/user/go_public" => "users#go_public"
+ match "/user/reset-password" => "users#reset_password", :via => [:get, :post]
+ match "/user/forgot-password" => "users#lost_password", :via => [:get, :post]
+ get "/user/suspended" => "users#suspended"
get "/index.html", :to => redirect(:path => "/")
get "/create-account.html", :to => redirect(:path => "/user/new")
get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
# omniauth
- get "/auth/failure" => "user#auth_failure"
- match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success
- match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth
+ get "/auth/failure" => "users#auth_failure"
+ match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success
+ match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth
# permalink
get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/
post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
# user pages
- get "/user/:display_name" => "user#show", :as => "user"
- match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
- match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
- match "/user/:display_name/account" => "user#account", :via => [:get, :post]
- get "/user/:display_name/set_status" => "user#set_status", :as => :set_status_user
- get "/user/:display_name/delete" => "user#delete", :as => :delete_user
+ get "/user/:display_name" => "users#show", :as => "user"
+ match "/user/:display_name/make_friend" => "users#make_friend", :via => [:get, :post], :as => "make_friend"
+ match "/user/:display_name/remove_friend" => "users#remove_friend", :via => [:get, :post], :as => "remove_friend"
+ match "/user/:display_name/account" => "users#account", :via => [:get, :post]
+ get "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
+ get "/user/:display_name/delete" => "users#delete", :as => :delete_user
# user lists
- match "/users" => "user#index", :via => [:get, :post]
- match "/users/:status" => "user#index", :via => [:get, :post]
+ match "/users" => "users#index", :via => [:get, :post]
+ match "/users/:status" => "users#index", :via => [:get, :post]
# geocoder
get "/search" => "geocoder#search"
get "/export/embed" => "export#embed"
# messages
- resources :messages, :only => [:create, :show] do
+ resources :messages, :only => [:create, :show, :destroy] do
+ post :mark
+ match :reply, :via => [:get, :post]
collection do
get :inbox
get :outbox
get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
get "/message/new/:display_name" => "messages#new", :as => "new_message"
get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
- post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
- match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
- post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"
+ post "/message/mark/:message_id" => "messages#mark" # remove after deployment
+ match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post] # remove after deployment
# oauth admin pages (i.e: for setting up new clients, etc...)
scope "/user/:display_name" do
def test_index_user_not_found
get :index, :params => { :format => "html", :display_name => "Some random user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
get :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
end
##
get :index, :params => { :friends => true }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path
+ assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
session[:user] = private_user.id
get :index, :params => { :nearby => true }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path
+ assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
session[:user] = private_user.id
# are not logged in
get :new
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/new"
+ assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new"
end
def test_new_form
:params => { :display_name => user.display_name },
:session => { :user => user }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :suspended
+ assert_redirected_to :controller => :users, :action => :suspended
end
def test_edit
get :edit,
:params => { :display_name => entry.user.display_name, :id => entry.id }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
+ assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
# Verify that you get a not found error, when you pass a bogus id
get :edit,
:params => { :display_name => user.display_name },
:session => { :user => other_user }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :suspended
+ assert_redirected_to :controller => :users, :action => :suspended
# Now show the diary entry, and check the new comment is not present
get :show,
# Try a list of diary entries for an invalid user
get :index, :params => { :display_name => "No Such User" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
end
def test_index_friends
# Try a list of diary entries for your friends when not logged in
get :index, :params => { :friends => true }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/friends"
+ assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends"
# Try a list of diary entries for your friends when logged in
get :index, :params => { :friends => true }, :session => { :user => user }
# Try a list of diary entries for nearby users when not logged in
get :index, :params => { :nearby => true }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/nearby"
+ assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby"
# Try a list of diary entries for nearby users when logged in
get :index, :params => { :nearby => true }, :session => { :user => nearby_user }
{ :controller => "messages", :action => "show", :id => "1" }
)
assert_routing(
- { :path => "/message/mark/1", :method => :post },
+ { :path => "/messages/1/mark", :method => :post },
{ :controller => "messages", :action => "mark", :message_id => "1" }
)
assert_routing(
- { :path => "/message/reply/1", :method => :get },
+ { :path => "/messages/1/reply", :method => :get },
{ :controller => "messages", :action => "reply", :message_id => "1" }
)
assert_routing(
- { :path => "/message/reply/1", :method => :post },
+ { :path => "/messages/1/reply", :method => :post },
{ :controller => "messages", :action => "reply", :message_id => "1" }
)
assert_routing(
- { :path => "/message/delete/1", :method => :post },
- { :controller => "messages", :action => "destroy", :message_id => "1" }
+ { :path => "/messages/1", :method => :delete },
+ { :controller => "messages", :action => "destroy", :id => "1" }
)
end
# Asking to send a message with a bogus user name should fail
get :new, :params => { :display_name => "non_existent_user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
end
# Check that the message reply page requires us to login
get :reply, :params => { :message_id => unread_message.id }
- assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id))
+ assert_redirected_to login_path(:referer => message_reply_path(:message_id => unread_message.id))
# Login as the wrong user
session[:user] = other_user.id
# Check that we can't reply to somebody else's message
get :reply, :params => { :message_id => unread_message.id }
- assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id))
+ 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]
# Login as the right user
sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
# Check that destroying a message requires us to login
- post :destroy, :params => { :message_id => read_message.id }
+ delete :destroy, :params => { :id => read_message.id }
assert_response :forbidden
# Login as a user with no messages
session[:user] = other_user.id
# Check that destroying a message we didn't send or receive fails
- post :destroy, :params => { :message_id => read_message.id }
+ delete :destroy, :params => { :id => read_message.id }
assert_response :not_found
assert_template "no_such_message"
session[:user] = user.id
# Check that the destroy a received message works
- post :destroy, :params => { :message_id => read_message.id }
+ delete :destroy, :params => { :id => read_message.id }
assert_redirected_to inbox_messages_path
assert_equal "Message deleted", flash[:notice]
m = Message.find(read_message.id)
assert_equal false, m.to_user_visible
# Check that the destroying a sent message works
- post :destroy, :params => { :message_id => sent_message.id, :referer => outbox_messages_path }
+ delete :destroy, :params => { :id => sent_message.id, :referer => outbox_messages_path }
assert_redirected_to outbox_messages_path
assert_equal "Message deleted", flash[:notice]
m = Message.find(sent_message.id)
end
# Asking to destroy a message with a bogus ID should fail
- post :destroy, :params => { :message_id => 99999 }
+ delete :destroy, :params => { :id => 99999 }
assert_response :not_found
assert_template "no_such_message"
end
def test_edit
get :edit
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => "/edit"
+ assert_redirected_to :controller => :users, :action => :login, :referer => "/edit"
end
# Test the right editor gets used when the user hasn't set a preference
def test_welcome
get :welcome
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
+ assert_redirected_to :controller => :users, :action => :login, :referer => "/welcome"
get :welcome, :session => { :user => create(:user) }
assert_response :success
# First try to get it when not logged in
get :mine
- assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
+ assert_redirected_to :controller => "users", :action => "login", :referer => "/traces/mine"
# Now try when logged in
get :mine, :session => { :user => user }
# Should get an error if the user does not exist
get :index, :params => { :display_name => "UnknownUser" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
end
# Check a multi-page index
# First with no auth
get :new
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => new_trace_path
+ assert_redirected_to :controller => :users, :action => :login, :referer => new_trace_path
# Now authenticated as a user with gps.trace.visibility set
user = create(:user)
# First with no auth
get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)
+ assert_redirected_to :controller => :users, :action => :login, :referer => edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)
# Now with some other user, which should fail
get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
# We should get an error if no user is specified
get :new
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user does not exist"
# We should get an error if the user doesn't exist
get :new, :params => { :display_name => "non_existent_user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
end
# We should get an error if no user is specified
post :create
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user does not exist"
# We should get an error if the user doesn't exist
post :create, :params => { :display_name => "non_existent_user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
end
# Asking for a list of blocks with a bogus user name should fail
get :blocks_on, :params => { :display_name => "non_existent_user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
# Check the list of blocks for a user that has never been blocked
# Asking for a list of blocks with a bogus user name should fail
get :blocks_by, :params => { :display_name => "non_existent_user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
# Check the list of blocks given by one moderator
post :grant, :params => { :display_name => "non_existent_user", :role => role }
end
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
# Granting a role to a user that already has it should fail
post :revoke, :params => { :display_name => "non_existent_user", :role => role }
end
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
assert_select "h1", "The user non_existent_user does not exist"
# Removing a role from a user that doesn't have it should fail
require "test_helper"
-class UserControllerTest < ActionController::TestCase
+class UsersControllerTest < ActionController::TestCase
def setup
stub_hostip_requests
end
def test_routes
assert_routing(
{ :path => "/api/0.6/user/1", :method => :get },
- { :controller => "user", :action => "api_read", :id => "1" }
+ { :controller => "users", :action => "api_read", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/user/details", :method => :get },
- { :controller => "user", :action => "api_details" }
+ { :controller => "users", :action => "api_details" }
)
assert_routing(
{ :path => "/api/0.6/user/gpx_files", :method => :get },
- { :controller => "user", :action => "api_gpx_files" }
+ { :controller => "users", :action => "api_gpx_files" }
)
assert_routing(
{ :path => "/api/0.6/users", :method => :get },
- { :controller => "user", :action => "api_users" }
+ { :controller => "users", :action => "api_users" }
)
assert_routing(
{ :path => "/login", :method => :get },
- { :controller => "user", :action => "login" }
+ { :controller => "users", :action => "login" }
)
assert_routing(
{ :path => "/login", :method => :post },
- { :controller => "user", :action => "login" }
+ { :controller => "users", :action => "login" }
)
assert_recognizes(
- { :controller => "user", :action => "login", :format => "html" },
+ { :controller => "users", :action => "login", :format => "html" },
{ :path => "/login.html", :method => :get }
)
assert_routing(
{ :path => "/logout", :method => :get },
- { :controller => "user", :action => "logout" }
+ { :controller => "users", :action => "logout" }
)
assert_routing(
{ :path => "/logout", :method => :post },
- { :controller => "user", :action => "logout" }
+ { :controller => "users", :action => "logout" }
)
assert_recognizes(
- { :controller => "user", :action => "logout", :format => "html" },
+ { :controller => "users", :action => "logout", :format => "html" },
{ :path => "/logout.html", :method => :get }
)
assert_routing(
{ :path => "/user/new", :method => :get },
- { :controller => "user", :action => "new" }
+ { :controller => "users", :action => "new" }
)
assert_routing(
{ :path => "/user/new", :method => :post },
- { :controller => "user", :action => "create" }
+ { :controller => "users", :action => "create" }
)
assert_routing(
{ :path => "/user/terms", :method => :get },
- { :controller => "user", :action => "terms" }
+ { :controller => "users", :action => "terms" }
)
assert_routing(
{ :path => "/user/save", :method => :post },
- { :controller => "user", :action => "save" }
+ { :controller => "users", :action => "save" }
)
assert_routing(
{ :path => "/user/username/confirm", :method => :get },
- { :controller => "user", :action => "confirm", :display_name => "username" }
+ { :controller => "users", :action => "confirm", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/confirm", :method => :post },
- { :controller => "user", :action => "confirm", :display_name => "username" }
+ { :controller => "users", :action => "confirm", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/confirm/resend", :method => :get },
- { :controller => "user", :action => "confirm_resend", :display_name => "username" }
+ { :controller => "users", :action => "confirm_resend", :display_name => "username" }
)
assert_routing(
{ :path => "/user/confirm", :method => :get },
- { :controller => "user", :action => "confirm" }
+ { :controller => "users", :action => "confirm" }
)
assert_routing(
{ :path => "/user/confirm", :method => :post },
- { :controller => "user", :action => "confirm" }
+ { :controller => "users", :action => "confirm" }
)
assert_routing(
{ :path => "/user/confirm-email", :method => :get },
- { :controller => "user", :action => "confirm_email" }
+ { :controller => "users", :action => "confirm_email" }
)
assert_routing(
{ :path => "/user/confirm-email", :method => :post },
- { :controller => "user", :action => "confirm_email" }
+ { :controller => "users", :action => "confirm_email" }
)
assert_routing(
{ :path => "/user/go_public", :method => :post },
- { :controller => "user", :action => "go_public" }
+ { :controller => "users", :action => "go_public" }
)
assert_routing(
{ :path => "/user/forgot-password", :method => :get },
- { :controller => "user", :action => "lost_password" }
+ { :controller => "users", :action => "lost_password" }
)
assert_routing(
{ :path => "/user/forgot-password", :method => :post },
- { :controller => "user", :action => "lost_password" }
+ { :controller => "users", :action => "lost_password" }
)
assert_routing(
{ :path => "/user/reset-password", :method => :get },
- { :controller => "user", :action => "reset_password" }
+ { :controller => "users", :action => "reset_password" }
)
assert_routing(
{ :path => "/user/reset-password", :method => :post },
- { :controller => "user", :action => "reset_password" }
+ { :controller => "users", :action => "reset_password" }
)
assert_routing(
{ :path => "/user/suspended", :method => :get },
- { :controller => "user", :action => "suspended" }
+ { :controller => "users", :action => "suspended" }
)
assert_routing(
{ :path => "/user/username", :method => :get },
- { :controller => "user", :action => "show", :display_name => "username" }
+ { :controller => "users", :action => "show", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/account", :method => :get },
- { :controller => "user", :action => "account", :display_name => "username" }
+ { :controller => "users", :action => "account", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/account", :method => :post },
- { :controller => "user", :action => "account", :display_name => "username" }
+ { :controller => "users", :action => "account", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/make_friend", :method => :get },
- { :controller => "user", :action => "make_friend", :display_name => "username" }
+ { :controller => "users", :action => "make_friend", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/make_friend", :method => :post },
- { :controller => "user", :action => "make_friend", :display_name => "username" }
+ { :controller => "users", :action => "make_friend", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/remove_friend", :method => :get },
- { :controller => "user", :action => "remove_friend", :display_name => "username" }
+ { :controller => "users", :action => "remove_friend", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/remove_friend", :method => :post },
- { :controller => "user", :action => "remove_friend", :display_name => "username" }
+ { :controller => "users", :action => "remove_friend", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/set_status", :method => :get },
- { :controller => "user", :action => "set_status", :display_name => "username" }
+ { :controller => "users", :action => "set_status", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/delete", :method => :get },
- { :controller => "user", :action => "delete", :display_name => "username" }
+ { :controller => "users", :action => "delete", :display_name => "username" }
)
assert_routing(
{ :path => "/users", :method => :get },
- { :controller => "user", :action => "index" }
+ { :controller => "users", :action => "index" }
)
assert_routing(
{ :path => "/users", :method => :post },
- { :controller => "user", :action => "index" }
+ { :controller => "users", :action => "index" }
)
assert_routing(
{ :path => "/users/status", :method => :get },
- { :controller => "user", :action => "index", :status => "status" }
+ { :controller => "users", :action => "index", :status => "status" }
)
assert_routing(
{ :path => "/users/status", :method => :post },
- { :controller => "user", :action => "index", :status => "status" }
+ { :controller => "users", :action => "index", :status => "status" }
)
end
# you are not logged in
get :account, :params => { :display_name => user.display_name }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
+ assert_redirected_to :action => "login", :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
# Make sure that you are blocked when not logged in as the right user
get :account, :params => { :display_name => user.display_name }, :session => { :user => create(:user) }
# When not logged in a GET should ask us to login
get :make_friend, :params => { :display_name => friend.display_name }
- assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
+ assert_redirected_to :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
# When not logged in a POST should error
post :make_friend, :params => { :display_name => friend.display_name }
# When not logged in a GET should ask us to login
get :remove_friend, :params => { :display_name => friend.display_name }
- assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
+ assert_redirected_to :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
# When not logged in a POST should error
post :remove_friend, :params => { :display_name => friend.display_name }
get "/login"
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true"
follow_redirect!
assert_response :success
post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{ERB::Util.u(user.display_name)}" }
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/show"
+ assert_template "users/show"
get "/user/#{ERB::Util.u(user.display_name)}/account"
assert_response :success
- assert_template "user/account"
+ assert_template "users/account"
# check that the form to allow new client application creations exists
assert_in_heading do
follow_redirect!
# We should now be at the login page
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
# We can now login
post "/login", :params => { "username" => user.email, "password" => "test" }
assert_response :redirect
get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
end
end
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_equal locale.to_s, response.headers["Content-Language"] unless locale == :root
assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
assert_no_missing_translations
end
end
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
assert_no_missing_translations
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
end
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
end
end
# Check the page
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
ActionMailer::Base.deliveries.clear
# Go to the confirmation page
get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :success
- assert_template "user/confirm"
+ assert_template "users/confirm"
post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
assert_response :redirect
follow_redirect!
# We should now be at the login page
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
# We can now login
post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/diary/new" }
assert_response :redirect
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+ assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :openid_url => "http://localhost:1123/john.doe", :referer => "/history" }
assert_response :redirect
assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+ assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :openid_url => user.auth_uid, :remember_me_openid => true, :referer => "/history" }
assert_response :redirect
assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+ assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :openid_url => user.auth_uid, :referer => "/history" }
assert_response :redirect
assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+ assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :openid_url => user.auth_uid, :referer => "/history" }
assert_response :redirect
assert_redirected_to auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :cookie_test => true, :referer => "/history"
+ assert_redirected_to :controller => :users, :action => :login, :cookie_test => true, :referer => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :openid_url => "http://localhost:1123/fred.bloggs", :referer => "/history" }
assert_response :redirect
assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "span.username", false
end
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "google")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "google")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "google")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "google")
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "span.username", false
end
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "google")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "facebook")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "facebook")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "facebook")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "facebook")
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "span.username", false
end
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "span.username", false
end
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "github")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "github")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "github")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "github")
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "span.username", false
end
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true", "referer" => "/history"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/new"
+ assert_template "users/new"
assert_select "span.username", false
end
def try_password_login(username, password, remember_me = nil)
get "/login"
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :cookie_test => true
+ assert_redirected_to :controller => :users, :action => :login, :cookie_test => true
follow_redirect!
assert_response :success
assert_template "login"
def check_fail(action, user, role)
get "/login"
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true"
follow_redirect!
assert_response :success
post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" }
def check_success(action, user, role)
get "/login"
assert_response :redirect
- assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+ assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true"
follow_redirect!
assert_response :success
post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" }
get "/login"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
assert_response :redirect
# but now we need to look at the terms
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
follow_redirect!
assert_response :success
get "/login"
follow_redirect!
assert_response :success
- assert_template "user/login"
+ assert_template "users/login"
post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
assert_response :redirect
# but now we need to look at the terms
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
# check that if we go somewhere else now, it redirects
# back to the terms page.
get "/traces/mine"
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine"
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/traces/mine"
get "/traces/mine", :params => { :referer => "/diary/new" }
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
end
end
def test_view_issues_not_logged_in
visit issues_path
- assert page.has_content?(I18n.t("user.login.title"))
+ assert page.has_content?(I18n.t("users.login.title"))
end
def test_view_issues_normal_user
visit browse_note_path(note)
assert page.has_content?(note.comments.first.body)
- assert_not page.has_content?(I18n.t("user.show.report"))
+ assert_not page.has_content?(I18n.t("users.show.report"))
end
def test_can_report_user
sign_in_as(create(:user))
visit user_path(user)
- click_on I18n.t("user.show.report")
+ click_on I18n.t("users.show.report")
assert page.has_content? "Report"
assert page.has_content? I18n.t("reports.new.disclaimer.intro")
sign_in_as(create(:user))
visit user_path(user)
- click_on I18n.t("user.show.report")
+ click_on I18n.t("users.show.report")
assert page.has_content? "Report"
assert page.has_content? I18n.t("reports.new.disclaimer.intro")
visit user_path(user)
- click_on I18n.t("user.show.report")
+ click_on I18n.t("users.show.report")
assert page.has_content? "Report"
assert page.has_content? I18n.t("reports.new.disclaimer.intro")
projects / rails.git / commitdiff