/* Rules for the trace view */
-.trace-view {
+.trace-show {
.trace_pending {
color: red;
}
margin-left: 70px;
}
-.user-view {
+.user-show {
// Silly exception; remove when user page is redesigned.
.content-inner {
max-width: none;
}
}
-.diary_entry-view img.user_thumbnail {
+.diary_entry-show img.user_thumbnail {
float: left;
}
before_action :check_database_readable
before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
before_action :require_administrator, :only => [:hide, :hidecomment]
- before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :show, :comments]
+ before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]
def new
@title = t "diary_entry.new.title"
# Subscribe user to diary comments
@diary_entry.subscriptions.create(:user => current_user)
- redirect_to :action => "list", :display_name => current_user.display_name
+ redirect_to :action => "index", :display_name => current_user.display_name
else
render :action => "edit"
end
render :action => "no_such_entry", :status => :not_found
end
- def list
+ def index
if params[:display_name]
@user = User.active.find_by(:display_name => params[:display_name])
if @user
- @title = t "diary_entry.list.user_title", :user => @user.display_name
+ @title = t "diary_entry.index.user_title", :user => @user.display_name
@entries = @user.diary_entries
else
render_unknown_user params[:display_name]
end
elsif params[:friends]
if current_user
- @title = t "diary_entry.list.title_friends"
+ @title = t "diary_entry.index.title_friends"
@entries = DiaryEntry.where(:user_id => current_user.friend_users)
else
require_user
end
elsif params[:nearby]
if current_user
- @title = t "diary_entry.list.title_nearby"
+ @title = t "diary_entry.index.title_nearby"
@entries = DiaryEntry.where(:user_id => current_user.nearby)
else
require_user
@entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
if params[:language]
- @title = t "diary_entry.list.in_language_title", :language => Language.find(params[:language]).english_name
+ @title = t "diary_entry.index.in_language_title", :language => Language.find(params[:language]).english_name
@entries = @entries.where(:language_code => params[:language])
else
- @title = t "diary_entry.list.title"
+ @title = t "diary_entry.index.title"
end
end
@entries = user.diary_entries
@title = t("diary_entry.feed.user.title", :user => user.display_name)
@description = t("diary_entry.feed.user.description", :user => user.display_name)
- @link = url_for :controller => "diary_entry", :action => "list", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+ @link = url_for :controller => "diary_entry", :action => "index", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
else
head :not_found
return
@entries = @entries.where(:language_code => params[:language])
@title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
@description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
- @link = url_for :controller => "diary_entry", :action => "list", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+ @link = url_for :controller => "diary_entry", :action => "index", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
else
@title = t("diary_entry.feed.all.title")
@description = t("diary_entry.feed.all.description")
- @link = url_for :controller => "diary_entry", :action => "list", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+ @link = url_for :controller => "diary_entry", :action => "index", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
end
end
def hide
entry = DiaryEntry.find(params[:id])
entry.update(:visible => false)
- redirect_to :action => "list", :display_name => entry.user.display_name
+ redirect_to :action => "index", :display_name => entry.user.display_name
end
def hidecomment
before_action :require_allow_read_prefs, :only => [:api_details]
before_action :require_allow_read_gpx, :only => [:api_gpx_files]
before_action :require_cookies, :only => [:new, :login, :confirm]
- before_action :require_administrator, :only => [:set_status, :delete, :list]
+ before_action :require_administrator, :only => [:set_status, :delete, :index]
around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
before_action :lookup_user_by_id, :only => [:api_read]
before_action :lookup_user_by_name, :only => [:set_status, :delete]
##
# display a list of users matching specified criteria
- def list
+ def index
if request.post?
ids = params[:user].keys.collect(&:to_i)
if changeset.user.status == "deleted"
t("user.no_such_user.deleted")
elsif changeset.user.data_public?
- link_to(changeset.user.display_name, user_path(changeset.user.display_name))
+ link_to(changeset.user.display_name, user_path(changeset.user))
else
t("browse.anonymous")
end
<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
<h4>
- <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
+ <a class="changeset_id" href="<%= changeset_path(changeset) %>">
<%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
</a>
</h4>
<h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
<small class='deemphasize'>
- <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
+ <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'index', :display_name => nil, :language => diary_entry.language_code)) %>
</small>
</div>
<% end %>
<ul class='secondary-actions clearfix'>
- <% if params[:action] == 'list' %>
+ <% if params[:action] == 'index' %>
<li><%= link_to t('.comment_link'), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'newcomment') %></li>
<li><%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
<li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'comments') %></li>
--- /dev/null
+<%= render :partial => "diary_entry", :object => diary_index_entry %>
+++ /dev/null
-<%= render :partial => "diary_entry", :object => diary_list_entry %>
\ No newline at end of file
<% if @user %>
<%= render :partial => 'diary_entry', :collection => @entries %>
<% else %>
- <%= render :partial => 'diary_list_entry', :collection => @entries %>
+ <%= render :partial => 'diary_index_entry', :collection => @entries %>
<% end %>
<div class="pagination">
xml.channel do
xml.title @title
xml.description @description
- xml.link url_for(:action => "list", :only_path => false)
+ xml.link url_for(:action => "index", :only_path => false)
xml.image do
xml.url image_url("mag_map-rss2.0.png")
xml.title @title
xml.width "100"
xml.height "100"
- xml.link url_for(:action => "list", :only_path => false)
+ xml.link url_for(:action => "index", :only_path => false)
end
@entries.each do |entry|
<% content_for :heading do %>
<div id="userinformation" >
<%= user_image @entry.user %>
- <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
+ <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :index %></h2>
<p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
</div>
<% end %>
<% comments.each do |comment| %>
<div class="comment">
<div style="float:left">
- <%= link_to user_thumbnail(comment.user), user_path(comment.user.display_name) %>
+ <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
- <b> <%= link_to comment.user.display_name, user_path(comment.user.display_name) %> </b> <br/>
+ <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br/>
<%= comment.body %>
</div>
<span class="deemphasize">
<% reports.each do |report| %>
<div class="report">
<div style="float:left">
- <%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>
+ <%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
- <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
+ <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user)) %>
<br/>
<span class="deemphasize">
<%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
<td><%= t ".states.#{issue.status}" %></td>
<td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
- <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user.display_name) if issue.reported_user %></td>
+ <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
<td>
<% if issue.user_updated %>
- <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated.display_name)),
+ <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
:time => distance_of_time_in_words_to_now(issue.updated_at),
:title => l(issue.updated_at) %>
<% else %>
<% end %>
</li>
<li>
- <%= link_to t('user.show.my profile'), user_path(:display_name => current_user.display_name) %>
+ <%= link_to t('user.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 %>
<td>
<p>
<% if user.creation_ip %>
- <%= raw t 'user.list.summary',
+ <%= raw t 'user.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.list.summary_no_ip',
+ <%= raw t 'user.index.summary_no_ip',
:name => link_to(h(user.display_name), user_path(user)),
:date => l(user.creation_time, :format => :friendly)
%>
<span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
</li>
<li>
- <%= link_to t('.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => current_user.display_name %>
+ <%= link_to t('.my diary'), :controller => 'diary_entry', :action => 'index', :display_name => current_user.display_name %>
<span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
</li>
<li>
<%= link_to t('.send message'), new_message_path(@user) %>
</li>
<li>
- <%= link_to t('.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+ <%= link_to t('.diary'), :controller => 'diary_entry', :action => 'index', :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
</li>
<li>
reports:
new:
categories:
+ diary_entry:
+ other_label: Un altre
+ diary_comment:
+ other_label: Un altre
note:
spam_label: Aquesta nota és brossa
personal_label: Aquesta nota conté dades personals
identifiable: Identifiable (mostrat en llista de traça i com a punts d'identificació,
ordenades amb timestamps)
new:
+ upload_trace: Carrega una traça GPS
upload_gpx: 'Carregui l''arxiu GPX:'
description: 'Descripció:'
tags: 'Etiquetes:'
new:
title: New Diary Entry
publish_button: "Publish"
- list:
+ index:
title: "Users' diaries"
title_friends: "Friends' diaries"
title_nearby: "Nearby Users' diaries"
not_a_friend: "%{name} is not one of your friends."
filter:
not_an_administrator: "You need to be an administrator to perform that action."
- list:
+ index:
title: Users
heading: Users
showing:
comment_from: نظر از %{link_user} در %{comment_created_at}
hide_link: پنهان کردن این نظر
confirm: تأیید
+ report: گزارش این نظر
location:
location: 'مکان:'
view: نمایش
index:
reported_user: کاربر گزارششده
reports: گزارشها
+ last_updated_time_html: <abbr title='%{title}'>%{time} پیش</abbr>
+ last_updated_time_user_html: <abbr title='%{title}'>%{time} پیش</abbr> توسط
+ %{user}
link_to_reports: نمایش گزارشها
reports_count:
one: 1 گزارش
other: '%{count} گزارش'
+ reported_item: گزارشها
update:
new_report: گزارشتان با موفقیت ثبت شد
+ successful_update: گزارشتان با موفقیت بهروز شد
+ provide_details: لطفاً جزئیات لازم را ارائه دهید
show:
reports:
zero: گزارشی نیست
javascripts:
close: بستن
share:
- title: بهاشتراکگذاری
+ title: همرسانی
cancel: لغو
image: تصویر
link: پیوند یا اچتیامال
createnote_disabled_tooltip: برای افزودن یادداشت به نقشه بزرگنمایی کنید
map_notes_zoom_in_tooltip: برای دیدن یادداشتهای نقشه بزرگنمایی کنید
map_data_zoom_in_tooltip: برای دیدن دادههای نقشه بزرگنمایی کنید
- queryfeature_tooltip: کوئری ویژگیها
+ queryfeature_tooltip: پرسوجوی ویژگیها
queryfeature_disabled_tooltip: برای پرسوجوی ویژگیها بزرگنمایی کنید
changesets:
show:
models:
acl: Listaxe do control de acceso
changeset: Conxunto de cambios
- changeset_tag: Etiqueta do conxunto de trocos
+ changeset_tag: Etiqueta do conxunto de cambios
country: País
diary_comment: Comentario do diario
diary_entry: Entrada do diario
hidden_commented_by: Comentario oculto de %{user} <abbr title='%{exact_time}'>
hai %{when}</abbr>
commented_by: Comentario de %{user} <abbr title='%{exact_time}'> hai %{when}</abbr>
- changesetxml: Conxunto de trocos XML
+ changesetxml: Conxunto de cambios do XML
osmchangexml: osmChange XML
feed:
title: Conxunto de cambios %{id}
- title_comment: Conxunto de trocos %{id} - %{comment}
+ title_comment: Conxunto de cambios %{id} - %{comment}
join_discussion: Inicia-la sesión pra unirse á parola
discussion: Parola
still_open: O conxunto de cambios segue aberto - Abrirase a parola cando o conxunto
hidden_by: Agochado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
report: Informar desta nota
query:
- title: Consultar as características
+ title: Consulta-las características
introduction: Prema no mapa para atopar características preto de aquí.
nearby: Características preto de aquí
enclosing: Características envolventes
comment: Comentario
area: Zona
index:
- title: Conxuntos de trocos
+ title: Conxuntos de cambios
title_user: Conxuntos de cambios por %{user}
title_friend: Conxuntos de cambios das amizades
- title_nearby: Conxuntos de trocos dos usuarios de lugares preto de ti
+ title_nearby: Conxuntos de cambios dos usuarios de lugares preto de ti
empty: Non se atoparon conxuntos de cambios.
empty_area: Non hai conxuntos de cambios nesta zona.
- empty_user: Non hai conxuntos de trocos deste usuario.
- no_more: Non se atoparon máis conxuntos de trocos.
+ empty_user: Non hai conxuntos de cambios deste usuario.
+ no_more: Non se atoparon máis conxuntos de cambios.
no_more_area: Non hai máis conxuntos de cambios nesta zona.
no_more_user: Non hai máis conxuntos de cambios deste usuario.
load_more: Cargar máis
timeout:
- sorry: Desculpe que levase demasiado tempo obter a listaxe de conxunto de trocos
+ sorry: Desculpe que levase moito tempo obter a listaxe do conxunto de cambios
que solicitou.
rss:
- title_all: Parola de edición en OpenStreetMap
+ title_all: Parola da edición no OpenStreetMap
title_particular: 'Parola da edición #%{changeset_id} en OpenStreetMap'
comment: 'Novo comentario sobre os cambios #%{changeset_id} de %{author}'
commented_at_html: Actualizado hai %{when}
location: 'Localización:'
latitude: 'Latitude:'
longitude: 'Lonxitude:'
- use_map_link: usar o mapa
+ use_map_link: usa-lo mapa
save_button: Gardar
marker_text: Lugar da entrada do diario
show:
subject_other: '[OpenStreetMap] %{commenter} comentou nun conxunto de cambios
no que estás interesado'
your_changeset: '%{commenter} deixou un comentario nun dos seus conxuntos
- de trocos xerado o %{time}'
+ de cambios xerado o %{time}'
commented_changeset: '%{commenter} deixou un comentario nun conxunto de cambios
do mapa que está seguindo, xerado por %{changeset_author} o %{time}'
partial_changeset_with_comment: co comentario '%{changeset_comment}'
partial_changeset_without_comment: sen comentarios
- details: Pódense atopar máis detalles acerca do conxunto de trocos en %{url}.
+ details: Pódense atopar máis detalles acerca do conxunto de cambios en %{url}.
unsubscribe: Para darse de baixa das actualizacións deste conxunto de cambios,
olle %{url} e prema en "darse de baixa".
messages:
subject: Asunto
body: Corpo
send_button: Enviar
- back_to_inbox: Volver á caixa de entrada
+ back_to_inbox: Voltar á caixa de entrada
create:
message_sent: Mensaxe enviada
limit_exceeded: Estivo enviando unha morea de mensaxes recentemente. Agarde
reply_button: Responder
unread_button: Marcar como non lida
destroy_button: Borrar
- back: Volver
+ back: Voltar
to: Para
wrong_user: Accedeu ao sistema como "%{user}", pero a mensaxe que pediu ler
non lla enviou a ese usuario ou el non lla enviou a vostede. Acceda co usuario
english_link: a orixinal en inglés
native:
title: Acerca desta páxina
- text: Estás vendo a versión en inglés da páxina de dereitos de autor. Pode
- volver á %{native_link} desta páxina ou pode deixar de ler sobre os dereitos
+ text: Estás ollando a versión en inglés da páxina de dereitos de autor. Pode
+ voltar á %{native_link} desta páxina ou pode deixar de ler sobre os dereitos
de autor e %{mapping_link}.
native_link: versión en galego
mapping_link: comezar a contribuír
title: Exemplo de recoñecemento
more_title_html: Máis información
more_1_html: |-
- Desc
ubra máis sobre como empregar os nosos datos e como acreditarnos na <a
- href="https://osmfoundation.org/Licence">páxina de licenza de OSMF</a>.
+ Desc
obra máis sobre de que xeito emprega-los nosos datos e como acreditarnos na <a
+ href="https://osmfoundation.org/Licence">páxina de licenza do OSMF</a>.
more_2_html: |-
- Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un
- mapa API gratuíto aos desenvolvedores.
+ Malia que o OpenStreetMap é de datos abertos, non podemos fornecer un
+ mapa API de balde aos desenvolvedores.
Vexa a <a href="https://operations.osmfoundation.org/policies/api/">política de uso da API</a>,
a <a href="https://operations.osmfoundation.org/policies/tiles/">política de uso de cuadrantes</a>
e a <a href="https://operations.osmfoundation.org/policies/nominatim/">política de uso do Nominatim</a>.
not_public_description: Non pode edita-lo mapa a menos que o faga. Pode establece-las
súas edicións coma públicas dende a súa %{user_page}.
user_page_link: páxina de usuario
- anon_edits_link_text: Descubra aquí o motivo.
+ anon_edits_link_text: Descobra velaquí o motivo.
flash_player_required: Precisa un reprodutor Flash para usar Potlatch, o editor
Flash de OpenStreetMap. Pode <a href="https://get.adobe.com/flashplayer/">descargar
Flash do sitio Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Tamén
están dispoñíbeis outras opcións</a> para editar OpenStreetMap.
- potlatch_unsaved_changes: Ten trocos sen gardar. (Para gardalos no Potlatch
+ potlatch_unsaved_changes: Ten cambios sen gardar. (Para gardalos no Potlatch
ten que desmarcar o camiño actual ou o punto se está a editar no modo en vivo
ou premer sobre o botón "Gardar".)
potlatch2_not_configured: O Potlatch 2 non está configurado; consulte https://wiki.openstreetmap.org/wiki/The_Rails_Port
paragraph_1_html: O OpenStreetMap ten unha xerga propia. Velaquí hai unhas
palabras clave que son de utilidade.
editor_html: Un <strong>editor</strong> é un programa ou sitio web que pode
- usar para editar o mapa.
+ empregar para edita-lo mapa.
node_html: Un <strong>nó</strong> é un punto no mapa, coma un restaurante
ou unha árbore.
way_html: Un <strong>camiño</strong> é unha liña ou área, como unha estrada,
rules:
title: Regras!
paragraph_1_html: OpenStreetMap ten poucas regras formais, pero esperamos
- que tódolos participantes colaboraren e se comuniquen ca comunidade. Se
- estás a considerar algunha actividade que non sexa a edición manual, le
-
e segue as instrucións sobre <a href='https://wiki.openstreetmap.<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'></a>org/wiki/Import/Guidelines'>importacións</a>
+ que tódolos participantes contribúan e se comuniquen ca comunidade. Se estás
+ a estudar algunha actividade que non sexa a edición manual, le e segue as
+ instrucións sobre <a href='https://wiki.openstreetmap.<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'></a>org/wiki/Import/Guidelines'>importacións</a>
e <a href='https://wiki.openstreetmap.org/wiki/Import/Automated_Edits_code_of_conduct'>edicións
automatizadas</a>.
questions:
na base de datos. Isto adoita ocorrer nun período de tempo de media hora.
Recibirá un correo electrónico cando remate.
upload_failed: Desculpa, a subida GPX fallou. Avisouse a un administrador do
- erro. Inténteo de novo.
+ erro. Ténteo de novo.
traces_waiting:
one: Ten %{count} pista á espera de ser cargada. Considere agardar a que remate
antes de cargar máis para non bloquear a cola do resto de usuarios.
blocked: O seu acceso á API foi bloqueado. Acceda ao sistema para atopar máis
información na interface web.
need_to_see_terms: O seu acceso á API está suspendido temporalmente. Acceda
- ao sistema para ollar os termos do colaborador. Non ten que aceptalos, pero
+ ao sistema para ollar os termos do contribuínte. Non ten que aceptalos, pero
debe coñecelos.
oauth:
authorize:
html: |-
<p>A diferenza doutros mapas, o OpenStreetMap está completamente creado por xente coma vostede, e calquera persoa é libre de corrixilo, actualizalo, descargalo e utilizalo.</p>
<p>Rexístrese para comezar a contribuír. Enviarémoslle un correo electrónico para confirmar a súa conta.</p>
- license_agreement: Cando confirme a súa conta necesitará acepta
r os <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">termos
- do colaborador</a>.
+ license_agreement: Cando confirme a súa conta necesitará acepta
-los <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">termos
+ do contribuínte</a>.
email address: 'Enderezo de correo electrónico:'
confirm email address: Confirma-lo enderezo de correo electrónico
not displayed publicly: O seu enderezo IP non se amosa publicamente, vexa a
auth no password: Coa autenticación de terceiros non se precisa un contrasinal,
aínda que hai algunhas ferramentas e servidores que aínda a solicitan.
continue: Rexistrarse
- terms accepted: Grazas por aceptar os novos termos do colaborador!
- terms declined: Sentimos que decidise non aceptar os novos Termos do colaborador.
+ terms accepted: Grazas por acepta-los novos termos do contribuínte!
+ terms declined: Sentimos que decidise non acepta-los novos Termos do contribuínte.
Para obter máis información, consulte <a href="%{url}">esta páxina wiki</a>.
terms:
- title: Termos do colaborador
- heading: Termos do colaborador
+ title: Termos do contribuínte
+ heading: Termos do contribuínte
read and accept: Por favor, lea o acordo seguinte e prema no botón "Aceptar"
para confirmar que acepta os termos deste acordo para as súas contribucións
anteriores e futuras.
e algunhas <a href="%{translations}">traducións non oficiais</a>'
agree: Acepto
decline: Rexeitar
- you need to accept or decline: Lea e, a continuación, acepte ou rexeite os novos
- Termos do colaborador para continuar.
+ you need to accept or decline: Lea e, deseguido, acepte ou rexeite os novos
+ Termos do contribuínte para proseguer.
legale_select: 'Seleccione o seu país de residencia:'
legale_names:
france: Francia
add as friend: Engadir coma amizade
mapper since: 'Cartógrafo dende:'
ago: (hai %{time_in_words_ago})
- ct status: 'Termos do colaborador:'
+ ct status: 'Termos do contribuínte:'
ct undecided: Indeciso
ct declined: Rexeitou
ct accepted: Aceptou hai %{ago}
deactivate_user: Desactivar este usuario
confirm_user: Confirmar este usuario
hide_user: Agochar este usuario
- unhide_user: Descubrir este usuario
+ unhide_user: Descobrir este usuario
delete_user: Borrar este usuario
confirm: Confirmar
friends_changesets: conxuntos de cambios das amizades
friends_diaries: entradas de diario das amizades
- nearby_changesets: conxuntos de trocos dos usuarios de lugares que están preto
- de ti
+ nearby_changesets: conxuntos de cambios dos usuarios de lugares preto de ti
nearby_diaries: entradas de diario dos usuarios de lugares preto de ti
report: Denunciar este usuario
popup:
públicos.</li><li>Non é posíbel reverter esta acción e agora os novos usuarios
xa son públicos por defecto.</li></ul>
contributor terms:
- heading: 'Termos do colaborador:'
- agreed: Aceptou os novos termos do colaborador.
- not yet agreed: Aínda non aceptou os novos termos do colaborador.
- review link text: Siga esta ligazón para revisar e aceptar os novos termos
- do colaborador.
+ heading: 'Termos do contribuínte:'
+ agreed: Aceptou os novos termos do contribuínte.
+ not yet agreed: Aínda non aceptou os novos termos do contribuínte.
+ review link text: Siga esta ligazón para revisar e acepta-los novos termos
+ do contribuínte.
agreed_with_pd: Tamén declarou que considera que as súas edicións pertencen
ao dominio público.
link text: que é isto?
preferred editor: 'Editor preferido:'
image: 'Imaxe:'
gravatar:
- gravatar: Usar Gravatar
+ gravatar: Emprega-lo Gravatar
link: http://wiki.openstreetmap.org/wiki/Gravatar
link text: que é isto?
disabled: Gravatar foi desactivado.
enabled: A visualización do seu Gravatar foi activada.
new image: Engadir unha imaxe
- keep image: Manter a imaxe actual
- delete image: Eliminar a imaxe actual
- replace image: Substituír a imaxe actual
+ keep image: Mante-la imaxe actual
+ delete image: Elimina-la imaxe actual
+ replace image: Substituí-la imaxe actual
image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor)
home location: 'Lugar de orixe:'
no home location: Non inseriu o seu lugar de orixe.
latitude: 'Latitude:'
longitude: 'Lonxitude:'
- update home location on click: Quere actualizar o domicilio ao premer sobre
- o mapa?
+ update home location on click: Quere actualiza-lo lugar do enderezo ó premer
+ sobre o mapa?
save changes button: Garda-los cambios
make edits public button: Facer públicas todas as miñas edicións
- return to profile: Volver ao perfil
+ return to profile: Voltar ó perfil
flash update success confirm needed: Información de usuario actualizada correctamente.
Procura no teu correo electrónico unha mensaxe para confirma-lo teu novo enderezo.
flash update success: Información de usuario actualizada correctamente.
proceso sen problemas.
failure: Non se atopou o usuario "%{name}".
confirm_email:
- heading: Confirma-lo troco do enderezo de correo electrónico
+ heading: Confirma-lo cambio do enderezo de correo electrónico
press confirm button: Prema sobre o botón de confirmación que aparece deseguido
para confirmar o seu novo enderezo de correo electrónico.
button: Confirmar
non_moderator_revoke: Cómpre ser moderador para revogar un bloqueo.
not_found:
sorry: Non se puido atopar o bloqueo de usuario número %{id}.
- back: Volver ao índice
+ back: Voltar ó índice
new:
title: Creando un bloqueo a %{name}
heading: Creando un bloqueo a %{name}
comúns.
period: Por canto tempo, a partir de agora, o usuario terá bloqueado o uso da
API?
- submit: Actualizar o bloqueo
+ submit: Actualiza-lo bloqueo
show: Ollar este bloqueo
back: Ollar tódolos bloqueos
needs_view: O usuario ten que acceder ao sistema antes de que o bloqueo sexa
center_marker: Centrar o mapa no marcador
paste_html: Pegue o código HTML para incluílo na páxina web
view_larger_map: Ver un mapa máis grande
- only_standard_layer: Só a capa estándar pode exportarse como unha imaxe
+ only_standard_layer: Só a capa estándar pode exportarse coma unha imaxe
embed:
report_problem: Informar sobre un problema
key:
title: Amosa-la miña localización
popup: Está a {distance} {unit} deste punto
base:
- standard: Estándar
+ standard: Mapa estándar
cycle_map: Mapa ciclista
- transport_map: Mapa de transporte
- hot: Humanitario
+ transport_map: Mapa do transporte
+ hot: Mapa humanitario
layers:
header: Capas do mapa
notes: Notas do mapa
data: Datos do mapa
gps: Trazas GPS públicas
- overlays: Activar a sobreposición para reparar o mapa
+ overlays: Activa-las sobreposicións para solucionares os problemas no mapa
title: Capas
copyright: © <a href='%{copyright_url}'>Contribuíntes do OpenStreetMap</a>
donate_link_text: <a class='donate-attr' href='%{donate_url}'>Facer unha doazón</a>
site:
edit_tooltip: Edita-lo mapa
edit_disabled_tooltip: Achegue para edita-lo mapa
- createnote_tooltip: Engadir unha nota ao mapa
+ createnote_tooltip: Engadir unha nota ó mapa
createnote_disabled_tooltip: Achegar o mapa para engadirlle unha nota
map_notes_zoom_in_tooltip: Achegar para veres as notas do mapa
map_data_zoom_in_tooltip: Achegar para ver os datos do mapa
- queryfeature_tooltip: Consultar as características
+ queryfeature_tooltip: Consulta-las características
queryfeature_disabled_tooltip: Achegar para consulta-las características
changesets:
show:
unhide_comment: amosar
notes:
new:
- intro: Atopou un erro ou descubriu que falta algún dato? Informe aos outros
+ intro: Atopou un erro ou descobriu que falla algún dato? Informe ós outros
cartógrafos para que poidamos solucionalo. Mova o marcador á posición correcta
- e escriba unha nota explicando o problema.
- advice: A túa nota será pública e poderá empregarse para actualizar o mapa,
+ e escriba unha nota expoñendo o problema.
+ advice: A túa nota será pública e poderá empregarse para actualiza-lo mapa,
por conseguinte, non insiras información persoal, nin datos de mapas protexidos
por dereitos de autoría ou listaxes de directorios.
add: Engadir a nota
display_name: ឈ្មោះអេក្រង់ (Display name)
description: បរិយាយ
languages: ភាសា
- pass_crypt: á\9e\9bá\9f\81á\9e\81â\80\8bá\9e\9fá\9e\98á\9f\92á\9e\84á\9e¶á\9e\8fá\9f\8bâ\80\8b
+ pass_crypt: á\9e\96á\9e¶á\9e\80á\9f\92á\9e\99â\80\8bá\9e\9fá\9e\98á\9f\92á\9e\84á\9e¶á\9e\8fá\9f\8b
browse:
created: បានបង្កើត
closed: បានបិទ
deleted_by_html: បានលុបចោល <abbr title='%{title}'>%{time} មុន</abbr> ដោយ %{user}
edited_by_html: បានកែប្រែ <abbr title='%{title}'>%{time} មុន</abbr> ដោយ %{user}
closed_by_html: បានបិទ <abbr title='%{title}'>%{time} មុន</abbr> ដោយ %{user}
+ version: កំណែ
in_changeset: សំណុំបន្លាស់ប្ដូរ
anonymous: អនាមិក
no_comment: (គ្មានមតិយោបល់)
way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
relation: ទំនាក់ទំនងចំនួន (%{count})
relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
+ comment: មតិយោបល់ (%{count})
changesetxml: សំណុំបន្លាស់ប្ដូរ XML
feed:
title: សំណុំបន្លាស់ប្ដូរ %{id}
- title_comment: á\9e\9fá\9f\86á\9e\93á\9e»á\9f\86â\80\8bá\9e\94á\9f\86លាស់ប្តូរ %{id} - %{comment}
+ title_comment: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92លាស់ប្តូរ %{id} - %{comment}
join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា
+ discussion: ការពិភាក្សា
node:
title: ខ្នែង៖ %{name}
history_title: ប្រវត្តិខ្នែង៖ %{name}
geonames: លទ្ធផលពី <a href="http://www.geonames.org/">GeoNames</a>
search_osm_nominatim:
prefix:
+ aerialway:
+ cable_car: ឡានយោង
+ chair_lift: កៅអីយោង
+ pylon: ប៉មខ្សែភ្លើង
amenity:
arts_centre: មជ្ឍមណ្ឌលសិល្បៈ
atm: ATM
motorway_link: ផ្លូវល្បឿនលឿន
rest_area: កន្លែងសម្រាក
road: ផ្លូវ
+ steps: ជណ្ដើរ
stop: ផ្លាកសញ្ញាឈប់
street_lamp: ភ្លើងបំភ្លឺផ្លូវ
traffic_signals: ភ្លើងសញ្ញាចរាចរណ៍
vineyard: ចំការទំពាំងបាយជូរ
leisure:
beach_resort: ឆ្នេរកំសាន្ត
+ bird_hide: ខ្ទមមើលបក្សី
common: ដីរួម
+ firepit: ចង្ក្រាន
fishing: តំបន់ស្ទូចត្រី
fitness_centre: មណ្ឌលហាត់ប្រាណ
fitness_station: ស្ថានីយ៍ហាត់ប្រាណ
stadium: កីឡាដ្ឋាន
swimming_pool: អាងហែលទឹក
water_park: ឧទ្យានទឹក
+ man_made:
+ bridge: ស្ពាន
+ bunker_silo: ត្រង់សេ
+ chimney: បំពង់ផ្សែង
+ dyke: ទំនប់
+ flagpole: បង្គោលទង់ជាតិ
+ kiln: ឡ
+ petroleum_well: អណ្ដូងប្រេង
+ wastewater_plant: ស្ថានីយ៍សម្អាតទឹក
+ water_tower: ប៉មទឹក
+ water_well: អណ្ដូង
military:
airfield: មូលដ្ឋានទ័ពអាកាស
+ bunker: ត្រង់សេ
+ "yes": មូលដ្ឋានយោធា
+ mountain_pass:
+ "yes": ផ្លូវភ្នំ
natural:
bay: ឆកសមុទ្រ
beach: ឆ្នេរខ្សាច់
cliff: ជ្រោះ
crater: មាត់ភ្នំភ្លើង
dune: ភ្នំខ្សាច់
+ forest: ព្រៃ
hill: កូនភ្នំ
island: កោះ
land: ដី
mud: ភក់
peak: កំពូល
point: ចំនុច
+ spring: ទឹកផុស
strait: ដៃសមុទ្រ
tree: ដើមឈើ
valley: ជ្រលងភ្នំ
insurance: ការិយាល័យធានារ៉ាប់រង
it: ការិយាល័យព័តមានវិទ្យា
lawyer: មេធាវី
- ngo: ការិយាល័យ NGO
+ ngo: ការិយាល័យអង្គការ
telecommunication: ការិយាល័យទូរគមនាគមន៍
travel_agent: ភ្នាក់ងារទេសចរណ៍
"yes": ការិយាល័យ
gallery: វិចិត្រសាល
gift: ហាងវត្ថុអនុស្សាវរីយ៍
greengrocer: ហាងបន្លែនិងផ្លែឈើ
+ grocery: ហាងចំណីអាហារ
hairdresser: ហាងកាត់សក់និងអ៊ុតសក់
jewelry: ហាងលក់គ្រឿងអល័ង្ការ
laundry: ហាងបោកអ៊ុត
+ market: ផ្សារ
massage: ហាងម៉ាស្សា
mobile_phone: ហាងទូរស័ព្ទ
motorcycle: ហាងទោចក្រយានយន្ត
music: ហាងតន្ត្រី
newsagent: ហាងកាសែត
optician: ហាងវ៉ែនតា
+ pawnbroker: ហាងបញ្ចាំ
+ pet: ហាងសត្វចិញ្ចឹម
+ pharmacy: ឱសថស្ថាន
+ photo: ហាងថតរូប
+ seafood: ហាងគ្រឿងសមុទ្រ
+ second_hand: ហាងជជុះ
+ shoes: ហាងស្បែកជើង
+ sports: ហាងសម្ភារៈកីឡា
+ stationery: បណ្ណាគារ
+ supermarket: ផ្សារទំនើប
+ tailor: ហាងកាត់ដេរ
+ ticket: ហាងសំបុត្រ
+ tobacco: ហាងបារី
+ travel_agency: ភ្នាក់ងារទេសចរណ៍
+ tyres: ហាងកង់ឡាន
tourism:
camp_site: កន្លែងបោះតង់
caravan_site: កន្លែងចតឡានបោះតង់
+ guest_house: ផ្ទះសំណាក់
+ hostel: ផ្ទះសំណាក់
+ hotel: សណ្ឋាគារ
+ museum: សារមន្ទីរ
+ zoo: សួនសត្វ
+ waterway:
+ canal: ព្រែកជីក
description:
types:
cities: ក្រុង
user_title: Dagboek van %{user}
in_language_title: Dagboekberichten in het %{language}
new: Nieuw dagboekbericht
- new_title: Nieuw bericht in uw dagboek schrijven
+ new_title: Nieuw bericht in mijn dagboek schrijven
no_entries: Het dagboek is leeg
recent_entries: Recente dagboekberichten
older_entries: Oudere berichten
feed:
title: Скуп измена %{id}
title_comment: Скуп измена %{id} – %{comment}
- join_discussion: Пријавите се да бисте се укључили у разговор
- discussion: РазговоÑ\80
+ join_discussion: Пријавите се да бисте се придружили дискусији
+ discussion: Ð\94иÑ\81кÑ\83Ñ\81иÑ\98а
node:
title: 'Тачка: %{name}'
history_title: 'Историја тачака: %{name}'
timeout:
sorry: Нажалост, преузимање траженог списка измена предуго траје.
rss:
- title_all: РазговоÑ\80 о скупу измена OpenStreetMap-а
- title_particular: 'РазговоÑ\80 о скупу измена #%{changeset_id} OpenStreetMap-а'
+ title_all: Ð\94иÑ\81кÑ\83Ñ\81иÑ\98а о скупу измена OpenStreetMap-а
+ title_particular: 'Ð\94иÑ\81кÑ\83Ñ\81иÑ\98а о скупу измена #%{changeset_id} OpenStreetMap-а'
comment: Нови коментар на скуп измена бр. %{changeset_id} корисника %{author}
commented_at_html: Ажурирано пре %{when}
commented_at_by_html: Ажурирао %{user} пре %{when}
- full: ЦелокÑ\83пан Ñ\80азговоÑ\80
+ full: Цела диÑ\81кÑ\83Ñ\81иÑ\98а
diary_entry:
new:
title: Нови дневнички запис
табле.
irc:
title: IRC
- description: Интерактивни разговор на многим језицима и на многе теме.
+ description: Интерактивно ћаскање на много различитих језицима и на многе
+ теме.
switch2osm:
title: switch2osm
description: Помоћ за компаније и организације које прелазе на мапе засноване
trace_uploaded: Din GPX-fil har laddats upp och väntar på att lagras i databasen.
Detta sker vanligtvis inom en halvtimme. När den är klar skickas en e-post
till dig.
+ upload_failed: Tyvärr, GPX-uppladdningen misslyckades. En administratör har
+ meddelats om felet. Försök igen
traces_waiting:
one: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna på
att detta blir klart innan du laddar upp fler, så att du inte blockerar
save_button: Spara ändringar
visibility: 'Synlighet:'
visibility_help: vad betyder detta?
+ update:
+ updated: Spår uppdaterades
trace_optionals:
tags: Taggar
show:
remember: จดจำฉันไว้ในระบบ
lost password link: ลืมรหัสผ่านหรือ?
login_button: ลงชื่อเข้าใช้
- register now: ลà¸\87à¸\97ะà¹\80à¸\9aียà¸\99à¸\81à¹\88à¸à¸\99à¹\80ลย
+ register now: สมัà¸\84รà¹\80ลย!
with username: มีบัญชี OpenStreetMap แล้วหรือยัง? ถ้ามีโปรดเข้าระบบด้วยชื่อผู้ใช้และรหัสผ่านที่ท่านมี
with external: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้
new to osm: เพิ่งเริ่มใช้ OpenStreetMap หรือ?
# diary pages
match "/diary/new" => "diary_entry#new", :via => [:get, :post]
- get "/diary/friends" => "diary_entry#list", :friends => true, :as => "friend_diaries"
- get "/diary/nearby" => "diary_entry#list", :nearby => true, :as => "nearby_diaries"
+ get "/diary/friends" => "diary_entry#index", :friends => true, :as => "friend_diaries"
+ get "/diary/nearby" => "diary_entry#index", :nearby => true, :as => "nearby_diaries"
get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss }
get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/
get "/user/:display_name/diary/comments/" => "diary_entry#comments"
- get "/user/:display_name/diary" => "diary_entry#list"
- get "/diary/:language" => "diary_entry#list"
- get "/diary" => "diary_entry#list"
+ get "/user/:display_name/diary" => "diary_entry#index"
+ get "/diary/:language" => "diary_entry#index"
+ get "/diary" => "diary_entry#index"
get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry
post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
get "/user/:display_name/delete" => "user#delete", :as => :delete_user
# user lists
- match "/users" => "user#list", :via => [:get, :post]
- match "/users/:status" => "user#list", :via => [:get, :post]
+ match "/users" => "user#index", :via => [:get, :post]
+ match "/users/:status" => "user#index", :via => [:get, :post]
# geocoder
get "/search" => "geocoder#search"
def test_routes
assert_routing(
{ :path => "/diary", :method => :get },
- { :controller => "diary_entry", :action => "list" }
+ { :controller => "diary_entry", :action => "index" }
)
assert_routing(
{ :path => "/diary/language", :method => :get },
- { :controller => "diary_entry", :action => "list", :language => "language" }
+ { :controller => "diary_entry", :action => "index", :language => "language" }
)
assert_routing(
{ :path => "/user/username/diary", :method => :get },
- { :controller => "diary_entry", :action => "list", :display_name => "username" }
+ { :controller => "diary_entry", :action => "index", :display_name => "username" }
)
assert_routing(
{ :path => "/diary/friends", :method => :get },
- { :controller => "diary_entry", :action => "list", :friends => true }
+ { :controller => "diary_entry", :action => "index", :friends => true }
)
assert_routing(
{ :path => "/diary/nearby", :method => :get },
- { :controller => "diary_entry", :action => "list", :nearby => true }
+ { :controller => "diary_entry", :action => "index", :nearby => true }
)
assert_routing(
:session => { :user => user.id }
end
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => user.display_name
+ assert_redirected_to :action => :index, :display_name => user.display_name
entry = DiaryEntry.order(:id).last
assert_equal user.id, entry.user_id
assert_equal "New Title", entry.title
:session => { :user => user.id }
end
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => user.display_name
+ assert_redirected_to :action => :index, :display_name => user.display_name
entry = DiaryEntry.order(:id).last
assert_equal user.id, entry.user_id
assert_equal "New Title", entry.title
:session => { :user => user.id }
end
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => user.display_name
+ assert_redirected_to :action => :index, :display_name => user.display_name
entry = DiaryEntry.order(:id).last
assert_equal user.id, entry.user_id
assert_equal spammy_title, entry.title
assert_equal "suspended", User.find(user.id).status
# Follow the redirect
- get :list,
+ get :index,
:params => { :display_name => user.display_name },
:session => { :user => user }
assert_response :redirect
assert_equal "suspended", User.find(other_user.id).status
# Follow the redirect
- get :list,
+ get :index,
:params => { :display_name => user.display_name },
:session => { :user => other_user }
assert_response :redirect
assert_select ".diary-comment", :count => 0
end
- def test_list_all
+ def test_index_all
diary_entry = create(:diary_entry)
geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
public_entry = create(:diary_entry, :user => create(:user))
# Try a list of all diary entries
- get :list
- check_diary_list diary_entry, geo_entry, public_entry
+ get :index
+ check_diary_index diary_entry, geo_entry, public_entry
end
- def test_list_user
+ def test_index_user
user = create(:user)
other_user = create(:user)
_other_entry = create(:diary_entry, :user => other_user)
# Try a list of diary entries for a valid user
- get :list, :params => { :display_name => user.display_name }
- check_diary_list diary_entry, geo_entry
+ get :index, :params => { :display_name => user.display_name }
+ check_diary_index diary_entry, geo_entry
# Try a list of diary entries for an invalid user
- get :list, :params => { :display_name => "No Such User" }
+ get :index, :params => { :display_name => "No Such User" }
assert_response :not_found
assert_template "user/no_such_user"
end
- def test_list_friends
+ def test_index_friends
user = create(:user)
other_user = create(:user)
friend = create(:friend, :befriender => user)
_other_entry = create(:diary_entry, :user => other_user)
# Try a list of diary entries for your friends when not logged in
- get :list, :params => { :friends => true }
+ get :index, :params => { :friends => true }
assert_response :redirect
assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/friends"
# Try a list of diary entries for your friends when logged in
- get :list, :params => { :friends => true }, :session => { :user => user }
- check_diary_list diary_entry
- get :list, :params => { :friends => true }, :session => { :user => other_user }
- check_diary_list
+ get :index, :params => { :friends => true }, :session => { :user => user }
+ check_diary_index diary_entry
+ get :index, :params => { :friends => true }, :session => { :user => other_user }
+ check_diary_index
end
- def test_list_nearby
+ def test_index_nearby
user = create(:user, :home_lat => 12, :home_lon => 12)
nearby_user = create(:user, :home_lat => 11.9, :home_lon => 12.1)
diary_entry = create(:diary_entry, :user => user)
# Try a list of diary entries for nearby users when not logged in
- get :list, :params => { :nearby => true }
+ get :index, :params => { :nearby => true }
assert_response :redirect
assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/nearby"
# Try a list of diary entries for nearby users when logged in
- get :list, :params => { :nearby => true }, :session => { :user => nearby_user }
- check_diary_list diary_entry
- get :list, :params => { :nearby => true }, :session => { :user => user }
- check_diary_list
+ get :index, :params => { :nearby => true }, :session => { :user => nearby_user }
+ check_diary_index diary_entry
+ get :index, :params => { :nearby => true }, :session => { :user => user }
+ check_diary_index
end
- def test_list_language
+ def test_index_language
create(:language, :code => "de")
create(:language, :code => "sl")
diary_entry_en = create(:diary_entry, :language_code => "en")
diary_entry_de = create(:diary_entry, :language_code => "de")
# Try a list of diary entries in english
- get :list, :params => { :language => "en" }
- check_diary_list diary_entry_en, diary_entry_en2
+ get :index, :params => { :language => "en" }
+ check_diary_index diary_entry_en, diary_entry_en2
# Try a list of diary entries in german
- get :list, :params => { :language => "de" }
- check_diary_list diary_entry_de
+ get :index, :params => { :language => "de" }
+ check_diary_index diary_entry_de
# Try a list of diary entries in slovenian
- get :list, :params => { :language => "sl" }
- check_diary_list
+ get :index, :params => { :language => "sl" }
+ check_diary_index
end
- def test_list_paged
+ def test_index_paged
# Create several pages worth of diary entries
create_list(:diary_entry, 50)
- # Try and get the list
- get :list
+ # Try and get the index
+ get :index
assert_response :success
assert_select "div.diary_post", :count => 20
# Try and get the second page
- get :list, :params => { :page => 2 }
+ get :index, :params => { :page => 2 }
assert_response :success
assert_select "div.diary_post", :count => 20
end
:params => { :display_name => user.display_name, :id => diary_entry.id },
:session => { :user => create(:administrator_user) }
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => user.display_name
+ assert_redirected_to :action => :index, :display_name => user.display_name
assert_equal false, DiaryEntry.find(diary_entry.id).visible
end
private
- def check_diary_list(*entries)
+ def check_diary_index(*entries)
assert_response :success
- assert_template "list"
+ assert_template "index"
assert_no_missing_translations
assert_select "div.diary_post", entries.count
}
end
assert_response :redirect
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
end
def test_new_report_with_incomplete_details
}
end
assert_response :redirect
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
issue = Issue.last
}
end
assert_response :redirect
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
issue = Issue.last
assert_select "item", :count => traces.length do |items|
traces.zip(items).each do |trace, item|
assert_select item, "title", trace.name
- assert_select item, "link", "http://test.host/user/#{trace.user.display_name.gsub(' ', '%20')}/traces/#{trace.id}"
- assert_select item, "guid", "http://test.host/user/#{trace.user.display_name.gsub(' ', '%20')}/traces/#{trace.id}"
+ assert_select item, "link", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
+ assert_select item, "guid", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
assert_select item, "description"
# assert_select item, "dc:creator", trace.user.display_name
assert_select item, "pubDate", trace.timestamp.rfc822
# Check that the block edit page requires us to login
get :edit, :params => { :id => active_block.id }
- assert_redirected_to login_path(:referer => edit_user_block_path(:id => active_block.id))
+ assert_redirected_to login_path(:referer => edit_user_block_path(active_block))
# Login as a normal user
session[:user] = create(:user).id
:user_block_period => "12",
:user_block => { :needs_view => true, :reason => "Vandalism" } }
end
- assert_redirected_to edit_user_block_path(:id => active_block.id)
+ assert_redirected_to edit_user_block_path(active_block)
assert_equal "Only the moderator who created this block can edit it.", flash[:error]
# Login as the correct moderator
:params => { :id => active_block.id,
:user_block_period => "99" }
end
- assert_redirected_to edit_user_block_path(:id => active_block.id)
+ assert_redirected_to edit_user_block_path(active_block)
assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
# Check that updating a block works
:user_block_period => "12",
:user_block => { :needs_view => true, :reason => "Vandalism" } }
end
- assert_redirected_to user_block_path(:id => active_block.id)
+ assert_redirected_to user_block_path(active_block)
assert_equal "Block updated.", flash[:notice]
b = UserBlock.find(active_block.id)
assert_in_delta Time.now, b.updated_at, 1
# Check that revoking a block works
post :revoke, :params => { :id => active_block.id, :confirm => true }
- assert_redirected_to user_block_path(:id => active_block.id)
+ assert_redirected_to user_block_path(active_block)
b = UserBlock.find(active_block.id)
assert_in_delta Time.now, b.ends_at, 1
assert_routing(
{ :path => "/users", :method => :get },
- { :controller => "user", :action => "list" }
+ { :controller => "user", :action => "index" }
)
assert_routing(
{ :path => "/users", :method => :post },
- { :controller => "user", :action => "list" }
+ { :controller => "user", :action => "index" }
)
assert_routing(
{ :path => "/users/status", :method => :get },
- { :controller => "user", :action => "list", :status => "status" }
+ { :controller => "user", :action => "index", :status => "status" }
)
assert_routing(
{ :path => "/users/status", :method => :post },
- { :controller => "user", :action => "list", :status => "status" }
+ { :controller => "user", :action => "index", :status => "status" }
)
end
assert_difference "ActionMailer::Base.deliveries.size", 1 do
post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
end
- assert_redirected_to user_path(:display_name => friend.display_name)
+ assert_redirected_to user_path(friend)
assert_match(/is now your friend/, flash[:notice])
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
email = ActionMailer::Base.deliveries.first
assert_no_difference "ActionMailer::Base.deliveries.size" do
post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
end
- assert_redirected_to user_path(:display_name => friend.display_name)
+ assert_redirected_to user_path(friend)
assert_match(/You are already friends with/, flash[:warning])
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end
# When logged in a POST should remove the friendship
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
- assert_redirected_to user_path(:display_name => friend.display_name)
+ assert_redirected_to user_path(friend)
assert_match(/was removed from your friends/, flash[:notice])
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
# A second POST should report that the friendship does not exist
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
- assert_redirected_to user_path(:display_name => friend.display_name)
+ assert_redirected_to user_path(friend)
assert_match(/is not one of your friends/, flash[:error])
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end
assert_equal "deleted", user.status
end
- def test_list_get
+ def test_index_get
user = create(:user)
moderator_user = create(:moderator_user)
administrator_user = create(:administrator_user)
assert_equal 7, User.count
# Shouldn't work when not logged in
- get :list
+ get :index
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
session[:user] = user.id
# Shouldn't work when logged in as a normal user
- get :list
+ get :index
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
session[:user] = moderator_user.id
# Shouldn't work when logged in as a moderator
- get :list
+ get :index
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Note there is a header row, so all row counts are users + 1
# Should work when logged in as an administrator
- get :list
+ get :index
assert_response :success
- assert_template :list
+ assert_template :index
assert_select "table#user_list tr", :count => 7 + 1
# Should be able to limit by status
- get :list, :params => { :status => "suspended" }
+ get :index, :params => { :status => "suspended" }
assert_response :success
- assert_template :list
+ assert_template :index
assert_select "table#user_list tr", :count => 1 + 1
# Should be able to limit by IP address
- get :list, :params => { :ip => "1.2.3.4" }
+ get :index, :params => { :ip => "1.2.3.4" }
assert_response :success
- assert_template :list
+ assert_template :index
assert_select "table#user_list tr", :count => 1 + 1
end
- def test_list_get_paginated
+ def test_index_get_paginated
1.upto(100).each do |n|
User.create(:display_name => "extra_#{n}",
:email => "extra#{n}@example.com",
# 100 examples, an administrator, and a granter for the admin.
assert_equal 102, User.count
- get :list
+ get :index
assert_response :success
- assert_template :list
+ assert_template :index
assert_select "table#user_list tr", :count => 51
- get :list, :params => { :page => 2 }
+ get :index, :params => { :page => 2 }
assert_response :success
- assert_template :list
+ assert_template :index
assert_select "table#user_list tr", :count => 51
- get :list, :params => { :page => 3 }
+ get :index, :params => { :page => 3 }
assert_response :success
- assert_template :list
+ assert_template :index
assert_select "table#user_list tr", :count => 3
end
- def test_list_post_confirm
+ def test_index_post_confirm
inactive_user = create(:user, :pending)
suspended_user = create(:user, :suspended)
# Shouldn't work when not logged in
assert_no_difference "User.active.count" do
- post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+ post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Shouldn't work when logged in as a normal user
assert_no_difference "User.active.count" do
- post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+ post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Shouldn't work when logged in as a moderator
assert_no_difference "User.active.count" do
- post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+ post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Should work when logged in as an administrator
assert_difference "User.active.count", 2 do
- post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+ post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :list
+ assert_redirected_to :action => :index
assert_equal "confirmed", inactive_user.reload.status
assert_equal "confirmed", suspended_user.reload.status
end
- def test_list_post_hide
+ def test_index_post_hide
normal_user = create(:user)
confirmed_user = create(:user, :confirmed)
# Shouldn't work when not logged in
assert_no_difference "User.active.count" do
- post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+ post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Shouldn't work when logged in as a normal user
assert_no_difference "User.active.count" do
- post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+ post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Shouldn't work when logged in as a moderator
assert_no_difference "User.active.count" do
- post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+ post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
assert_redirected_to :action => :login, :referer => users_path
# Should work when logged in as an administrator
assert_difference "User.active.count", -2 do
- post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+ post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :list
+ assert_redirected_to :action => :index
assert_equal "deleted", normal_user.reload.status
assert_equal "deleted", confirmed_user.reload.status
end
# Granting should still fail
post :grant, :params => { :display_name => target_user.display_name, :role => "moderator" }
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
# Login as an administrator
assert_no_difference "UserRole.count" do
post :grant, :params => { :display_name => super_user.display_name, :role => role }
end
- assert_redirected_to user_path(super_user.display_name)
+ assert_redirected_to user_path(super_user)
assert_equal "The user already has role #{role}.", flash[:error]
# Granting a role to a user that doesn't have it should work...
assert_difference "UserRole.count", 1 do
post :grant, :params => { :display_name => target_user.display_name, :role => role }
end
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
# ...but trying a second time should fail
assert_no_difference "UserRole.count" do
post :grant, :params => { :display_name => target_user.display_name, :role => role }
end
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
assert_equal "The user already has role #{role}.", flash[:error]
end
assert_difference "UserRole.count", 0 do
post :grant, :params => { :display_name => target_user.display_name, :role => "no_such_role" }
end
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
end
# Revoking should still fail
post :revoke, :params => { :display_name => target_user.display_name, :role => "moderator" }
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
# Login as an administrator
assert_no_difference "UserRole.count" do
post :revoke, :params => { :display_name => target_user.display_name, :role => role }
end
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
assert_equal "The user does not have role #{role}.", flash[:error]
# Removing a role from a user that has it should work...
assert_difference "UserRole.count", -1 do
post :revoke, :params => { :display_name => super_user.display_name, :role => role }
end
- assert_redirected_to user_path(super_user.display_name)
+ assert_redirected_to user_path(super_user)
# ...but trying a second time should fail
assert_no_difference "UserRole.count" do
post :revoke, :params => { :display_name => super_user.display_name, :role => role }
end
- assert_redirected_to user_path(super_user.display_name)
+ assert_redirected_to user_path(super_user)
assert_equal "The user does not have role #{role}.", flash[:error]
end
assert_difference "UserRole.count", 0 do
post :revoke, :params => { :display_name => target_user.display_name, :role => "no_such_role" }
end
- assert_redirected_to user_path(target_user.display_name)
+ assert_redirected_to user_path(target_user)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
# Revoking administrator role from current user should fail
post :revoke, :params => { :display_name => administrator_user.display_name, :role => "administrator" }
- assert_redirected_to user_path(administrator_user.display_name)
+ assert_redirected_to user_path(administrator_user)
assert_equal "Cannot revoke administrator role from current user.", flash[:error]
end
end
def test_can_report_user
user = create(:user)
sign_in_as(create(:user))
- visit user_path(user.display_name)
+ visit user_path(user)
click_on I18n.t("user.show.report")
assert page.has_content? "Report"
def test_it_promotes_issues
user = create(:user)
sign_in_as(create(:user))
- visit user_path(user.display_name)
+ visit user_path(user)
click_on I18n.t("user.show.report")
assert page.has_content? "Report"
assert_equal user, Issue.last.reportable
assert_equal "moderator", Issue.last.assigned_role
- visit user_path(user.display_name)
+ visit user_path(user)
click_on I18n.t("user.show.report")
assert page.has_content? "Report"
projects / rails.git / commitdiff