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

erblint: fix remaining single quoted strings

Browse source
This commit is contained in:
Tom Hughes 2019-03-27 16:15:19 +00:00
parent 50091893d4
commit 3af16f6337
103 changed files with 666 additions and 685 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/users/_contact.html.erb
View file

@ -14,32 +14,32 @@
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
<% distance = @user.distance(contact) %>
<% if distance < 1 %>
(<%= t 'users.show.m away', :count => (distance * 1000).round %>)
(<%= t "users.show.m away", :count => (distance * 1000).round %>)
<% else %>
(<%= t 'users.show.km away', :count => distance.round %>)
(<%= t "users.show.km away", :count => distance.round %>)
<% end %>
<% end %>
</p>
<p>
<% changeset = contact.changesets.first %>
<% if changeset %>
<%= t('users.show.latest edit', :ago => t('users.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
<%= t("users.show.latest edit", :ago => t("users.show.ago", :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %>
"<%= link_to(comment,
{ :controller => 'browse', :action => 'changeset', :id => changeset.id },
{ :title => t('changesets.changeset.view_changeset_details') }) %>"
{ :controller => "browse", :action => "changeset", :id => changeset.id },
{ :title => t("changesets.changeset.view_changeset_details") }) %>"
<% else %>
<%= t 'changesets.changeset.no_edits' %>
<%= t "changesets.changeset.no_edits" %>
<% end %>
</p>
<ul class='secondary-actions clearfix deemphasize'>
<li><%= link_to t('users.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('users.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('users.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>

2
app/views/users/_popup.html.erb
View file

@ -1,5 +1,5 @@
<div class="user_popup">
<%= user_thumbnail popup %>
<p><%= t('.' + type) %></p>
<p><%= t("." + type) %></p>
<p><%= link_to popup.display_name, user_path(popup) %></p>
</div>

36
app/views/users/_terms.html.erb
View file

@ -1,45 +1,45 @@
<p id="first">
<%= raw @text['intro'] %>
<%= raw @text['next_with_decline'] %>
<%= raw @text["intro"] %>
<%= raw @text["next_with_decline"] %>
</p>
<h3><%= raw @text['introduction'] %></h3>
<h3><%= raw @text["introduction"] %></h3>
<ol>
<li>
<p><%= raw @text['section_1'] %></p>
<p><%= raw @text["section_1"] %></p>
<% unless @text['section_1a'].nil? %>
<ol>
<li><%= raw @text['section_1a'] %></li>
<li><%= raw @text['section_1b'] %></li>
<li><%= raw @text["section_1a"] %></li>
<li><%= raw @text["section_1b"] %></li>
</ol>
<% end %>
</li>
</ol>
<h3><%= raw @text['rights_granted'] %></h3>
<h3><%= raw @text["rights_granted"] %></h3>
<ol start="2">
<li>
<p><%= raw @text['section_2'] %></p>
<p><%= raw @text["section_2"] %></p>
</li>
<li>
<p><%= raw @text['section_3'] %></p>
<p><%= raw @text['active_defn_1'] %></p>
<p><%= raw @text['active_defn_2'] %></p>
<p><%= raw @text["section_3"] %></p>
<p><%= raw @text["active_defn_1"] %></p>
<p><%= raw @text["active_defn_2"] %></p>
</ul>
</li>
<li>
<p><%= raw @text['section_4'] %></p>
<p><%= raw @text["section_4"] %></p>
</li>
<li>
<p><%= raw @text['section_5'] %></p>
<p><%= raw @text["section_5"] %></p>
</li>
</ol>
<h3><%= raw @text['limitation_of_liability'] %></h3>
<h3><%= raw @text["limitation_of_liability"] %></h3>
<ol start="6">
<li><p><%= raw @text['section_6'] %></p></li>
<li><p><%= raw @text['section_7'] %></p></li>
<li><p><%= raw @text["section_6"] %></p></li>
<li><p><%= raw @text["section_7"] %></p></li>
</ol>
<h3><%= raw @text['miscellaneous'] %></h3>
<h3><%= raw @text["miscellaneous"] %></h3>
<ol start="8">
<li>
<p id="last"><%= raw @text['section_8'] %></p>
<p id="last"><%= raw @text["section_8"] %></p>
</li>
</ol>

6
app/views/users/_user.html.erb
View file

@ -1,4 +1,4 @@
<% cl = cycle('table0', 'table1') %>
<% cl = cycle("table0", "table1") %>
<tr class="<%= cl %>">
<td>
@ -7,12 +7,12 @@
<td>
<p>
<% if user.creation_ip %>
<%= raw t 'users.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 'users.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) %>
<% end %>

96
app/views/users/account.html.erb
View file

@ -3,125 +3,125 @@
<% end %>
<% content_for :heading do %>
<h1><%= t '.my settings' %></h1>
<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('users.show.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
<li><%= link_to t(".return to profile"), user_path(current_user) %></li>
<li><%= link_to t("users.show.oauth settings"), :controller => "oauth_clients", :action => "index" %></li>
</ul>
<% end %>
<%= error_messages_for current_user %>
<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %>
<%= 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 'users.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 '.current email address' %></label>
<label class="standard-label"><%= t ".current email address" %></label>
<input type="email" disabled value="<%= current_user.email %>" />
<span class="form-help deemphasize"><%= t '.email never displayed publicly' %></span>
<span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
</div>
<div class="form-row">
<label class="standard-label"><%= t '.new email address' %></label>
<label class="standard-label"><%= t ".new email address" %></label>
<%= f.email_field :new_email, :autocomplete => :off %>
<span class="form-help deemphasize"><%= t '.email never displayed publicly' %></span>
<span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
</div>
</fieldset>
<fieldset>
<div class="form-row">
<label class="standard-label"><%= t 'users.new.password' %></label>
<%= f.password_field :pass_crypt, :value => '', :autocomplete => :off %>
<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 'users.new.confirm password' %></label>
<%= f.password_field :pass_crypt_confirmation, :value => '', :autocomplete => :off %>
<label class="standard-label"><%= t "users.new.confirm password" %></label>
<%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
</div>
</fieldset>
<fieldset>
<div class="form-row">
<label class="standard-label"><%= t '.external auth' %></label>
<label class="standard-label"><%= t ".external auth" %></label>
<%= f.select :auth_provider, Auth::PROVIDERS %>
<%= f.text_field :auth_uid %>
<span class="form-help deemphasize">(<a href="<%= t '.openid.link' %>" target="_new"><%= t '.openid.link text' %></a>)</span>
<span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>
</div>
</fieldset>
<fieldset class="form-divider">
<div class="form-row">
<label class="standard-label"><%= t '.public editing.heading' %></label>
<label class="standard-label"><%= t ".public editing.heading" %></label>
<span class="form-help deemphasize">
<% if current_user.data_public? %>
<%= t '.public editing.enabled' %>
(<a href="<%= t '.public editing.enabled link' %>" target="_new"><%= t '.public editing.enabled link text' %></a>)
<%= t ".public editing.enabled" %>
(<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
<% else %>
<%= t '.public editing.disabled' %>
(<a href="#public"><%= t '.public editing.disabled link text' %></a>)
<%= t ".public editing.disabled" %>
(<a href="#public"><%= t ".public editing.disabled link text" %></a>)
<% end %>
</span>
</div>
<div class="form-row">
<label class="standard-label"><%= t '.contributor terms.heading' %></label>
<label class="standard-label"><%= t ".contributor terms.heading" %></label>
<span class="form-help deemphasize">
<% if current_user.terms_agreed? %>
<%= t '.contributor terms.agreed' %>
(<a href="<%= t '.contributor terms.link' %>" target="_new"><%= t '.contributor terms.link text' %></a>)
<%= t ".contributor terms.agreed" %>
(<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
<% if current_user.consider_pd? %>
<%= t '.contributor terms.agreed_with_pd' %>
<%= t ".contributor terms.agreed_with_pd" %>
<% end %>
<% else %>
<%= t '.contributor terms.not yet agreed' %>
<%= link_to t('.contributor terms.review link text'), :controller => 'users', :action => 'terms' %>
<%= t ".contributor terms.not yet agreed" %>
<%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
<% end %>
</span>
</div>
<div class="form-row">
<label class="standard-label"><%= t '.preferred editor' %></label>
<%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
<label class="standard-label"><%= t ".preferred editor" %></label>
<%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
</div>
</fieldset>
<fieldset class="form-divider">
<div class='form-row'>
<label class="standard-label"><%= t '.profile description' %></label>
<label class="standard-label"><%= t ".profile description" %></label>
<%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
</div>
<div class="form-row">
<label class="standard-label"><%= t '.preferred languages' %></label>
<label class="standard-label"><%= t ".preferred languages" %></label>
<%= f.text_field :languages %>
</div>
<div class='form-row accountImage'>
<label class="standard-label"><%= t '.image' %></label>
<label class="standard-label"><%= t ".image" %></label>
<%= user_image current_user %>
<ul class='form-list accountImage-options'>
<% if current_user.image.file? %>
<li>
<%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>
<label class='standard-label' for='image_action_keep'><%= t '.keep image' %></label>
<label class='standard-label' for='image_action_keep'><%= t ".keep image" %></label>
</li>
<% end %>
<% if current_user.image.file? || current_user.image_use_gravatar? %>
<li>
<%= radio_button_tag "image_action", "delete" %>
<label class='standard-label' for='image_action_delete'><%= t '.delete image' %></label>
<label class='standard-label' for='image_action_delete'><%= t ".delete image" %></label>
</li>
<% end %>
<% if current_user.image.file? %>
<li>
<%= radio_button_tag "image_action", "new" %>
<label class='standard-label' for='image_action_new'>
<%= t '.replace image' %>
<span class="form-help deemphasize"><%= t '.image size hint' %></span>
<%= t ".replace image" %>
<span class="form-help deemphasize"><%= t ".image size hint" %></span>
</label>
<%= f.file_field :image %>
</li>
@ -129,8 +129,8 @@
<li>
<%= radio_button_tag "image_action", "new" %>
<label class='standard-label' for='image_action_new'>
<%= t '.new image' %>
<span class="form-help deemphasize"><%= t '.image size hint' %></span>
<%= t ".new image" %>
<span class="form-help deemphasize"><%= t ".image size hint" %></span>
</label>
<%= f.file_field :image %>
</li>
@ -138,8 +138,8 @@
<li>
<%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
<label class='standard-label' for='image_action_gravatar'>
<%= t '.gravatar.gravatar' %>
<span class='form-help deemphasize'> (<a href="<%= t '.gravatar.link' %>" target="_new"><%= t '.gravatar.link text' %></a>)</span>
<%= t ".gravatar.gravatar" %>
<span class='form-help deemphasize'> (<a href="<%= t ".gravatar.link" %>" target="_new"><%= t ".gravatar.link text" %></a>)</span>
</label>
</li>
</ul>
@ -148,15 +148,15 @@
<fieldset class="form-divider">
<div class='form-row location clearfix'>
<label class="standard-label"><%= t '.home location' %></label>
<label class="standard-label"><%= t ".home location" %></label>
<div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<% end %> >
<p class="message form-help deemphasize"><%= t '.no home location' %></p>
<p class="message form-help deemphasize"><%= t ".no home location" %></p>
<div class='form-column'>
<label class="standard-label secondary"><%= t '.latitude' %></label>
<label class="standard-label secondary"><%= t ".latitude" %></label>
<%= f.text_field :home_lat, :id => "home_lat" %>
</div>
<div class='form-column'>
<label class="standard-label secondary"><%= t '.longitude' %></label>
<label class="standard-label secondary"><%= t ".longitude" %></label>
<%= f.text_field :home_lon, :id => "home_lon" %>
</div>
</div>
@ -164,17 +164,17 @@
<div class="form-row">
<input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="standard-label" for="updatehome"><%= t '.update home location on click' %></label>
<label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
</div>
<%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
</fieldset>
<%= submit_tag t('.save changes button') %>
<%= submit_tag t(".save changes button") %>
<% end %>
<% unless current_user.data_public? %>
<a name="public"></a>
<h2><%= t '.public editing note.heading' %></h2>
<%= raw t '.public editing note.text' %>
<%= button_to t('.make edits public button'), :action => :go_public %>
<h2><%= t ".public editing note.heading" %></h2>
<%= raw t ".public editing note.text" %>
<%= button_to t(".make edits public button"), :action => :go_public %>
<% end %>

6
app/views/users/blocked.html.erb
View file

@ -1,10 +1,10 @@
<% content_for :heading do %>
<h1><%= t 'users.new.title' %></h1>
<h1><%= t "users.new.title" %></h1>
<div class='header-illustration new-user-main'></div>
<div class='header-illustration new-user-arm'></div>
<% end %>
<div class="message">
<h1><%= t 'users.new.no_auto_account_create' %></h1>
<h2><%= raw t 'users.new.contact_webmaster', :webmaster => "mailto:#{Settings.support_email}" %></h2>
<h1><%= t "users.new.no_auto_account_create" %></h1>
<h2><%= raw t "users.new.contact_webmaster", :webmaster => "mailto:#{Settings.support_email}" %></h2>
</div>

8
app/views/users/confirm.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h1><%= t '.heading' %></h1>
<h1><%= t ".heading" %></h1>
<div class='header-illustration confirm-main'></div>
<% end %>
@ -10,12 +10,12 @@
<% content_for(:content_class) { "user_confirm" } %>
<p><%= t '.press confirm button' %></p>
<p><%= t ".press confirm button" %></p>
<%= form_tag({}, { :id => "confirm" }) do %>
<input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
<input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
<input type="submit" name="confirm_action" value="<%= t '.button' %>">
<input type="submit" name="confirm_action" value="<%= t ".button" %>">
<% end %>
<% else %>
<h1>
@ -26,5 +26,5 @@
</h1>
<p class='deemphasize'><%= t ".reconfirm_html",
:reconfirm => url_for(:action => 'confirm_resend') %></p>
:reconfirm => url_for(:action => "confirm_resend") %></p>
<% end %>

6
app/views/users/confirm_email.html.erb
View file

@ -5,12 +5,12 @@
<% content_for(:content_class) { "user_confirm" } %>
<% content_for :heading do %>
<h1><%= t '.heading' %></h1>
<h1><%= t ".heading" %></h1>
<% end %>
<p><%= t '.press confirm button' %></p>
<p><%= t ".press confirm button" %></p>
<%= form_tag({}, { :id => "confirm" }) do %>
<input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
<input type="submit" name="confirm_action" value="<%= t '.button' %>">
<input type="submit" name="confirm_action" value="<%= t ".button" %>">
<% end %>

12
app/views/users/index.html.erb
View file

@ -1,11 +1,11 @@
<% @title = t('.title') %>
<% @title = t(".title") %>
<% content_for :head do %>
<%= javascript_include_tag "user" %>
<% end %>
<% content_for :heading do %>
<h1><%= t('.heading') %></h1>
<h1><%= t(".heading") %></h1>
<% end %>
<% unless @users.empty? %>
@ -16,7 +16,7 @@
<table id="user_list">
<tr>
<td colspan="2">
<%= t '.showing',
<%= t ".showing",
:page => @user_pages.current_page.number,
:first_item => @user_pages.current_page.first_item,
:last_item => @user_pages.current_page.last_item,
@ -30,12 +30,12 @@
<%= check_box_tag "user_all", "1", false %>
</td>
</tr>
<%= render :partial => 'user', :collection => @users %>
<%= render :partial => "user", :collection => @users %>
</table>
<div id="user_list_actions buttons">
<%= submit_tag t('.confirm'), :name => "confirm" %>
<%= submit_tag t('.hide'), :name => "hide" %>
<%= submit_tag t(".confirm"), :name => "confirm" %>
<%= submit_tag t(".hide"), :name => "hide" %>
</div>
<% end %>
<% else %>

24
app/views/users/login.html.erb
View file

@ -3,41 +3,41 @@
<% end %>
<% content_for :heading do %>
<h1><%= t '.heading' %></h1>
<h1><%= t ".heading" %></h1>
<% end %>
<div id="login_login">
<%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
<%= hidden_field_tag('referer', h(params[:referer])) %>
<%= hidden_field_tag("referer", h(params[:referer])) %>
<p class='deemphasize'><%= t '.no account' %> <%= link_to t('.register now'), :action => :new, :referer => params[:referer] %></p>
<p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
<div id="loginForm" class="standard-form">
<fieldset>
<div class="form-row">
<label for="username" class="standard-label">
<%= t '.email or username' %>
<%= t ".email or username" %>
</label>
<%= text_field_tag "username", params[:username], :tabindex => 1 %>
</div>
<div class="form-row">
<label for="password" class="standard-label">
<%= t '.password' %>
<%= t ".password" %>
</label>
<%= password_field_tag "password", "", :tabindex => 2 %>
</div>
<span class="form-help deemphasize">
<%= link_to t('.lost password link'), :controller => 'users', :action => 'lost_password' %>
<%= link_to t(".lost password link"), :controller => "users", :action => "lost_password" %>
</span>
</fieldset>
<fieldset>
<%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
<label for="remember_me" class="standard-label">
<%= t '.remember' %>
<%= t ".remember" %>
</label>
<%= submit_tag t('.login_button'), :tabindex => 4 %>
<%= submit_tag t(".login_button"), :tabindex => 4 %>
</fieldset>
</div>
@ -49,7 +49,7 @@
<fieldset class='form-divider'>
<p class='standard-label'><%= t '.with external' %></p>
<p class='standard-label'><%= t ".with external" %></p>
<ul class='clearfix' id="login_auth_buttons">
<li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
@ -74,13 +74,13 @@
</ul>
<div id='login_openid_url' class='form-row'>
<label for='openid_url' class="standard-label"><%= raw t '.openid', :logo => openid_logo %></label>
<label for='openid_url' class="standard-label"><%= raw t ".openid", :logo => openid_logo %></label>
<%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
<%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>
<span class="minorNote">(<a href="<%= t 'users.account.openid.link' %>" target="_new"><%= t 'users.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>
<%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
<%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit" %>
</fieldset>

4
app/views/users/logout.html.erb
View file

@ -1,9 +1,9 @@
<% content_for :heading do %>
<h1><%= t '.heading' %></h1>
<h1><%= t ".heading" %></h1>
<% end %>
<%= form_tag :action => "logout" do %>
<%= hidden_field_tag("referer", h(params[:referer])) %>
<%= hidden_field_tag("session", session.id) %>
<%= submit_tag t('.logout_button') %>
<%= submit_tag t(".logout_button") %>
<% end %>

12
app/views/users/lost_password.html.erb
View file

@ -1,13 +1,13 @@
<% content_for :heading do %>
<h1><%= t '.heading' %></h1>
<h1><%= t ".heading" %></h1>
<% end %>
<p><%= t '.help_text' %></p>
<p><%= t ".help_text" %></p>
<%= form_tag :action => 'lost_password' do %>
<%= form_tag :action => "lost_password" do %>
<div class="standard-form">
<label class="standard-label"><%= t '.email address' %></label>
<%= text_field('user', 'email', :tabindex => 1) %>
<%= submit_tag t('.new password button'), :tabindex => 2 %>
<label class="standard-label"><%= t ".email address" %></label>
<%= text_field("user", "email", :tabindex => 1) %>
<%= submit_tag t(".new password button"), :tabindex => 2 %>
</div>
<% end %>

30
app/views/users/new.html.erb
View file

@ -3,66 +3,66 @@
<% end %>
<% content_for :heading do %>
<h1><%= t '.title' %></h1>
<h1><%= t ".title" %></h1>
<div class='header-illustration new-user-main'></div>
<div class='header-illustration new-user-arm'></div>
<% end %>
<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %>
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
<%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form fillL col6 inner22" } do |f| %>
<%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
<fieldset>
<div class="form-row">
<label for="email" class="standard-label">
<%= t '.email address' %>
<%= t ".email address" %>
</label>
<%= f.email_field(:email, :tabindex => 1) %>
<%= f.error_message_on(:email) %>
</div>
<div class="form-row">
<label for="email_confirmation" class="standard-label">
<%= t '.confirm email address' %>
<%= t ".confirm email address" %>
</label>
<%= f.email_field(:email_confirmation, :tabindex => 2) %>
<%= f.error_message_on(:email_confirmation) %>
</div>
<span class="form-help deemphasize"><%= raw(t '.not displayed publicly') %></span>
<span class="form-help deemphasize"><%= raw(t ".not displayed publicly") %></span>
</fieldset>
<fieldset>
<div class="form-row">
<label for="display_name" class="standard-label">
<%= t '.display name' %>
<%= t ".display name" %>
</label>
<%= f.text_field(:display_name, :tabindex => 3) %>
<%= f.error_message_on(:display_name) %>
</div>
<span class="form-help deemphasize"><%= t '.display name description' %></span>
<span class="form-help deemphasize"><%= t ".display name description" %></span>
</fieldset>
<fieldset class="form-divider" id="auth_field">
<div class="form-row">
<label for="openid_url" class="standard-label">
<%= raw t '.external auth' %>
<%= raw t ".external auth" %>
</label>
<%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
<%= f.text_field(:auth_uid, :tabindex => 5) %>
<%= f.error_message_on(:auth_uid) %>
</div>
<span class="form-help deemphasize"><%= t '.auth no password' %></span>
<span class="form-help deemphasize"><%= t ".auth no password" %></span>
</fieldset>
<fieldset>
<div class="form-row">
<label for='user[pass_crypt]' class="standard-label">
<%= t '.password' %>
<%= t ".password" %>
</label>
<%= f.password_field(:pass_crypt, :tabindex => 6) %>
<%= f.error_message_on(:pass_crypt) %>
</div>
<div class="form-row">
<label class="standard-label">
<%= t '.confirm password' %>
<%= t ".confirm password" %>
</label>
<%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
<%= f.error_message_on(:pass_crypt_confirmation) %>
@ -73,10 +73,10 @@
<%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
</div>
<%= submit_tag t('.continue'), :tabindex => 8 %>
<%= submit_tag t(".continue"), :tabindex => 8 %>
<% end %>
<div class='aside col6 deemphasize inner22'>
<h4><%= t '.about.header' %></h4>
<%= t '.about.html' %>
<h4><%= t ".about.header" %></h4>
<%= t ".about.html" %>
</div>

4
app/views/users/no_such_user.html.erb
View file

@ -1,4 +1,4 @@
<% content_for :heading do %>
<h1><%= t '.heading', :user => h(@not_found_user) %></h1>
<h1><%= t ".heading", :user => h(@not_found_user) %></h1>
<% end %>
<p><%= t '.body', :user => h(@not_found_user) %></p>
<p><%= t ".body", :user => h(@not_found_user) %></p>

12
app/views/users/reset_password.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h1><%= t '.heading', :user => current_user.display_name %></h1>
<h1><%= t ".heading", :user => current_user.display_name %></h1>
<% end %>
<%= error_messages_for current_user %>
@ -8,13 +8,13 @@
<%= hidden_field_tag(:token, params[:token]) %>
<div class="standard-form">
<fieldset>
<label class="standard-label"><%= t '.password' %></label>
<%= password_field(:user, :pass_crypt, :value => '', :tabindex => 4) %>
<label class="standard-label"><%= t ".password" %></label>
<%= password_field(:user, :pass_crypt, :value => "", :tabindex => 4) %>
</fieldset>
<fieldset>
<label class="standard-label"><%= t '.confirm password' %></label>
<%= password_field(:user, :pass_crypt_confirmation, :value => '', :tabindex => 5) %>
<label class="standard-label"><%= t ".confirm password" %></label>
<%= password_field(:user, :pass_crypt_confirmation, :value => "", :tabindex => 5) %>
</fieldset>
<%= submit_tag t('.reset'), :tabindex => 6 %>
<%= submit_tag t(".reset"), :tabindex => 6 %>
</div>
<% end %>

86
app/views/users/show.html.erb
View file

@ -7,37 +7,37 @@
<!-- Displaying user's own profile page to themself -->
<ul class='secondary-actions clearfix'>
<li>
<%= link_to t('.my edits'), :controller => 'changesets', :action => 'index', :display_name => current_user.display_name %>
<%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
<span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
</li>
<li>
<%= link_to t('.my notes'), :controller => 'notes', :action => 'mine' %>
<%= link_to t(".my notes"), :controller => "notes", :action => "mine" %>
</li>
<li>
<%= link_to t('.my traces'), :controller => 'traces', :action => 'mine' %>
<%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
<span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
</li>
<li>
<%= link_to t('.my diary'), :controller => 'diary_entries', :action => 'index', :display_name => current_user.display_name %>
<%= link_to t(".my diary"), :controller => "diary_entries", :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('.my comments'), :controller => 'diary_entries', :action => 'comments', :display_name => current_user.display_name %>
<%= link_to t(".my comments"), :controller => "diary_entries", :action => "comments", :display_name => current_user.display_name %>
</li>
<li>
<%= link_to t('.my settings'), :controller => 'users', :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? %>
<li>
<%= link_to t('.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => current_user.display_name %>
<%= link_to t(".blocks on me"), :controller => "user_blocks", :action => "blocks_on", :display_name => current_user.display_name %>
<span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
</li>
<% end %>
<% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>
<li>
<%= link_to t('.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => current_user.display_name %>
<%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>
<span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
</li>
<% end %>
@ -49,56 +49,56 @@
<ul class='secondary-actions clearfix'>
<li>
<%= link_to t('.edits'), :controller => 'changesets', :action => 'index', :display_name => @user.display_name %>
<%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
</li>
<li>
<%= link_to t('.notes'), :controller => 'notes', :action => 'mine' %>
<%= link_to t(".notes"), :controller => "notes", :action => "mine" %>
</li>
<li>
<%= link_to t('.traces'), :controller => 'traces', :action => 'index', :display_name => @user.display_name %>
<%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
</li>
<!-- Displaying another user's profile page -->
<li>
<%= link_to t('.send message'), new_message_path(@user) %>
<%= link_to t(".send message"), new_message_path(@user) %>
</li>
<li>
<%= link_to t('.diary'), :controller => 'diary_entries', :action => 'index', :display_name => @user.display_name %>
<%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
</li>
<li>
<%= link_to t('.comments'), :controller => 'diary_entries', :action => 'comments', :display_name => @user.display_name %>
<%= link_to t(".comments"), :controller => "diary_entries", :action => "comments", :display_name => @user.display_name %>
</li>
<li>
<% if current_user and current_user.is_friends_with?(@user) %>
<%= link_to t('.remove as friend'), remove_friend_path(:display_name => @user.display_name), :method => :post %>
<%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
<% elsif current_user %>
<%= link_to t('.add as friend'), make_friend_path(:display_name => @user.display_name), :method => :post %>
<%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
<% else %>
<%= link_to t('.add as friend'), make_friend_path(:display_name => @user.display_name) %>
<%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %>
<% end %>
</li>
<% if @user.blocks.exists? %>
<li>
<%= link_to t('.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
<%= link_to t(".block_history"), :controller => "user_blocks", :action => "blocks_on", :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
</li>
<% end %>
<% if @user.moderator? and @user.blocks_created.exists? %>
<li>
<%= link_to t('.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
<%= link_to t(".moderator_history"), :controller => "user_blocks", :action => "blocks_by", :display_name => @user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
</li>
<% end %>
<% if current_user and current_user.moderator? %>
<li>
<%= link_to t('.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @user.display_name %>
<%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
</li>
<% end %>
@ -116,28 +116,28 @@
<ul class='secondary-actions clearfix'>
<% if ["active", "confirmed"].include? @user.status %>
<li>
<%= link_to t('.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
<%= link_to t(".deactivate_user"), set_status_user_path(:status => "pending", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>
</li>
<% elsif ["pending"].include? @user.status %>
<li>
<%= link_to t('.activate_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
<%= link_to t(".activate_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>
</li>
<% end %>
<% if ["active", "suspended"].include? @user.status %>
<li>
<%= link_to t('.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
<%= link_to t(".confirm_user"), set_status_user_path(:status => "confirmed", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>
</li>
<% end %>
<li>
<% if ["pending", "active", "confirmed", "suspended"].include? @user.status %>
<%= link_to t('.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
<%= link_to t(".hide_user"), set_status_user_path(:status => "deleted", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>
<% else %>
<%= link_to t('.unhide_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
<%= link_to t(".unhide_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>
</li>
<% end %>
<li>
<%= link_to t('.delete_user'), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
<%= link_to t(".delete_user"), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>
</li>
</ul>
@ -145,14 +145,14 @@
<p class='deemphasize'>
<small>
<%= t '.mapper since' %> <%= l @user.creation_time.to_date, :format => :long %>
<%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
<% unless @user.terms_agreed %>
|
<%= t '.ct status' %>
<%= t ".ct status" %>
<% if @user.terms_seen? -%>
<%= t '.ct declined' %>
<%= t ".ct declined" %>
<% else -%>
<%= t '.ct undecided' %>
<%= t ".ct undecided" %>
<% end -%>
<% end -%>
</small>
@ -165,12 +165,12 @@
<% if current_user and current_user.administrator? -%>
<div class='admin-user-info deemphasize'>
<small><b><%= t '.email address' %></b> <%= @user.email %></small>
<small><b><%= t ".email address" %></b> <%= @user.email %></small>
<% unless @user.creation_ip.nil? -%>
<small><b><%= t '.created from' %></b> <%= @user.creation_ip %></small>
<small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
<% end -%>
<small><b><%= t '.status' %></b> <%= @user.status.capitalize %></small>
<small><b><%= t '.spam score' %></b> <%= @user.spam_score %></small>
<small><b><%= t ".status" %></b> <%= @user.status.capitalize %></small>
<small><b><%= t ".spam score" %></b> <%= @user.spam_score %></small>
</div>
<% end -%>
@ -179,7 +179,7 @@
<% 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 => 'users', :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 %>
@ -200,14 +200,14 @@
<% nearby = @user.nearby - friends %>
<div class="activity-block column-1">
<h3><%= t '.my friends' %></h3>
<h3><%= t ".my friends" %></h3>
<% if friends.empty? %>
<%= t '.no friends' %>
<%= t ".no friends" %>
<% else %>
<ul class='secondary-actions clearfix'>
<li><%= link_to t('.friends_changesets'), friend_changesets_path %></li>
<li><%= link_to t('.friends_diaries'), friend_diaries_path %></li>
<li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
<li><%= link_to t(".friends_diaries"), friend_diaries_path %></li>
</ul>
<div id="friends-container">
<%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
@ -216,14 +216,14 @@
</div>
<div class="activity-block column-1">
<h3><%= t '.nearby users' %></h3>
<h3><%= t ".nearby users" %></h3>
<% if nearby.empty? %>
<%= t '.no nearby users' %>
<%= t ".no nearby users" %>
<% else %>
<ul class='secondary-actions clearfix'>
<li><%= link_to t('.nearby_changesets'), nearby_changesets_path %></li>
<li><%= link_to t('.nearby_diaries'), nearby_diaries_path %></li>
<li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
<li><%= link_to t(".nearby_diaries"), nearby_diaries_path %></li>
</ul>
<div id="nearbyusers">
<%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>

30
app/views/users/terms.html.erb
View file

@ -3,7 +3,7 @@
<% end %>
<% content_for :heading do %>
<h1><%= t '.heading' %></h1>
<h1><%= t ".heading" %></h1>
<div class='header-illustration new-user-terms'></div>
<% end %>
@ -11,14 +11,14 @@
<!-- legale is <%= @legale %> -->
<div class='form-row horizontal-list'>
<label class="standard-label">
<%= t '.legale_select' %>
<%= t ".legale_select" %>
</label>
<% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
<% [["france", "FR"], ["italy", "IT"], ["rest_of_world", "GB"]].each do |name, legale| %>
<div class="form-row">
<label for="legale_<%= legale %>">
<%= radio_button_tag 'legale', legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
<%= t('.legale_names.' + name) %>
<%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
<%= t(".legale_names." + name) %>
</label>
</div>
<% end %>
@ -30,24 +30,24 @@
<div class="form-row">
<label for="user_consider_pd">
<%= check_box('user', 'consider_pd') %>
<%= t '.consider_pd' %>
<%= check_box("user", "consider_pd") %>
<%= t ".consider_pd" %>
</label>
<span class="minorNote">(<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new) %>)</span>
<span class="minorNote">(<%= link_to(t(".consider_pd_why"), t(".consider_pd_why_url"), :target => :new) %>)</span>
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
<%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
<div class="buttons form-row inner20 clearfix">
<p class="deemphasize"><%= t '.read and accept' %></p>
<%= submit_tag(t('.agree'), :name => "agree", :id => "agree") %>
<%= submit_tag(t('.decline'), :name => "decline", :id => "decline") %>
<p class="deemphasize"><%= t ".read and accept" %></p>
<%= submit_tag(t(".agree"), :name => "agree", :id => "agree") %>
<%= submit_tag(t(".decline"), :name => "decline", :id => "decline") %>
</div>
<div class="deemphasize">
<p id="contributorGuidance">
<%= raw t '.guidance',
:summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
:translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
<%= raw t ".guidance",
:summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
:translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
</p>
</div>
</div>