From: Tom Hughes Date: Wed, 25 Apr 2018 16:44:53 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/1833' X-Git-Tag: live~3078 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/827024f7e6c48a11dbe08e569e2cbd852701bd31?hp=5bed2178231b783176551d21734d23b7a32f0d16 Merge remote-tracking branch 'upstream/pull/1833' --- diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 84bbcf185..ae6d0983b 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -30,7 +30,7 @@ class OauthController < ApplicationController @token = current_user.oauth_tokens.find_by :token => params[:token] if @token @token.invalidate! - flash[:notice] = t("oauth.revoke.flash", :application => @token.client_application.name) + flash[:notice] = t(".flash", :application => @token.client_application.name) end redirect_to oauth_clients_url(:display_name => @token.user.display_name) end @@ -41,7 +41,7 @@ class OauthController < ApplicationController append_content_security_policy_directives(:form_action => %w[*]) if @token.invalidated? - @message = t "oauth.oauthorize_failure.invalid" + @message = t "oauth.authorize_failure.invalid" render :action => "authorize_failure" elsif request.post? if user_authorizes_token? @@ -69,7 +69,7 @@ class OauthController < ApplicationController end else @token.invalidate! - @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name) + @message = t("oauth.authorize_failure.denied", :app_name => @token.client_application.name) render :action => "authorize_failure" end end diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb index f15060d5b..b8ecce9e2 100644 --- a/app/controllers/redactions_controller.rb +++ b/app/controllers/redactions_controller.rb @@ -25,7 +25,7 @@ class RedactionsController < ApplicationController # note that the description format will default to 'markdown' if @redaction.save - flash[:notice] = t("redaction.create.flash") + flash[:notice] = t(".flash") redirect_to @redaction else render :action => "new" @@ -42,7 +42,7 @@ class RedactionsController < ApplicationController @redaction.description = params[:redaction][:description] if @redaction.save - flash[:notice] = t("redaction.update.flash") + flash[:notice] = t(".flash") redirect_to @redaction else render :action => "edit" @@ -54,14 +54,14 @@ class RedactionsController < ApplicationController @redaction.old_ways.empty? && @redaction.old_relations.empty? if @redaction.destroy - flash[:notice] = t("redaction.destroy.flash") + flash[:notice] = t(".flash") redirect_to :redactions else - flash[:error] = t("redaction.destroy.error") + flash[:error] = t(".error") redirect_to @redaction end else - flash[:error] = t("redaction.destroy.not_empty") + flash[:error] = t(".not_empty") redirect_to @redaction end end diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 4a55c9ba2..2b7bf3f58 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -45,7 +45,7 @@ class UserBlocksController < ApplicationController ) if @user_block.save - flash[:notice] = t("user_block.create.flash", :name => @user.display_name) + flash[:notice] = t(".flash", :name => @user.display_name) redirect_to @user_block else render :action => "new" @@ -58,14 +58,14 @@ class UserBlocksController < ApplicationController def update if @valid_params if @user_block.creator != current_user - flash[:error] = t("user_block.update.only_creator_can_edit") + flash[:error] = t(".only_creator_can_edit") redirect_to :action => "edit" elsif @user_block.update( :ends_at => Time.now.getutc + @block_period.hours, :reason => params[:user_block][:reason], :needs_view => params[:user_block][:needs_view] ) - flash[:notice] = t("user_block.update.success") + flash[:notice] = t(".success") redirect_to(@user_block) else render :action => "edit" @@ -80,7 +80,7 @@ class UserBlocksController < ApplicationController def revoke if params[:confirm] if @user_block.revoke! current_user - flash[:notice] = t "user_block.revoke.flash" + flash[:notice] = t ".flash" redirect_to(@user_block) end end @@ -128,10 +128,10 @@ class UserBlocksController < ApplicationController @valid_params = false if !UserBlock::PERIODS.include?(@block_period) - flash[:error] = t("user_block.filter.block_period") + flash[:error] = t("user_blocks.filter.block_period") elsif @user_block && !@user_block.active? - flash[:error] = t("user_block.filter.block_expired") + flash[:error] = t("user_blocks.filter.block_expired") else @valid_params = true diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 3c9c0a37e..668eeb0e5 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -7,19 +7,19 @@ module UserBlocksHelper # if the block hasn't expired yet show the date, if the user just needs to login show that if block.needs_view? if block.ends_at > Time.now.getutc - I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe + I18n.t("user_blocks.helper.time_future_and_until_login", :time => friendly_date(block.ends_at)).html_safe else - I18n.t("user_block.helper.until_login") + I18n.t("user_blocks.helper.until_login") end else - I18n.t("user_block.helper.time_future", :time => friendly_date(block.ends_at)).html_safe + I18n.t("user_blocks.helper.time_future", :time => friendly_date(block.ends_at)).html_safe end else # the max of the last update time or the ends_at time is when this block finished # either because the user viewed the block (updated_at) or it expired or was # revoked (ends_at) last_time = [block.ends_at, block.updated_at].max - I18n.t("user_block.helper.time_past", :time => friendly_date(last_time)).html_safe + I18n.t("user_blocks.helper.time_past", :time => friendly_date(last_time)).html_safe end end end diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb index c0d6e17d3..d9c17848b 100644 --- a/app/views/notes/_comment.html.erb +++ b/app/views/notes/_comment.html.erb @@ -1,8 +1,8 @@
<% if comment.author.nil? -%> -
<%= t "note.description.#{comment.event}_at_html", :when => friendly_date(comment.created_at) %>
+
<%= t ".#{comment.event}_at_html", :when => friendly_date(comment.created_at) %>
<% else -%> -
<%= t "note.description.#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %>
+
<%= t ".#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %>
<% end -%>
<%= comment.body %>
diff --git a/app/views/notes/_entry.html.erb b/app/views/notes/_entry.html.erb index 6f0c8fb71..624ecd15d 100644 --- a/app/views/notes/_entry.html.erb +++ b/app/views/notes/_entry.html.erb @@ -1,4 +1,4 @@ -

<%= t "note.entry.comment" %>

+

<%= t ".comment" %>

<%= render :partial => "comment", :object => entry %> -

<%= t "note.entry.full" %>

+

<%= t ".full" %>

<%= render :partial => "description", :object => entry.note %> diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder index 38c42f1ec..9c72b8a5d 100644 --- a/app/views/notes/_note.rss.builder +++ b/app/views/notes/_note.rss.builder @@ -2,11 +2,11 @@ xml.item do location = describe_location(note.lat, note.lon, 14, locale) if note.closed? - xml.title t("note.rss.closed", :place => location) + xml.title t("notes.rss.closed", :place => location) elsif note.comments.length > 1 - xml.title t("note.rss.commented", :place => location) + xml.title t("notes.rss.commented", :place => location) else - xml.title t("note.rss.opened", :place => location) + xml.title t("notes.rss.opened", :place => location) end xml.link browse_note_url(note) diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder index 708192e5f..4a4fb3e1a 100644 --- a/app/views/notes/feed.rss.builder +++ b/app/views/notes/feed.rss.builder @@ -5,15 +5,15 @@ xml.rss("version" => "2.0", "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", "xmlns:georss" => "http://www.georss.org/georss") do xml.channel do - xml.title t("note.rss.title") - xml.description t("note.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon) + xml.title t("notes.rss.title") + xml.description t("notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon) xml.link url_for(:controller => "site", :action => "index", :only_path => false) @comments.each do |comment| location = describe_location(comment.note.lat, comment.note.lon, 14, locale) xml.item do - xml.title t("note.rss.#{comment.event}", :place => location) + xml.title t("notes.rss.#{comment.event}", :place => location) xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false) xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false) diff --git a/app/views/notes/index.rss.builder b/app/views/notes/index.rss.builder index e912b9921..d28efa194 100644 --- a/app/views/notes/index.rss.builder +++ b/app/views/notes/index.rss.builder @@ -5,8 +5,8 @@ xml.rss("version" => "2.0", "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", "xmlns:georss" => "http://www.georss.org/georss") do xml.channel do - xml.title t("note.rss.title") - xml.description t("note.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon) + xml.title t("notes.rss.title") + xml.description t("notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon) xml.link url_for(:controller => "site", :action => "index", :only_path => false) xml << (render(:partial => "note", :collection => @notes) || "") diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb index 666c7dc8f..13824419e 100644 --- a/app/views/notes/mine.html.erb +++ b/app/views/notes/mine.html.erb @@ -8,11 +8,11 @@ - - - - - + + + + + <% @notes.each do |note| -%> class="creator"<% end %>> @@ -25,9 +25,9 @@ - - - + + + <% end -%>
<%= t'note.mine.id' %><%= t'note.mine.creator' %><%= t'note.mine.description' %><%= t'note.mine.created_at' %><%= t'note.mine.last_changed' %><%= t '.id' %><%= t '.creator' %><%= t '.description' %><%= t '.created_at' %><%= t '.last_changed' %>
<%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %> <%= note_author(note.author) %><%= note.comments.first.body.to_html %><%= t 'note.mine.ago_html', :when => friendly_date(note.created_at) %><%= t 'note.mine.ago_html', :when => friendly_date(note.updated_at) %><%= note.comments.first.body.to_html %><%= t '.ago_html', :when => friendly_date(note.created_at) %><%= t '.ago_html', :when => friendly_date(note.updated_at) %>
diff --git a/app/views/notes/show.rss.builder b/app/views/notes/show.rss.builder index 62ccbe8a9..f40647900 100644 --- a/app/views/notes/show.rss.builder +++ b/app/views/notes/show.rss.builder @@ -4,8 +4,8 @@ xml.rss("version" => "2.0", "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", "xmlns:georss" => "http://www.georss.org/georss") do xml.channel do - xml.title t("note.rss.title") - xml.description t("note.rss.description_item", :id => @note.id) + xml.title t("notes.rss.title") + xml.description t("notes.rss.description_item", :id => @note.id) xml.link url_for(:controller => "site", :action => "index", :only_path => false) xml << render(:partial => "note", :object => @note) diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb index 6c8bc3a9e..3108c551a 100644 --- a/app/views/oauth/authorize.html.erb +++ b/app/views/oauth/authorize.html.erb @@ -1,19 +1,19 @@ <% content_for :heading do %> -

<%= t "oauth.oauthorize.title" %>

+

<%= t ".title" %>

<% end %> -

<%= raw t("oauth.oauthorize.request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, :controller => :user, :action => :view, :display_name => current_user.display_name)) %>

+

<%= raw t(".request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, :controller => :user, :action => :view, :display_name => current_user.display_name)) %>

<%= form_tag authorize_url do %> <%= hidden_field_tag "oauth_token", @token.token %> <%- if params[:oauth_callback] -%> <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %> <%- end -%> -

<%= t 'oauth.oauthorize.allow_to' %>

+

<%= t '.allow_to' %>

-

<%= submit_tag t("oauth.oauthorize.grant_access") %>

+

<%= submit_tag t(".grant_access") %>

<% end %> diff --git a/app/views/oauth/authorize_failure.html.erb b/app/views/oauth/authorize_failure.html.erb index 4afba70e3..7142a71a0 100644 --- a/app/views/oauth/authorize_failure.html.erb +++ b/app/views/oauth/authorize_failure.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

<%= t "oauth.oauthorize_failure.title" %>

+

<%= t ".title" %>

<% end %>

<%= @message %>

diff --git a/app/views/oauth/authorize_success.html.erb b/app/views/oauth/authorize_success.html.erb index c8f56af33..9c817372f 100644 --- a/app/views/oauth/authorize_success.html.erb +++ b/app/views/oauth/authorize_success.html.erb @@ -1,9 +1,9 @@ <% content_for :heading do %> -

<%= t "oauth.oauthorize_success.title" %>

+

<%= t ".title" %>

<% end %> -

<%= raw t("oauth.oauthorize_success.allowed", :app_name => link_to(@token.client_application.name, @token.client_application.url)) %>

+

<%= raw t(".allowed", :app_name => link_to(@token.client_application.name, @token.client_application.url)) %>

<% if @token.oob? and not @token.oauth10? %> -

<%= t "oauth.oauthorize_success.verification", :code => @token.verifier %>

+

<%= t ".verification", :code => @token.verifier %>

<% end %> diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb index 2dd63c9cb..fe85d0756 100644 --- a/app/views/redactions/edit.html.erb +++ b/app/views/redactions/edit.html.erb @@ -1,22 +1,21 @@ -<% @title = t 'redaction.edit.title' %> +<% @title = t '.title' %> <% content_for :heading do %> -

<%= t 'redaction.edit.heading' %>

+

<%= t '.heading' %>

<% end %> <%= form_for(@redaction) do |f| %> <%= f.error_messages %>

- <%= f.label :title, t('redaction.edit.title') %>
+ <%= f.label :title, t('.title') %>
<%= f.text_field :title %>

- <%= f.label :description, t('redaction.edit.description') %>
+ <%= f.label :description, t('.description') %>
<%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>

- <%= f.submit t('redaction.edit.submit') %> + <%= f.submit t('.submit') %>

<% end %> - diff --git a/app/views/redactions/index.html.erb b/app/views/redactions/index.html.erb index a5a85c38d..b53e9b747 100644 --- a/app/views/redactions/index.html.erb +++ b/app/views/redactions/index.html.erb @@ -1,10 +1,10 @@ -<% @title = t('redaction.index.title') %> +<% @title = t('.title') %> <% content_for :heading do %> -

<%= t('redaction.index.heading') %>

+

<%= t('.heading') %>

<% end %> <% unless @redactions.empty? %> <%= render :partial => 'redactions' %> <% else %> -

<%= t 'redaction.index.empty' %>

+

<%= t '.empty' %>

<% end %> diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb index 5004c0e1e..e6838073d 100644 --- a/app/views/redactions/new.html.erb +++ b/app/views/redactions/new.html.erb @@ -1,22 +1,20 @@ -<% @title = t 'redaction.new.title' %> +<% @title = t '.title' %> <% content_for :heading do %> -

<%= t 'redaction.new.heading' %>

+

<%= t '.heading' %>

<% end %> <%= form_for(@redaction) do |f| %> <%= f.error_messages %>

- <%= f.label :title, t('redaction.new.title') %>
+ <%= f.label :title, t('.title') %>
<%= f.text_field :title %>

- <%= f.label :description, t('redaction.new.description') %>
+ <%= f.label :description, t('.description') %>
<%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>

- <%= f.submit t('redaction.new.submit') %> + <%= f.submit t('.submit') %>

<% end %> - - diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb index 99f7cd1f1..8ec72f3ac 100644 --- a/app/views/redactions/show.html.erb +++ b/app/views/redactions/show.html.erb @@ -1,20 +1,20 @@ -<% @title = t('redaction.show.title') %> +<% @title = t('.title') %> <% content_for :heading do %> -

<%= t('redaction.show.heading', :title => @redaction.title) %>

+

<%= t('.heading', :title => @redaction.title) %>

<% end %>

- <%= t 'redaction.show.user' %> + <%= t '.user' %> <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>

- <%= t 'redaction.show.description' %> + <%= t '.description' %> <%= @redaction.description.to_html %>

<% if current_user and current_user.moderator? %>
- <%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %> - <%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %> + <%= button_to t('.edit'), edit_redaction_path(@redaction), :method => :get %> + <%= button_to t('.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('.confirm') } %>
<% end %> diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb index 7c5639912..aeb3a1be5 100644 --- a/app/views/site/_markdown_help.html.erb +++ b/app/views/site/_markdown_help.html.erb @@ -1,26 +1,26 @@ -

<%= t "site.markdown_help.title_html" %>

+

<%= t ".title_html" %>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index 0c8075c6e..702a0243d 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -1,37 +1,37 @@
- <%= t "about_page.copyright_html" %> + <%= t ".copyright_html" %>
-

<%= raw t "about_page.used_by", :name => "OpenStreetMap" %>

+

<%= raw t ".used_by", :name => "OpenStreetMap" %>

-

<%= t "about_page.lede_text" %>

-

<%= t "about_page.local_knowledge_title" %>

-

<%= t "about_page.local_knowledge_html" %>

+

<%= t ".lede_text" %>

+

<%= t ".local_knowledge_title" %>

+

<%= t ".local_knowledge_html" %>

-

<%= t "about_page.community_driven_title" %>

-

<%= t "about_page.community_driven_html", :diary_path => diary_path %>

+

<%= t ".community_driven_title" %>

+

<%= t ".community_driven_html", :diary_path => diary_path %>

-

<%= t "about_page.open_data_title" %>

-

<%= t "about_page.open_data_html", :copyright_path => copyright_path %>

+

<%= t ".open_data_title" %>

+

<%= t ".open_data_html", :copyright_path => copyright_path %>

-

<%= t "about_page.partners_title" %>

+

<%= t ".partners_title" %>

<%= t 'layouts.partners_html', :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 887782be2..1b85d201c 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -2,15 +2,15 @@ <% if @locale == 'en' %> - <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> -

<%= t 'license_page.native.title' %>

+ <% if t('.legal_babble', :locale => I18n.locale) != t('.legal_babble', :locale => :en) %> +

<%= t '.native.title' %>

- <%= raw t 'license_page.native.text', - :native_link => link_to(t('license_page.native.native_link'), + <%= raw t '.native.text', + :native_link => link_to(t('.native.native_link'), :controller => 'site', :action => 'copyright', :copyright_locale => nil), - :mapping_link => link_to(t('license_page.native.mapping_link'), + :mapping_link => link_to(t('.native.mapping_link'), :controller => 'site', :action => 'index') %>

@@ -18,11 +18,11 @@ <% end %> <% else %> - <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> -

<%= t 'license_page.foreign.title' %>

+ <% if t('.legal_babble', :locale => @locale) != t('.legal_babble', :locale => :en) %> +

<%= t '.foreign.title' %>

- <%= raw t 'license_page.foreign.text', - :english_original_link => link_to(t('license_page.foreign.english_link'), + <%= raw t '.foreign.text', + :english_original_link => link_to(t('.foreign.english_link'), :controller => 'site', :action => 'copyright', :copyright_locale => 'en') %> @@ -31,46 +31,46 @@ <% end %> <% end %> -

<%= t "license_page.legal_babble.title_html", :locale => @locale %>

+

<%= t ".legal_babble.title_html", :locale => @locale %>

<% end %> -

<%= t "license_page.legal_babble.intro_1_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.intro_2_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.intro_3_html", :locale => @locale %>

+

<%= t ".legal_babble.intro_1_html", :locale => @locale %>

+

<%= t ".legal_babble.intro_2_html", :locale => @locale %>

+

<%= t ".legal_babble.intro_3_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.credit_title_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.credit_1_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.credit_2_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.credit_3_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_title_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_1_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_2_html", :locale => @locale %>

+

<%= t ".legal_babble.credit_3_html", :locale => @locale %>

<%= image_tag("attribution_example.png", - :alt => t('license_page.legal_babble.attribution_example.alt'), + :alt => t('.legal_babble.attribution_example.alt'), :border => 0, - :title => t('license_page.legal_babble.attribution_example.title')) %> + :title => t('.legal_babble.attribution_example.title')) %> -

<%= t "license_page.legal_babble.more_title_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.more_1_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.more_2_html", :locale => @locale %>

+

<%= t ".legal_babble.more_title_html", :locale => @locale %>

+

<%= t ".legal_babble.more_1_html", :locale => @locale %>

+

<%= t ".legal_babble.more_2_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.contributors_title_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %>

+

<%= t ".legal_babble.contributors_title_html", :locale => @locale %>

+

<%= t ".legal_babble.contributors_intro_html", :locale => @locale %>

    -
  • <%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_fi_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_si_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_za_html", :locale => @locale %>
    • -
  • <%= t "license_page.legal_babble.contributors_gb_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_at_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_ca_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_fi_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_fr_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_nl_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_nz_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_si_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_za_html", :locale => @locale %>
    • +
  • <%= t ".legal_babble.contributors_gb_html", :locale => @locale %>
-

<%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %>

+

<%= t ".legal_babble.contributors_footer_1_html", :locale => @locale %>

+

<%= t ".legal_babble.contributors_footer_2_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %>

+

<%= t ".legal_babble.infringement_title_html", :locale => @locale %>

+

<%= t ".legal_babble.infringement_1_html", :locale => @locale %>

+

<%= t ".legal_babble.infringement_2_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.trademarks_title_html", :locale => @locale %>

-

<%= t "license_page.legal_babble.trademarks_1_html", :locale => @locale %>

+

<%= t ".legal_babble.trademarks_title_html", :locale => @locale %>

+

<%= t ".legal_babble.trademarks_1_html", :locale => @locale %>

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index 81095140e..e84adf2d4 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -4,9 +4,9 @@ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>

<%= t 'layouts.osm_read_only' %>

<% elsif !current_user.data_public? %> -

<%= t 'site.edit.not_public' %>

-

<%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %>

-

<%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

+

<%= t '.not_public' %>

+

<%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %>

+

<%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %>

<% else %> <%= render :partial => preferred_editor %> <% end %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index bf5376fb5..f11ad8d79 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -1,8 +1,8 @@ -<% set_title(t('export.title')) %> +<% set_title(t('.title')) %>

- <%= t 'export.title' %> + <%= t '.title' %>

<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %> @@ -17,37 +17,37 @@

<%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
- <%= t'export.start.manually_select' %> + <%= t '.manually_select' %>
-

<%= t'export.start.licence' %>

-

<%= raw t 'export.start.export_details' %>

+

<%= t '.licence' %>

+

<%= raw t '.export_details' %>

- <%= t'export.start.too_large.body' %> + <%= t '.too_large.body' %>

- <%= submit_tag t('export.start.export_button') %> + <%= submit_tag t('.export_button') %>
-

<%= t'export.start.too_large.advice' %>

+

<%= t '.too_large.advice' %>

-
-
<%= t'export.start.too_large.overpass.title' %>
-
<%= t'export.start.too_large.overpass.description' %>
- -
<%= t'export.start.too_large.planet.title' %>
-
<%= t'export.start.too_large.planet.description' %>
+
+
<%= t '.too_large.overpass.title' %>
+
<%= t '.too_large.overpass.description' %>
-
<%= t'export.start.too_large.geofabrik.title' %>
-
<%= t'export.start.too_large.geofabrik.description' %>
+
<%= t '.too_large.planet.title' %>
+
<%= t '.too_large.planet.description' %>
-
<%= t'export.start.too_large.other.title' %>
-
<%= t'export.start.too_large.other.description' %>
+
<%= t '.too_large.geofabrik.title' %>
+
<%= t '.too_large.geofabrik.description' %>
+ +
<%= t '.too_large.other.title' %>
+
<%= t '.too_large.other.description' %>
<% end %> diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb index fc5fecc9a..571a9b25f 100644 --- a/app/views/site/fixthemap.html.erb +++ b/app/views/site/fixthemap.html.erb @@ -3,35 +3,35 @@ <% end %> <% content_for :heading do %> -

<%= t "fixthemap.title" %>

+

<%= t ".title" %>

<% end %>

<%= t "layouts.intro_header" %>

<%= t "layouts.intro_text" %>

-

<%= t "fixthemap.how_to_help.title" %>

+

<%= t ".how_to_help.title" %>

-

<%= t "fixthemap.how_to_help.join_the_community.title" %>

- <%= t "fixthemap.how_to_help.join_the_community.explanation_html" %> +

<%= t ".how_to_help.join_the_community.title" %>

+ <%= t ".how_to_help.join_the_community.explanation_html" %>
-

<%= t "welcome_page.add_a_note.title" %>

-

<%= t "welcome_page.add_a_note.paragraph_1_html" %>

-

<%= t "fixthemap.how_to_help.add_a_note.instructions_html", :map_url => root_path %>

+

<%= t "site.welcome.add_a_note.title" %>

+

<%= t "site.welcome.add_a_note.paragraph_1_html" %>

+

<%= t ".how_to_help.add_a_note.instructions_html", :map_url => root_path %>

-

<%= t "fixthemap.other_concerns.title" %>

-

<%= t "fixthemap.other_concerns.explanation_html" %>

+

<%= t ".other_concerns.title" %>

+

<%= t ".other_concerns.explanation_html" %>

-

<%= t "welcome_page.questions.title" %>

+

<%= t "site.welcome.questions.title" %>

-

<%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>

+

<%= t "site.welcome.questions.paragraph_1_html", :help_url => help_path %>

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index dff2108ca..085ea63d5 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -1,18 +1,18 @@ <% content_for :heading do %> -

<%= t "help_page.title" %>

+

<%= t ".title" %>

<% end %> -

<%= t "help_page.introduction" %>

+

<%= t ".introduction" %>

<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'wiki'].each do |site| %> <% unless site == 'welcome' && !current_user %>

- - <%= t "help_page.#{site}.title" %> + + <%= t ".#{site}.title" %>

-

<%= t "help_page.#{site}.description" %>

+

<%= t ".#{site}.description" %>

<% end %> <% end %> diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb index 039c9a51c..91dfd1250 100644 --- a/app/views/site/key.html.erb +++ b/app/views/site/key.html.erb @@ -7,7 +7,7 @@ <%= image_tag "key/#{name}/#{entry['image']}" %> - <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %> + <%= [*t(".table.entry.#{entry['name']}")].to_sentence %> <% end %> diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 92220039a..dc6a519df 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -3,71 +3,71 @@ <% end %> <% content_for :heading do %> -

<%= t "welcome_page.title" %>

+

<%= t ".title" %>

<% end %> -

<%= t "welcome_page.introduction_html" %>

+

<%= t ".introduction_html" %>

-

<%= t "welcome_page.whats_on_the_map.title" %>

+

<%= t ".whats_on_the_map.title" %>

-

<%= t "welcome_page.whats_on_the_map.on_html" %>

+

<%= t ".whats_on_the_map.on_html" %>

-

<%= t "welcome_page.whats_on_the_map.off_html" %>

+

<%= t ".whats_on_the_map.off_html" %>

-

<%= t "welcome_page.basic_terms.title" %>

+

<%= t ".basic_terms.title" %>

-

<%= t "welcome_page.basic_terms.paragraph_1_html" %>

+

<%= t ".basic_terms.paragraph_1_html" %>

-

<%= t "welcome_page.basic_terms.editor_html" %>

+

<%= t ".basic_terms.editor_html" %>

-

<%= t "welcome_page.basic_terms.node_html" %>

+

<%= t ".basic_terms.node_html" %>

-

<%= t "welcome_page.basic_terms.way_html" %>

+

<%= t ".basic_terms.way_html" %>

-

<%= t "welcome_page.basic_terms.tag_html" %>

+

<%= t ".basic_terms.tag_html" %>

-

<%= t "welcome_page.rules.title" %>

+

<%= t ".rules.title" %>

-

<%= t "welcome_page.rules.paragraph_1_html" %>

+

<%= t ".rules.paragraph_1_html" %>

-

<%= t "welcome_page.questions.title" %>

+

<%= t ".questions.title" %>

-

<%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>

+

<%= t ".questions.paragraph_1_html", :help_url => help_path %>

- <%= t "welcome_page.start_mapping" %> + <%= t ".start_mapping" %>
-

<%= t "welcome_page.add_a_note.title" %>

-

<%= t "welcome_page.add_a_note.paragraph_1_html" %>

-

<%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %>

+

<%= t ".add_a_note.title" %>

+

<%= t ".add_a_note.paragraph_1_html" %>

+

<%= t ".add_a_note.paragraph_2_html", :map_url => root_path %>

diff --git a/app/views/user/index.html.erb b/app/views/user/index.html.erb deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb index 8b7a290fc..69af9374a 100644 --- a/app/views/user_blocks/blocks_by.html.erb +++ b/app/views/user_blocks/blocks_by.html.erb @@ -1,10 +1,10 @@ -<% @title = t('user_block.blocks_by.title', :name => h(@user.display_name)) %> +<% @title = t('.title', :name => h(@user.display_name)) %> <% content_for :heading do %> -

<%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %>

+

<%= raw(t('.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %>

<% end %> <% unless @user_blocks.empty? %> <%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %> <% else %> -

<%= t "user_block.blocks_by.empty", :name => h(@user.display_name) %>

+

<%= t ".empty", :name => h(@user.display_name) %>

<% end %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb index 7abcc8674..6e4fd3ca6 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/user_blocks/blocks_on.html.erb @@ -1,9 +1,9 @@ -<% @title = t('user_block.blocks_on.title', :name => h(@user.display_name)) %> +<% @title = t('.title', :name => h(@user.display_name)) %> <% content_for :heading do %> -

<%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %>

+

<%= raw(t('.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %>

<% end %> <% unless @user_blocks.empty? %> <%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %> <% else %> -

<%= t "user_block.blocks_on.empty", :name => h(@user.display_name) %>

+

<%= t ".empty", :name => h(@user.display_name) %>

<% end %> diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index 289f7a831..a3bb9c682 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -1,11 +1,11 @@ -<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %> +<% @title = t '.title', :name => h(@user_block.user.display_name) %> <% content_for :heading do %> -

<%= raw t('user_block.edit.title', +

<%= raw t('.title', :name => link_to(h(@user_block.user.display_name), user_path(@user_block.user))) %>

<% end %> @@ -13,18 +13,18 @@ <%= f.error_messages %>

- <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %>
+ <%= f.label :reason, t('.reason', :name => h(@user_block.user.display_name)) %>
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>

- <%= label_tag 'user_block_period', t('user_block.edit.period') %>
- <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.period', :count => h), h.to_s] }, params[:user_block_period])) %> + <%= label_tag 'user_block_period', t('.period') %>
+ <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>

<%= f.check_box :needs_view %> - <%= f.label :needs_view, t('user_block.edit.needs_view') %> + <%= f.label :needs_view, t('.needs_view') %>

- <%= f.submit t('user_block.edit.submit') %> + <%= f.submit t('.submit') %>

<% end %> diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb index ce7f12b91..adfc0dc28 100644 --- a/app/views/user_blocks/index.html.erb +++ b/app/views/user_blocks/index.html.erb @@ -1,10 +1,10 @@ -<% @title = t('user_block.index.title') %> +<% @title = t('.title') %> <% content_for :heading do %> -

<%= t('user_block.index.heading') %>

+

<%= t('.heading') %>

<% end %> <% unless @user_blocks.empty? %> <%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %> <% else %> -

<%= t "user_block.index.empty" %>

+

<%= t ".empty" %>

<% end %> diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb index f26a91c5c..bd941babc 100644 --- a/app/views/user_blocks/new.html.erb +++ b/app/views/user_blocks/new.html.erb @@ -1,6 +1,6 @@ -<% @title = t 'user_block.new.title', :name => h(@user.display_name) %> +<% @title = t '.title', :name => h(@user.display_name) %> <% content_for :heading do %> -

<%= raw t('user_block.new.heading', +

<%= raw t('.heading', :name => link_to( h(@user.display_name), user_path(@user))) %>

@@ -9,21 +9,21 @@ <%= f.error_messages %>

- <%= f.label :reason, t('user_block.new.reason', :name => @user.display_name) %>
+ <%= f.label :reason, t('.reason', :name => @user.display_name) %>
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>

- <%= label_tag 'user_block_period', t('user_block.new.period') %>
- <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.period', :count => h), h.to_s] }, params[:user_block_period] )) %> + <%= label_tag 'user_block_period', t('.period') %>
+ <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period] )) %>

<%= f.check_box :needs_view %> - <%= f.label :needs_view, t('user_block.new.needs_view') %> + <%= f.label :needs_view, t('.needs_view') %>

<%= hidden_field_tag 'display_name', @user.display_name %> - <%= f.submit t('user_block.new.submit') %> + <%= f.submit t('.submit') %>

<% end %> -<%= link_to t('user_block.new.back'), user_blocks_path %> +<%= link_to t('.back'), user_blocks_path %> diff --git a/app/views/user_blocks/not_found.html.erb b/app/views/user_blocks/not_found.html.erb index 3b5323d72..6aad7eef3 100644 --- a/app/views/user_blocks/not_found.html.erb +++ b/app/views/user_blocks/not_found.html.erb @@ -1,3 +1,3 @@ -

<%= t'user_block.not_found.sorry', :id => params[:id] %>

+

<%= t'.sorry', :id => params[:id] %>

-<%= link_to t('user_block.not_found.back'), user_blocks_path %> +<%= link_to t('.back'), user_blocks_path %> diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index f812ffff6..c7eee6703 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,9 +1,9 @@ -<% @title = t('user_block.revoke.title', +<% @title = t('.title', :block_on => h(@user_block.user.display_name), :block_by => h(@user_block.creator.display_name)) %> <% content_for :heading do %> -

<%= raw t('user_block.revoke.heading', +

<%= raw t('.heading', :block_on => link_to( h(@user_block.user.display_name), user_path(@user_block.user)), @@ -14,22 +14,22 @@ <% if @user_block.ends_at > Time.now %>

- <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> + <%= t('.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

<%= form_for :revoke, :url => { :action => "revoke" } do |f| %> <%= f.error_messages %>

<%= check_box_tag 'confirm', 'yes' %> - <%= label_tag 'confirm', t('user_block.revoke.confirm') %> + <%= label_tag 'confirm', t('.confirm') %>

- <%= submit_tag t('user_block.revoke.revoke') %> + <%= submit_tag t('.revoke') %>

<% end %> <% else %>

- <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> + <%= t('.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

<% end %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 51fbcaf49..4dc03f4e4 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,9 +1,9 @@ -<% @title = t('user_block.show.title', +<% @title = t('.title', :block_on => @user_block.user.display_name, :block_by => @user_block.creator.display_name) %> <% content_for :heading do %> -

<%= raw t('user_block.show.heading', +

<%= raw t('.heading', :block_on => link_to( h(@user_block.user.display_name), user_path(@user_block.user)), @@ -13,26 +13,26 @@
    <% if @user_block.ends_at > Time.now.getutc %> <% if current_user and current_user.id == @user_block.creator_id %> -
  • <%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %>
    • +
  • <%= link_to t('.edit'), edit_user_block_path(@user_block) %>
    • <% end %> <% if current_user and current_user.moderator? %> -
  • <%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %>
    • +
  • <%= link_to(t('.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %>
    • <% end %> <% end %> -
  • <%= link_to t('user_block.show.back'), user_blocks_path %>
    • +
  • <%= link_to t('.back'), user_blocks_path %>
<% end %> <% if @user_block.revoker %>

- <%= t'user_block.show.revoker' %> + <%= t'.revoker' %> <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>

<% end %> -

<%= t'user_block.show.created' %>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %>

+

<%= t'.created' %>: <%= raw t'.ago', :time => friendly_date(@user_block.created_at) %>

-

<%= t'user_block.show.status' %>: <%= block_status(@user_block) %>

+

<%= t'.status' %>: <%= block_status(@user_block) %>

-

<%= t'user_block.show.reason' %>

+

<%= t'.reason' %>

<%= @user_block.reason.to_html %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index b31ce4d5d..9e923185d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -323,47 +323,6 @@ en: ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" - export: - title: "Export" - start: - area_to_export: "Area to Export" - manually_select: "Manually select a different area" - format_to_export: "Format to Export" - osm_xml_data: "OpenStreetMap XML Data" - map_image: "Map Image (shows standard layer)" - embeddable_html: "Embeddable HTML" - licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' - too_large: - advice: "If the above export fails, please consider using one of the sources listed below:" - body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." - planet: - title: "Planet OSM" - description: "Regularly-updated copies of the complete OpenStreetMap database" - overpass: - title: "Overpass API" - description: "Download this bounding box from a mirror of the OpenStreetMap database" - geofabrik: - title: "Geofabrik Downloads" - description: "Regularly-updated extracts of continents, countries, and selected cities" - metro: - title: "Metro Extracts" - description: "Extracts for major world cities and their surrounding areas" - other: - title: "Other Sources" - description: "Additional sources listed on the OpenStreetMap wiki" - options: "Options" - format: "Format" - scale: "Scale" - max: "max" - image_size: "Image Size" - zoom: "Zoom" - add_marker: "Add a marker to the map" - latitude: "Lat:" - longitude: "Lon:" - output: "Output" - paste_html: "Paste HTML to embed in website" - export_button: "Export" geocoder: search: title: @@ -1009,285 +968,6 @@ en: text: Make a Donation learn_more: "Learn More" more: More - license_page: - foreign: - title: About this translation - text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence - english_link: the English original - native: - title: About this page - text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. - native_link: THIS_LANGUAGE_NAME_HERE version - mapping_link: start mapping - legal_babble: - title_html: Copyright and License - intro_1_html: | - OpenStreetMap® is open data, licensed under the Open Data - Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). - intro_2_html: | - You are free to copy, distribute, transmit and adapt our data, - as long as you credit OpenStreetMap and its - contributors. If you alter or build upon our data, you - may distribute the result only under the same licence. The - full legal - code explains your rights and responsibilities. - intro_3_html: | - The cartography in our map tiles, and our documentation, are - licensed under the Creative - Commons Attribution-ShareAlike 2.0 license (CC BY-SA). - credit_title_html: How to credit OpenStreetMap - credit_1_html: | - We require that you use the credit “© OpenStreetMap - contributors”. - credit_2_html: | - You must also make it clear that the data is available under the Open - Database License, and if using our map tiles, that the cartography is - licensed as CC BY-SA. You may do this by linking to - this copyright page. - Alternatively, and as a requirement if you are distributing OSM in a - data form, you can name and link directly to the license(s). In media - where links are not possible (e.g. printed works), we suggest you - direct your readers to openstreetmap.org (perhaps by expanding - 'OpenStreetMap' to this full address), to opendatacommons.org, and - if relevant, to creativecommons.org. - credit_3_html: | - For a browsable electronic map, the credit should appear in the corner of the map. - For example: - attribution_example: - alt: Example of how to attribute OpenStreetMap on a webpage - title: Attribution example - more_title_html: Finding out more - more_1_html: | - Read more about using our data, and how to credit us, at the OSMF Licence page. - more_2_html: | - Although OpenStreetMap is open data, we cannot provide a - free-of-charge map API for third-parties. - See our API Usage Policy, - Tile Usage Policy - and Nominatim Usage Policy. - contributors_title_html: Our contributors - contributors_intro_html: | - Our contributors are thousands of individuals. We also include - openly-licensed data from national mapping agencies - and other sources, among them: - contributors_at_html: | - Austria: Contains data from - Stadt Wien (under - CC BY), - Land Vorarlberg and - Land Tirol (under CC BY AT with amendments). - contributors_ca_html: | - Canada: Contains data from - GeoBase®, GeoGratis (© Department of Natural - Resources Canada), CanVec (© Department of Natural - Resources Canada), and StatCan (Geography Division, - Statistics Canada). - contributors_fi_html: | - Finland: Contains data from the - National Land Survey of Finland's Topographic Database - and other datasets, under the - NLSFI License. - contributors_fr_html: | - France: Contains data sourced from - Direction Générale des Impôts. - contributors_nl_html: | - Netherlands: Contains © AND data, 2007 - (www.and.com) - contributors_nz_html: | - New Zealand: Contains data sourced from - Land Information New Zealand. Crown Copyright reserved. - contributors_si_html: | - Slovenia: Contains data from the - Surveying and Mapping Authority and - Ministry of Agriculture, Forestry and Food - (public information of Slovenia). - contributors_za_html: | - South Africa: Contains data sourced from - Chief Directorate: - National Geo-Spatial Information, State copyright reserved. - contributors_gb_html: | - United Kingdom: Contains Ordnance - Survey data © Crown copyright and database right - 2010-12. - contributors_footer_1_html: | - For further details of these, and other sources that have been used - to help improve OpenStreetMap, please see the Contributors - page on the OpenStreetMap Wiki. - contributors_footer_2_html: | - Inclusion of data in OpenStreetMap does not imply that the original - data provider endorses OpenStreetMap, provides any warranty, or - accepts any liability. - infringement_title_html: Copyright infringement - infringement_1_html: | - OSM contributors are reminded never to add data from any - copyrighted sources (e.g. Google Maps or printed maps) without - explicit permission from the copyright holders. - infringement_2_html: | - If you believe that copyrighted material has been inappropriately - added to the OpenStreetMap database or this site, please refer - to our takedown - procedure or file directly at our - on-line filing page. - trademarks_title_html: Trademarks - trademarks_1_html: | - OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our Trademark Policy. - welcome_page: - title: Welcome! - introduction_html: | - Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed - up, you're all set to get started mapping. Here's a quick guide with the most important - things you need to know. - whats_on_the_map: - title: What's on the Map - on_html: | - OpenStreetMap is a place for mapping things that are both real and current - - it includes millions of buildings, roads, and other details about places. You can map - whatever real-world features are interesting to you. - off_html: | - What it doesn't include is opinionated data like ratings, historical or - hypothetical features, and data from copyrighted sources. Unless you have special - permission, don't copy from online or paper maps. - basic_terms: - title: Basic Terms For Mapping - paragraph_1_html: | - OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. - editor_html: | - An editor is a program or website you can use to edit the map. - node_html: | - A node is a point on the map, like a single restaurant or a tree. - way_html: | - A way is a line or area, like a road, stream, lake or building. - tag_html: | - A tag is a bit of data about a node or way, like a - restaurant's name or a road's speed limit. - rules: - title: Rules! - paragraph_1_html: | - OpenStreetMap has few formal rules but we expect all participants to collaborate - with, and communicate with, the community. If you are considering - any activities other than editing by hand, please read and follow the guidelines on - Imports and - Automated Edits. - questions: - title: Any questions? - paragraph_1_html: | - OpenStreetMap has several resources for learning about the project, asking and answering - questions, and collaboratively discussing and documenting mapping topics. - Get help here. - start_mapping: Start Mapping - add_a_note: - title: No Time To Edit? Add a Note! - paragraph_1_html: | - If you just want something small fixed and don't have the time to sign up and learn how to edit, it's - easy to add a note. - paragraph_2_html: | - Just go to the map and click the note icon: - . This will add a marker to the map, which you can move - by dragging. Add your message, then click save, and other mappers will investigate. - fixthemap: - title: Report a problem / Fix the map - how_to_help: - title: How to Help - join_the_community: - title: Join the community - explanation_html: | - If you have noticed a problem with our map data, for example a road is missing or your address, the best way to - proceed is to join the OpenStreetMap community and add or repair the data yourself. - add_a_note: - instructions_html: | - Just click or the same icon on the map display. - This will add a marker to the map, which you can move - by dragging. Add your message, then click save, and other mappers will investigate. - other_concerns: - title: Other concerns - explanation_html: | - If you have concerns about how our data is being used or about the contents please consult our - copyright page for more legal information, or contact the appropriate - OSMF working group. - help_page: - title: Getting Help - introduction: | - OpenStreetMap has several resources for learning about the project, asking and answering questions, - and collaboratively discussing and documenting mapping topics. - welcome: - url: /welcome - title: Welcome to OSM - description: Start with this quick guide covering the OpenStreetMap basics. - beginners_guide: - url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide - title: Beginners' Guide - description: Community maintained guide for beginners. - help: - url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Ask a question or look up answers on OSM's question-and-answer site. - mailing_lists: - url: https://lists.openstreetmap.org/ - title: Mailing Lists - description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. - forums: - url: https://forum.openstreetmap.org/ - title: Forums - description: Questions and discussions for those that prefer a bulletin board style interface. - irc: - url: https://irc.openstreetmap.org/ - title: IRC - description: Interactive chat in many different languages and on many topics. - switch2osm: - url: https://switch2osm.org/ - title: switch2osm - description: Help for companies and organisations switching to OpenStreetMap based maps and other services. - wiki: - url: https://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Browse the wiki for in-depth OSM documentation. - about_page: - next: Next - copyright_html: ©OpenStreetMap
contributors - used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" - lede_text: | - OpenStreetMap is built by a community of mappers that contribute and maintain data - about roads, trails, cafés, railway stations, and much more, all over the world. - local_knowledge_title: Local Knowledge - local_knowledge_html: | - OpenStreetMap emphasizes local knowledge. Contributors use - aerial imagery, GPS devices, and low-tech field maps to verify that OSM - is accurate and up to date. - community_driven_title: Community Driven - community_driven_html: | - OpenStreetMap's community is diverse, passionate, and growing every day. - Our contributors include enthusiast mappers, GIS professionals, engineers - running the OSM servers, humanitarians mapping disaster-affected areas, - and many more. - To learn more about the community, see the - OpenStreetMap Blog, - user diaries, - community blogs, and - the OSM Foundation website. - open_data_title: Open Data - open_data_html: | - OpenStreetMap is open data: you are free to use it for any purpose - as long as you credit OpenStreetMap and its contributors. If you alter or - build upon the data in certain ways, you may distribute the result only - under the same licence. See the Copyright and - License page for details. - legal_title: Legal - legal_html: | - This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) - on behalf of the community. Use of all OSMF operated services is subject - to our - Acceptable Use Policies and our Privacy Policy -
- Please contact the OSMF - if you have licensing, copyright or other legal questions. -
- OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. - partners_title: Partners notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on a diary entry" @@ -1446,6 +1126,175 @@ en: delete: deleted: "Message deleted" site: + about: + next: Next + copyright_html: ©OpenStreetMap
contributors + used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" + lede_text: | + OpenStreetMap is built by a community of mappers that contribute and maintain data + about roads, trails, cafés, railway stations, and much more, all over the world. + local_knowledge_title: Local Knowledge + local_knowledge_html: | + OpenStreetMap emphasizes local knowledge. Contributors use + aerial imagery, GPS devices, and low-tech field maps to verify that OSM + is accurate and up to date. + community_driven_title: Community Driven + community_driven_html: | + OpenStreetMap's community is diverse, passionate, and growing every day. + Our contributors include enthusiast mappers, GIS professionals, engineers + running the OSM servers, humanitarians mapping disaster-affected areas, + and many more. + To learn more about the community, see the + OpenStreetMap Blog, + user diaries, + community blogs, and + the OSM Foundation website. + open_data_title: Open Data + open_data_html: | + OpenStreetMap is open data: you are free to use it for any purpose + as long as you credit OpenStreetMap and its contributors. If you alter or + build upon the data in certain ways, you may distribute the result only + under the same licence. See the Copyright and + License page for details. + legal_title: Legal + legal_html: | + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + on behalf of the community. Use of all OSMF operated services is subject + to our + Acceptable Use Policies and our Privacy Policy +
+ Please contact the OSMF + if you have licensing, copyright or other legal questions. +
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. + partners_title: Partners + copyright: + foreign: + title: About this translation + text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence + english_link: the English original + native: + title: About this page + text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. + native_link: THIS_LANGUAGE_NAME_HERE version + mapping_link: start mapping + legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap® is open data, licensed under the Open Data + Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). + intro_2_html: | + You are free to copy, distribute, transmit and adapt our data, + as long as you credit OpenStreetMap and its + contributors. If you alter or build upon our data, you + may distribute the result only under the same licence. The + full legal + code explains your rights and responsibilities. + intro_3_html: | + The cartography in our map tiles, and our documentation, are + licensed under the Creative + Commons Attribution-ShareAlike 2.0 license (CC BY-SA). + credit_title_html: How to credit OpenStreetMap + credit_1_html: | + We require that you use the credit “© OpenStreetMap + contributors”. + credit_2_html: | + You must also make it clear that the data is available under the Open + Database License, and if using our map tiles, that the cartography is + licensed as CC BY-SA. You may do this by linking to + this copyright page. + Alternatively, and as a requirement if you are distributing OSM in a + data form, you can name and link directly to the license(s). In media + where links are not possible (e.g. printed works), we suggest you + direct your readers to openstreetmap.org (perhaps by expanding + 'OpenStreetMap' to this full address), to opendatacommons.org, and + if relevant, to creativecommons.org. + credit_3_html: | + For a browsable electronic map, the credit should appear in the corner of the map. + For example: + attribution_example: + alt: Example of how to attribute OpenStreetMap on a webpage + title: Attribution example + more_title_html: Finding out more + more_1_html: | + Read more about using our data, and how to credit us, at the OSMF Licence page. + more_2_html: | + Although OpenStreetMap is open data, we cannot provide a + free-of-charge map API for third-parties. + See our API Usage Policy, + Tile Usage Policy + and Nominatim Usage Policy. + contributors_title_html: Our contributors + contributors_intro_html: | + Our contributors are thousands of individuals. We also include + openly-licensed data from national mapping agencies + and other sources, among them: + contributors_at_html: | + Austria: Contains data from + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC BY AT with amendments). + contributors_ca_html: | + Canada: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fi_html: | + Finland: Contains data from the + National Land Survey of Finland's Topographic Database + and other datasets, under the + NLSFI License. + contributors_fr_html: | + France: Contains data sourced from + Direction Générale des Impôts. + contributors_nl_html: | + Netherlands: Contains © AND data, 2007 + (www.and.com) + contributors_nz_html: | + New Zealand: Contains data sourced from + Land Information New Zealand. Crown Copyright reserved. + contributors_si_html: | + Slovenia: Contains data from the + Surveying and Mapping Authority and + Ministry of Agriculture, Forestry and Food + (public information of Slovenia). + contributors_za_html: | + South Africa: Contains data sourced from + Chief Directorate: + National Geo-Spatial Information, State copyright reserved. + contributors_gb_html: | + United Kingdom: Contains Ordnance + Survey data © Crown copyright and database right + 2010-12. + contributors_footer_1_html: | + For further details of these, and other sources that have been used + to help improve OpenStreetMap, please see the Contributors + page on the OpenStreetMap Wiki. + contributors_footer_2_html: | + Inclusion of data in OpenStreetMap does not imply that the original + data provider endorses OpenStreetMap, provides any warranty, or + accepts any liability. + infringement_title_html: Copyright infringement + infringement_1_html: | + OSM contributors are reminded never to add data from any + copyrighted sources (e.g. Google Maps or printed maps) without + explicit permission from the copyright holders. + infringement_2_html: | + If you believe that copyrighted material has been inappropriately + added to the OpenStreetMap database or this site, please refer + to our takedown + procedure or file directly at our + on-line filing page. + trademarks_title_html: Trademarks + trademarks_1_html: | + OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our Trademark Policy. index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." @@ -1470,6 +1319,103 @@ en: potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)" id_not_configured: "iD has not been configured" no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature." + export: + title: "Export" + area_to_export: "Area to Export" + manually_select: "Manually select a different area" + format_to_export: "Format to Export" + osm_xml_data: "OpenStreetMap XML Data" + map_image: "Map Image (shows standard layer)" + embeddable_html: "Embeddable HTML" + licence: "Licence" + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' + too_large: + advice: "If the above export fails, please consider using one of the sources listed below:" + body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." + planet: + title: "Planet OSM" + description: "Regularly-updated copies of the complete OpenStreetMap database" + overpass: + title: "Overpass API" + description: "Download this bounding box from a mirror of the OpenStreetMap database" + geofabrik: + title: "Geofabrik Downloads" + description: "Regularly-updated extracts of continents, countries, and selected cities" + metro: + title: "Metro Extracts" + description: "Extracts for major world cities and their surrounding areas" + other: + title: "Other Sources" + description: "Additional sources listed on the OpenStreetMap wiki" + options: "Options" + format: "Format" + scale: "Scale" + max: "max" + image_size: "Image Size" + zoom: "Zoom" + add_marker: "Add a marker to the map" + latitude: "Lat:" + longitude: "Lon:" + output: "Output" + paste_html: "Paste HTML to embed in website" + export_button: "Export" + fixthemap: + title: Report a problem / Fix the map + how_to_help: + title: How to Help + join_the_community: + title: Join the community + explanation_html: | + If you have noticed a problem with our map data, for example a road is missing or your address, the best way to + proceed is to join the OpenStreetMap community and add or repair the data yourself. + add_a_note: + instructions_html: | + Just click or the same icon on the map display. + This will add a marker to the map, which you can move + by dragging. Add your message, then click save, and other mappers will investigate. + other_concerns: + title: Other concerns + explanation_html: | + If you have concerns about how our data is being used or about the contents please consult our + copyright page for more legal information, or contact the appropriate + OSMF working group. + help: + title: Getting Help + introduction: | + OpenStreetMap has several resources for learning about the project, asking and answering questions, + and collaboratively discussing and documenting mapping topics. + welcome: + url: /welcome + title: Welcome to OSM + description: Start with this quick guide covering the OpenStreetMap basics. + beginners_guide: + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide + title: Beginners' Guide + description: Community maintained guide for beginners. + help: + url: https://help.openstreetmap.org/ + title: help.openstreetmap.org + description: Ask a question or look up answers on OSM's question-and-answer site. + mailing_lists: + url: https://lists.openstreetmap.org/ + title: Mailing Lists + description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. + forums: + url: https://forum.openstreetmap.org/ + title: Forums + description: Questions and discussions for those that prefer a bulletin board style interface. + irc: + url: https://irc.openstreetmap.org/ + title: IRC + description: Interactive chat in many different languages and on many topics. + switch2osm: + url: https://switch2osm.org/ + title: switch2osm + description: Help for companies and organisations switching to OpenStreetMap based maps and other services. + wiki: + url: https://wiki.openstreetmap.org/ + title: wiki.openstreetmap.org + description: Browse the wiki for in-depth OSM documentation. sidebar: search_results: Search Results close: Close @@ -1570,6 +1516,59 @@ en: image: Image alt: Alt text url: URL + welcome: + title: Welcome! + introduction_html: | + Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed + up, you're all set to get started mapping. Here's a quick guide with the most important + things you need to know. + whats_on_the_map: + title: What's on the Map + on_html: | + OpenStreetMap is a place for mapping things that are both real and current - + it includes millions of buildings, roads, and other details about places. You can map + whatever real-world features are interesting to you. + off_html: | + What it doesn't include is opinionated data like ratings, historical or + hypothetical features, and data from copyrighted sources. Unless you have special + permission, don't copy from online or paper maps. + basic_terms: + title: Basic Terms For Mapping + paragraph_1_html: | + OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. + editor_html: | + An editor is a program or website you can use to edit the map. + node_html: | + A node is a point on the map, like a single restaurant or a tree. + way_html: | + A way is a line or area, like a road, stream, lake or building. + tag_html: | + A tag is a bit of data about a node or way, like a + restaurant's name or a road's speed limit. + rules: + title: Rules! + paragraph_1_html: | + OpenStreetMap has few formal rules but we expect all participants to collaborate + with, and communicate with, the community. If you are considering + any activities other than editing by hand, please read and follow the guidelines on + Imports and + Automated Edits. + questions: + title: Any questions? + paragraph_1_html: | + OpenStreetMap has several resources for learning about the project, asking and answering + questions, and collaboratively discussing and documenting mapping topics. + Get help here. + start_mapping: Start Mapping + add_a_note: + title: No Time To Edit? Add a Note! + paragraph_1_html: | + If you just want something small fixed and don't have the time to sign up and learn how to edit, it's + easy to add a note. + paragraph_2_html: | + Just go to the map and click the note icon: + . This will add a marker to the map, which you can move + by dragging. Add your message, then click save, and other mappers will investigate. trace: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -1690,7 +1689,7 @@ en: blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." oauth: - oauthorize: + authorize: title: "Authorize access to your account" request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." allow_to: "Allow the client application to:" @@ -1702,11 +1701,11 @@ en: allow_write_gpx: "upload GPS traces." allow_write_notes: "modify notes." grant_access: "Grant Access" - oauthorize_success: + authorize_success: title: "Authorization request allowed" allowed: "You have granted application %{app_name} access to your account." verification: "The verification code is %{code}." - oauthorize_failure: + authorize_failure: title: "Authorization request failed" denied: "You have denied application %{app_name} access to your account." invalid: "The authorization token is not valid." @@ -2108,7 +2107,7 @@ en: are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?" confirm: "Confirm" fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid." - user_block: + user_blocks: model: non_moderator_update: "Must be a moderator to create or update a block." non_moderator_revoke: "Must be a moderator to revoke a block." @@ -2188,7 +2187,6 @@ en: back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." - user_blocks: block: not_revoked: "(not revoked)" show: "Show" @@ -2203,8 +2201,8 @@ en: showing_page: "Page %{page}" next: "Next »" previous: "« Previous" - note: - description: + notes: + comment: opened_at_html: "Created %{when} ago" opened_at_by_html: "Created %{when} ago by %{user}" commented_at_html: "Updated %{when} ago" @@ -2401,7 +2399,7 @@ en: show_address: Show address query_features: Query features centre_map: Centre map here - redaction: + redactions: edit: description: "Description" heading: "Edit redaction"