Convert various URLs to https
This commit is contained in:
Tom Hughes
parent
af1397436f
commit
be86e4824f
23 changed files with 124 additions and 124 deletions
10
CONFIGURE.md
10
CONFIGURE.md
|
|
@ -6,7 +6,7 @@ After [installing](INSTALL.md) this software, you may need to carry out some of
|
|||
|
||||
Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract.
|
||||
|
||||
After installing but before creating any users or data, import an extract with [Osmosis](http://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task.
|
||||
After installing but before creating any users or data, import an extract with [Osmosis](https://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task.
|
||||
|
||||
```
|
||||
osmosis --read-pbf greater-london-latest.osm.pbf \
|
||||
|
|
@ -14,7 +14,7 @@ osmosis --read-pbf greater-london-latest.osm.pbf \
|
|||
user="openstreetmap" password="" validateSchemaVersion="no"
|
||||
```
|
||||
|
||||
Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates.
|
||||
Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates.
|
||||
|
||||
To be able to edit the data you have loaded, you will need to use this [yet-to-be-written script](https://github.com/openstreetmap/openstreetmap-website/issues/282).
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ Rails has its own log. To inspect the log, do this:
|
|||
tail -f log/development.log
|
||||
```
|
||||
|
||||
If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](http://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](http://wiki.openstreetmap.org/wiki/IRC)
|
||||
If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](https://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](https://wiki.openstreetmap.org/wiki/IRC)
|
||||
|
||||
## Maintaining your installation
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ bundle exec rake db:migrate
|
|||
|
||||
## Testing on the osm dev server
|
||||
|
||||
For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](http://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications).
|
||||
For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](https://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications).
|
||||
|
||||
# Contributing
|
||||
|
||||
|
|
@ -124,6 +124,6 @@ If you want to deploy The Rails Port for production use, you'll need to make a f
|
|||
* Passenger will, by design, use the Production environment and therefore the production database - make sure it contains the appropriate data and user accounts.
|
||||
* Your production database will also need the extensions and functions installed - see [INSTALL.md](INSTALL.md)
|
||||
* The included version of the map call is quite slow and eats a lot of memory. You should consider using [CGIMap](https://github.com/zerebubuth/openstreetmap-cgimap) instead.
|
||||
* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](http://git.openstreetmap.org/gpx-import.git/).
|
||||
* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](https://git.openstreetmap.org/gpx-import.git/).
|
||||
* Make sure you precompile the production assets: `RAILS_ENV=production rake assets:precompile`
|
||||
* Make sure the web server user as well as the rails user can read, write and create directories in `tmp/`.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
* http://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials.
|
||||
* https://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials.
|
||||
* http://rubyonrails.org/ - The homepage of Rails, also has links and tutorials
|
||||
|
||||
## Coding style
|
||||
|
|
@ -94,6 +94,6 @@ If you have forked on GitHub then the best way to submit your patches is to
|
|||
push your changes back to GitHub and then send a "pull request" on GitHub.
|
||||
|
||||
Otherwise you should either push your changes to a publicly visible git repository
|
||||
and send the details to the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev)
|
||||
and send the details to the [rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev)
|
||||
list or generate patches with `git format-patch` and send them to the
|
||||
[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) list.
|
||||
[rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev) list.
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lio
|
|||
|
||||
Installing PostgreSQL:
|
||||
|
||||
* Install Postgres.app from http://postgresapp.com/
|
||||
* Install Postgres.app from https://postgresapp.com/
|
||||
* Add PostgreSQL to your path, by editing your profile:
|
||||
|
||||
`nano ~/.profile`
|
||||
|
|
@ -80,7 +80,7 @@ and adding:
|
|||
|
||||
Installing other dependencies:
|
||||
|
||||
* Install Homebrew from http://brew.sh/
|
||||
* Install Homebrew from https://brew.sh/
|
||||
* Install the latest version of Ruby: `brew install ruby`
|
||||
* Install ImageMagick: `brew install imagemagick`
|
||||
* Install libxml2: `brew install libxml2 --with-xml2-config`
|
||||
|
|
|
|||
10
README.md
10
README.md
|
|
@ -4,14 +4,14 @@
|
|||
[](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master)
|
||||
|
||||
This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/)
|
||||
application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API.
|
||||
application that powers the [OpenStreetMap](https://www.openstreetmap.org) website and API.
|
||||
The software is also known as "openstreetmap-website".
|
||||
|
||||
This repository consists of:
|
||||
|
||||
* The web site, including user accounts, diary entries, user-to-user messaging
|
||||
* The XML-based editing [API](http://wiki.openstreetmap.org/wiki/API_v0.6)
|
||||
* The integrated versions of the [Potlatch](http://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](http://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](http://wiki.openstreetmap.org/wiki/ID) editors
|
||||
* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6)
|
||||
* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors
|
||||
* The Browse pages - a web front-end to the OpenStreetMap data
|
||||
* The GPX uploads, browsing and API.
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ uses publicly-available services to help with development and testing.
|
|||
|
||||
# License
|
||||
|
||||
This software is licensed under the [GNU General Public License 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt),
|
||||
This software is licensed under the [GNU General Public License 2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt),
|
||||
a copy of which can be found in the [LICENSE](LICENSE) file.
|
||||
|
||||
# Installation
|
||||
|
|
@ -36,7 +36,7 @@ We're always keen to have more developers! Pull requests are very welcome.
|
|||
* Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues).
|
||||
* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components
|
||||
* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap)
|
||||
* There is a [rails-dev@openstreetmap.org](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.
|
||||
* There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.
|
||||
* IRC - there is the #osm-dev channel on irc.oftc.net.
|
||||
|
||||
More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ sudo apt-get install vagrant
|
|||
|
||||
Other Linux distributions should have similar installation instructions using `dnf`, `pacman`, or similar.
|
||||
|
||||
Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](http://www.vagrantup.com/downloads.html) for more information.
|
||||
Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](https://www.vagrantup.com/downloads.html) for more information.
|
||||
|
||||
Note than until there are suitable _xenial64_ [vagrant boxes](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=&q=xenial64) for other providers,
|
||||
the only virtualization provider supported is virtualbox. You might need to install it and specify `--provider virtualbox` when setting up your environment.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ function GraphHopperEngine(id, vehicleType) {
|
|||
// GraphHopper Directions API documentation
|
||||
// https://graphhopper.com/api/1/docs/routing/
|
||||
return $.ajax({
|
||||
url: document.location.protocol + OSM.GRAPHHOPPER_URL,
|
||||
url: OSM.GRAPHHOPPER_URL,
|
||||
data: {
|
||||
vehicle: vehicleType,
|
||||
locale: I18n.currentLocale(),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// For docs, see:
|
||||
// http://developer.mapquest.com/web/products/open/directions-service
|
||||
// http://open.mapquestapi.com/directions/
|
||||
// https://developer.mapquest.com/web/products/open/directions-service
|
||||
// https://open.mapquestapi.com/directions/
|
||||
// https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
|
||||
|
||||
function MapQuestEngine(id, routeType) {
|
||||
|
|
@ -28,7 +28,7 @@ function MapQuestEngine(id, routeType) {
|
|||
|
||||
return {
|
||||
id: id,
|
||||
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="' + document.location.protocol + '//developer.mapquest.com/content/osm/mq_logo.png">',
|
||||
creditline: '<a href="https://www.mapquest.com/" target="_blank">MapQuest</a> <img src="' + document.location.protocol + '//developer.mapquest.com/content/osm/mq_logo.png">',
|
||||
draggable: false,
|
||||
|
||||
getRoute: function (points, callback) {
|
||||
|
|
@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) {
|
|||
var to = points[points.length - 1];
|
||||
|
||||
return $.ajax({
|
||||
url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL,
|
||||
url: OSM.MAPQUEST_DIRECTIONS_URL,
|
||||
data: {
|
||||
key: OSM.MAPQUEST_KEY,
|
||||
from: from.lat + "," + from.lng,
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ function OSRMEngine() {
|
|||
return p.lng + ',' + p.lat;
|
||||
}).join(';');
|
||||
|
||||
var req_url = document.location.protocol + OSM.OSRM_URL + encoded_coords;
|
||||
var req_url = OSM.OSRM_URL + encoded_coords;
|
||||
|
||||
var onResponse = function (data) {
|
||||
if (data.code !== 'Ok')
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ OSM.Export = function(map) {
|
|||
$("#maxlat").val(bounds.getNorth().toFixed(precision));
|
||||
|
||||
$("#export_overpass").attr("href",
|
||||
"http://overpass-api.de/api/map?bbox=" +
|
||||
"https://overpass-api.de/api/map?bbox=" +
|
||||
$("#minlon").val() + "," + $("#minlat").val() + "," +
|
||||
$("#maxlon").val() + "," + $("#maxlat").val());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
OSM.Query = function(map) {
|
||||
var protocol = document.location.protocol === "https:" ? "https:" : "http:",
|
||||
url = protocol + OSM.OVERPASS_URL,
|
||||
url = OSM.OVERPASS_URL,
|
||||
queryButton = $(".control-query .control-button"),
|
||||
uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'],
|
||||
marker;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ L.OSM.Map = L.Map.extend({
|
|||
L.Map.prototype.initialize.call(this, id, options);
|
||||
|
||||
var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
|
||||
var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'});
|
||||
var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'});
|
||||
|
||||
this.baseLayers = [];
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ L.OSM.Map = L.Map.extend({
|
|||
|
||||
if (OSM.THUNDERFOREST_KEY) {
|
||||
this.baseLayers.push(new L.OSM.CycleMap({
|
||||
attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
|
||||
attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
|
||||
apikey: OSM.THUNDERFOREST_KEY,
|
||||
code: "C",
|
||||
keyid: "cyclemap",
|
||||
|
|
@ -35,7 +35,7 @@ L.OSM.Map = L.Map.extend({
|
|||
}));
|
||||
|
||||
this.baseLayers.push(new L.OSM.TransportMap({
|
||||
attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
|
||||
attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
|
||||
apikey: OSM.THUNDERFOREST_KEY,
|
||||
code: "T",
|
||||
keyid: "transportmap",
|
||||
|
|
@ -44,7 +44,7 @@ L.OSM.Map = L.Map.extend({
|
|||
}
|
||||
|
||||
this.baseLayers.push(new L.OSM.HOT({
|
||||
attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
|
||||
attribution: copyright + ". Tiles courtesy of <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
|
||||
code: "H",
|
||||
keyid: "hot",
|
||||
name: I18n.t("javascripts.map.base.hot")
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class GeocoderController < ApplicationController
|
|||
@results = []
|
||||
|
||||
# ask geocoder.ca (note - they have a per-day limit)
|
||||
response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
|
||||
response = fetch_xml("https://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
|
||||
|
||||
# parse the response
|
||||
if response.get_elements("geodata/error").empty?
|
||||
|
|
|
|||
|
|
@ -115,9 +115,9 @@ module BrowseHelper
|
|||
lookup_us = lookup.tr(" ", "_")
|
||||
|
||||
if page = WIKI_PAGES.dig(locale, type, lookup_us)
|
||||
url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
|
||||
url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
|
||||
elsif page = WIKI_PAGES.dig("en", type, lookup_us)
|
||||
url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
|
||||
url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
|
||||
end
|
||||
|
||||
url
|
||||
|
|
@ -158,7 +158,7 @@ module BrowseHelper
|
|||
end
|
||||
|
||||
{
|
||||
:url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
|
||||
:url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
|
||||
:title => value + section
|
||||
}
|
||||
end
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class ClientApplication < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def oauth_server
|
||||
@oauth_server ||= OAuth::Server.new("http://" + SERVER_URL)
|
||||
@oauth_server ||= OAuth::Server.new("https://" + SERVER_URL)
|
||||
end
|
||||
|
||||
def credentials
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
|
|||
feed.logo image_url("mag_map-rss2.0.png")
|
||||
|
||||
feed.rights :type => "xhtml" do |xhtml|
|
||||
xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a|
|
||||
xhtml.a :href => "https://creativecommons.org/licenses/by-sa/2.0/" do |a|
|
||||
a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
<div class="close-wrap"><span class="icon close"></span></div>
|
||||
<p><%= t 'layouts.intro_text' %></p>
|
||||
<p><%= t 'layouts.partners_html',
|
||||
:ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"),
|
||||
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
|
||||
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
|
||||
:ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
|
||||
:ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"),
|
||||
:bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
|
||||
:partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
|
||||
</p>
|
||||
<a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<% end %>
|
||||
<h3><%= t'oauth_clients.index.my_apps' %></h3>
|
||||
<% if @client_applications.empty? %>
|
||||
<p><%= raw(t('oauth_clients.index.no_apps', :oauth => "<a href=\"http://oauth.net\">OAuth</a>")) %></p>
|
||||
<p><%= raw(t('oauth_clients.index.no_apps', :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>
|
||||
<% else %>
|
||||
<p><%= t'oauth_clients.index.registered_apps' %></p>
|
||||
<% @client_applications.each do |client|%>
|
||||
|
|
@ -33,4 +33,4 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<h3><%= link_to t('oauth_clients.index.register_new'), :action => :new %></h3>
|
||||
<h3><%= link_to t('oauth_clients.index.register_new'), :action => :new %></h3>
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
<div class='section' id='partners'>
|
||||
<h2><div class='icon partners'></div><%= t "about_page.partners_title" %></h2>
|
||||
<p><%= t 'layouts.partners_html',
|
||||
:ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"),
|
||||
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
|
||||
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
|
||||
:ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
|
||||
:ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"),
|
||||
:bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
|
||||
:partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -38,16 +38,16 @@
|
|||
</div>
|
||||
|
||||
<dl class="inner12">
|
||||
<dt><a id="export_overpass" href="http://overpass-api.de/api/map?bbox="><%= t'export.start.too_large.overpass.title' %></a></dt>
|
||||
<dt><a id="export_overpass" href="https://overpass-api.de/api/map?bbox="><%= t'export.start.too_large.overpass.title' %></a></dt>
|
||||
<dd><%= t'export.start.too_large.overpass.description' %></dd>
|
||||
|
||||
<dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
|
||||
<dt><a href="https://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
|
||||
<dd><%= t'export.start.too_large.planet.description' %></dd>
|
||||
|
||||
<dt><a href="http://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
|
||||
<dt><a href="https://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
|
||||
<dd><%= t'export.start.too_large.geofabrik.description' %></dd>
|
||||
|
||||
<dt><a href="http://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
|
||||
<dt><a href="https://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
|
||||
<dd><%= t'export.start.too_large.other.description' %></dd>
|
||||
</dl>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@
|
|||
<div class="deemphasize">
|
||||
<p id="contributorGuidance">
|
||||
<%= raw t 'user.terms.guidance',
|
||||
:summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
|
||||
:translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
|
||||
:summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
|
||||
:translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -97,11 +97,11 @@ defaults: &defaults
|
|||
# Blacklist here
|
||||
- ".*\\.here\\.com[/:].*"
|
||||
# URL of Overpass instance to use for feature queries
|
||||
overpass_url: "//overpass-api.de/api/interpreter"
|
||||
overpass_url: "https://overpass-api.de/api/interpreter"
|
||||
# Routing endpoints
|
||||
graphhopper_url: "//graphhopper.com/api/1/route"
|
||||
mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route"
|
||||
osrm_url: "//router.project-osrm.org/route/v1/driving/"
|
||||
graphhopper_url: "https://graphhopper.com/api/1/route"
|
||||
mapquest_directions_url: "https://open.mapquestapi.com/directions/v2/route"
|
||||
osrm_url: "https://router.project-osrm.org/route/v1/driving/"
|
||||
# External authentication credentials
|
||||
#google_auth_id: ""
|
||||
#google_auth_secret: ""
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ en:
|
|||
map_image: "Map Image (shows standard layer)"
|
||||
embeddable_html: "Embeddable HTML"
|
||||
licence: "Licence"
|
||||
export_details: 'OpenStreetMap data is licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
|
||||
export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (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."
|
||||
|
|
@ -367,12 +367,12 @@ en:
|
|||
geocoder:
|
||||
search:
|
||||
title:
|
||||
latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
|
||||
latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
|
||||
uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
|
||||
ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
|
||||
osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
|
||||
ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
|
||||
osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
|
||||
geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
|
||||
osm_nominatim_reverse: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
|
||||
osm_nominatim_reverse: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
|
||||
geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
|
||||
search_osm_nominatim:
|
||||
prefix_format: "%{name}"
|
||||
|
|
@ -895,7 +895,7 @@ en:
|
|||
level10: "Suburb Boundary"
|
||||
description:
|
||||
title:
|
||||
osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
|
||||
osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
|
||||
geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
|
||||
types:
|
||||
cities: Cities
|
||||
|
|
@ -968,19 +968,19 @@ en:
|
|||
title_html: Copyright and License
|
||||
intro_1_html: |
|
||||
OpenStreetMap<sup><a href="#trademarks">®</a></sup> is <i>open data</i>, licensed under the <a
|
||||
href="http://opendatacommons.org/licenses/odbl/">Open Data
|
||||
href="https://opendatacommons.org/licenses/odbl/">Open Data
|
||||
Commons Open Database License</a> (ODbL) by the <a
|
||||
href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
|
||||
href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (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 <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
|
||||
full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
|
||||
code</a> explains your rights and responsibilities.
|
||||
intro_3_html: |
|
||||
The cartography in our map tiles, and our documentation, are
|
||||
licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
|
||||
licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
|
||||
Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
|
||||
credit_title_html: How to credit OpenStreetMap
|
||||
credit_1_html: |
|
||||
|
|
@ -990,7 +990,7 @@ en:
|
|||
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
|
||||
<a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
|
||||
<a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
|
||||
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
|
||||
|
|
@ -1006,7 +1006,7 @@ en:
|
|||
more_title_html: Finding out more
|
||||
more_1_html: |
|
||||
Read more about using our data, and how to credit us, at the <a
|
||||
href="http://osmfoundation.org/Licence">OSMF Licence page</a>.
|
||||
href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
|
||||
more_2_html: |
|
||||
Although OpenStreetMap is open data, we cannot provide a
|
||||
free-of-charge map API for third-parties.
|
||||
|
|
@ -1020,10 +1020,10 @@ en:
|
|||
and other sources, among them:
|
||||
contributors_at_html: |
|
||||
<strong>Austria</strong>: Contains data from
|
||||
<a href="http://data.wien.gv.at/">Stadt Wien</a> (under
|
||||
<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
|
||||
<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
|
||||
Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
|
||||
<a href="https://data.wien.gv.at/">Stadt Wien</a> (under
|
||||
<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
|
||||
<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
|
||||
Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
|
||||
contributors_ca_html: |
|
||||
<strong>Canada</strong>: Contains data from
|
||||
GeoBase®, GeoGratis (© Department of Natural
|
||||
|
|
@ -1034,13 +1034,13 @@ en:
|
|||
<strong>Finland</strong>: Contains data from the
|
||||
National Land Survey of Finland's Topographic Database
|
||||
and other datasets, under the
|
||||
<a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
|
||||
<a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
|
||||
contributors_fr_html: |
|
||||
<strong>France</strong>: Contains data sourced from
|
||||
Direction Générale des Impôts.
|
||||
contributors_nl_html: |
|
||||
<strong>Netherlands</strong>: Contains © AND data, 2007
|
||||
(<a href="http://www.and.com">www.and.com</a>)
|
||||
(<a href="https://www.and.com">www.and.com</a>)
|
||||
contributors_nz_html: |
|
||||
<strong>New Zealand</strong>: Contains data sourced from
|
||||
Land Information New Zealand. Crown Copyright reserved.
|
||||
|
|
@ -1060,7 +1060,7 @@ en:
|
|||
contributors_footer_1_html: |
|
||||
For further details of these, and other sources that have been used
|
||||
to help improve OpenStreetMap, please see the <a
|
||||
href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
|
||||
href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
|
||||
page</a> on the OpenStreetMap Wiki.
|
||||
contributors_footer_2_html: |
|
||||
Inclusion of data in OpenStreetMap does not imply that the original
|
||||
|
|
@ -1074,12 +1074,12 @@ en:
|
|||
infringement_2_html: |
|
||||
If you believe that copyrighted material has been inappropriately
|
||||
added to the OpenStreetMap database or this site, please refer
|
||||
to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
|
||||
to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
|
||||
procedure</a> or file directly at our
|
||||
<a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
|
||||
trademarks_title_html: <span id="trademarks"></span>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 send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
|
||||
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 send your questions to the <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
|
||||
welcome_page:
|
||||
title: Welcome!
|
||||
introduction_html: |
|
||||
|
|
@ -1115,8 +1115,8 @@ en:
|
|||
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
|
||||
<a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
|
||||
<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
|
||||
<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
|
||||
<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
|
||||
questions:
|
||||
title: Any questions?
|
||||
paragraph_1_html: |
|
||||
|
|
@ -1152,7 +1152,7 @@ en:
|
|||
explanation_html: |
|
||||
If you have concerns about how our data is being used or about the contents please consult our
|
||||
<a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
|
||||
<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
|
||||
<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
|
||||
help_page:
|
||||
title: Getting Help
|
||||
introduction: |
|
||||
|
|
@ -1163,7 +1163,7 @@ en:
|
|||
title: Welcome to OSM
|
||||
description: Start with this quick guide covering the OpenStreetMap basics.
|
||||
beginners_guide:
|
||||
url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
|
||||
url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
|
||||
title: Beginners' Guide
|
||||
description: Community maintained guide for beginners.
|
||||
help:
|
||||
|
|
@ -1171,15 +1171,15 @@ en:
|
|||
title: help.openstreetmap.org
|
||||
description: Ask a question or look up answers on OSM's question-and-answer site.
|
||||
mailing_lists:
|
||||
url: http://lists.openstreetmap.org/
|
||||
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: http://forum.openstreetmap.org/
|
||||
url: https://forum.openstreetmap.org/
|
||||
title: Forums
|
||||
description: Questions and discussions for those that prefer a bulletin board style interface.
|
||||
irc:
|
||||
url: http://irc.openstreetmap.org/
|
||||
url: https://irc.openstreetmap.org/
|
||||
title: IRC
|
||||
description: Interactive chat in many different languages and on many topics.
|
||||
switch2osm:
|
||||
|
|
@ -1187,7 +1187,7 @@ en:
|
|||
title: switch2osm
|
||||
description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
|
||||
wiki:
|
||||
url: http://wiki.openstreetmap.org/
|
||||
url: https://wiki.openstreetmap.org/
|
||||
title: wiki.openstreetmap.org
|
||||
description: Browse the wiki for in-depth OSM documentation.
|
||||
about_page:
|
||||
|
|
@ -1211,8 +1211,8 @@ en:
|
|||
To learn more about the community, see the
|
||||
<a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
|
||||
<a href='%{diary_path}'>user diaries</a>,
|
||||
<a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
|
||||
the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
|
||||
<a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
|
||||
the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
|
||||
open_data_title: Open Data
|
||||
open_data_html: |
|
||||
OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
|
||||
|
|
@ -1223,12 +1223,12 @@ en:
|
|||
legal_title: Legal
|
||||
legal_html: |
|
||||
This site and many other related services are formally operated by the
|
||||
<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
|
||||
<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
|
||||
on behalf of the community. Use of all OSMF operated services is subject
|
||||
to our <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
|
||||
Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
|
||||
to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
|
||||
Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
|
||||
<br>
|
||||
Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>
|
||||
Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
|
||||
if you have licensing, copyright or other legal questions and issues.
|
||||
partners_title: Partners
|
||||
notifier:
|
||||
|
|
@ -1259,7 +1259,7 @@ en:
|
|||
failed_to_import: "failed to import. Here is the error:"
|
||||
more_info_1: "More information about GPX import failures and how to avoid"
|
||||
more_info_2: "them can be found at:"
|
||||
import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
|
||||
import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
|
||||
success:
|
||||
subject: "[OpenStreetMap] GPX Import success"
|
||||
loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
|
||||
|
|
@ -1397,19 +1397,19 @@ en:
|
|||
createnote: Add a note
|
||||
license:
|
||||
copyright: "Copyright OpenStreetMap and contributors, under an open license"
|
||||
license_url: "http://openstreetmap.org/copyright"
|
||||
project_url: "http://openstreetmap.org"
|
||||
license_url: "https://openstreetmap.org/copyright"
|
||||
project_url: "https://openstreetmap.org"
|
||||
remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
|
||||
edit:
|
||||
not_public: "You have not set your edits to be public."
|
||||
not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
|
||||
user_page_link: user page
|
||||
anon_edits: "(%{link})"
|
||||
anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
|
||||
anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
|
||||
anon_edits_link_text: "Find out why this is the case."
|
||||
flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
|
||||
flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
|
||||
potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
|
||||
potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
|
||||
potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
|
||||
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."
|
||||
|
|
@ -1499,7 +1499,7 @@ en:
|
|||
edit: Edit
|
||||
preview: Preview
|
||||
markdown_help:
|
||||
title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
|
||||
title_html: Parsed with <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
|
||||
headings: Headings
|
||||
heading: Heading
|
||||
subheading: Subheading
|
||||
|
|
@ -1538,7 +1538,7 @@ en:
|
|||
save_button: "Save Changes"
|
||||
visibility: "Visibility:"
|
||||
visibility_help: "what does this mean?"
|
||||
visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
|
||||
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
|
||||
trace_form:
|
||||
upload_gpx: "Upload GPX File:"
|
||||
description: "Description:"
|
||||
|
|
@ -1546,10 +1546,10 @@ en:
|
|||
tags_help: "comma delimited"
|
||||
visibility: "Visibility:"
|
||||
visibility_help: "what does this mean?"
|
||||
visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
|
||||
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
|
||||
upload_button: "Upload"
|
||||
help: "Help"
|
||||
help_url: "http://wiki.openstreetmap.org/wiki/Upload"
|
||||
help_url: "https://wiki.openstreetmap.org/wiki/Upload"
|
||||
trace_header:
|
||||
upload_trace: "Upload a trace"
|
||||
see_all_traces: "See all traces"
|
||||
|
|
@ -1604,7 +1604,7 @@ en:
|
|||
public_traces_from: "Public GPS traces from %{user}"
|
||||
description: "Browse recent GPS track uploads"
|
||||
tagged_with: " tagged with %{tags}"
|
||||
empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
|
||||
empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
|
||||
delete:
|
||||
scheduled_for_deletion: "Trace scheduled for deletion"
|
||||
make_public:
|
||||
|
|
@ -1793,10 +1793,10 @@ en:
|
|||
<p>Unlike other maps, OpenStreetMap is completely created by people like you,
|
||||
and it's free for anyone to fix, update, download and use.</p>
|
||||
<p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
|
||||
license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
|
||||
license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
|
||||
email address: "Email Address:"
|
||||
confirm email address: "Confirm Email Address:"
|
||||
not displayed publicly: 'Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
|
||||
not displayed publicly: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
|
||||
display name: "Display Name:"
|
||||
display name description: "Your publicly displayed username. You can change this later in the preferences."
|
||||
external auth: "Third Party Authentication:"
|
||||
|
|
@ -1807,17 +1807,17 @@ en:
|
|||
continue: Sign Up
|
||||
terms accepted: "Thanks for accepting the new contributor terms!"
|
||||
terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
|
||||
terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
|
||||
terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
|
||||
terms:
|
||||
title: "Contributor terms"
|
||||
heading: "Contributor terms"
|
||||
read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
|
||||
consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
|
||||
consider_pd_why: "what's this?"
|
||||
consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
|
||||
consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
|
||||
guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
|
||||
agree: Agree
|
||||
declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
|
||||
declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
|
||||
decline: "Decline"
|
||||
you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
|
||||
legale_select: "Country of residence:"
|
||||
|
|
@ -1907,25 +1907,25 @@ en:
|
|||
email never displayed publicly: "(never displayed publicly)"
|
||||
external auth: "External Authentication:"
|
||||
openid:
|
||||
link: "http://wiki.openstreetmap.org/wiki/OpenID"
|
||||
link: "https://wiki.openstreetmap.org/wiki/OpenID"
|
||||
link text: "what is this?"
|
||||
public editing:
|
||||
heading: "Public editing:"
|
||||
enabled: "Enabled. Not anonymous and can edit data."
|
||||
enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
|
||||
enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
|
||||
enabled link text: "what is this?"
|
||||
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
|
||||
disabled link text: "why can't I edit?"
|
||||
public editing note:
|
||||
heading: "Public editing"
|
||||
text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
|
||||
text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
|
||||
contributor terms:
|
||||
heading: "Contributor Terms:"
|
||||
agreed: "You have agreed to the new Contributor Terms."
|
||||
not yet agreed: "You have not yet agreed to the new Contributor Terms."
|
||||
review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
|
||||
agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
|
||||
link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms"
|
||||
link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
|
||||
link text: "what is this?"
|
||||
profile description: "Profile Description:"
|
||||
preferred languages: "Preferred Languages:"
|
||||
|
|
@ -1933,7 +1933,7 @@ en:
|
|||
image: "Image:"
|
||||
gravatar:
|
||||
gravatar: "Use Gravatar"
|
||||
link: "http://wiki.openstreetmap.org/wiki/Gravatar"
|
||||
link: "https://wiki.openstreetmap.org/wiki/Gravatar"
|
||||
link text: "what is this?"
|
||||
disabled: "Gravatar has been disabled."
|
||||
enabled: "Display of your Gravatar has been enabled."
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class BrowseHelperTest < ActionView::TestCase
|
|||
|
||||
def test_format_key
|
||||
html = format_key("highway")
|
||||
assert_dom_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", html
|
||||
assert_dom_equal "<a href=\"https://wiki.openstreetmap.org/wiki/Key:highway?uselang=en\" title=\"The wiki description page for the highway tag\">highway</a>", html
|
||||
|
||||
html = format_key("unknown")
|
||||
assert_dom_equal "unknown", html
|
||||
|
|
@ -112,7 +112,7 @@ class BrowseHelperTest < ActionView::TestCase
|
|||
|
||||
def test_format_value
|
||||
html = format_value("highway", "primary")
|
||||
assert_dom_equal "<a href=\"http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", html
|
||||
assert_dom_equal "<a href=\"https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en\" title=\"The wiki description page for the highway=primary tag\">primary</a>", html
|
||||
|
||||
html = format_value("highway", "unknown")
|
||||
assert_dom_equal "unknown", html
|
||||
|
|
@ -124,7 +124,7 @@ class BrowseHelperTest < ActionView::TestCase
|
|||
assert_dom_equal "<a href=\"tel:+1234567890\" title=\"Call +1234567890\">+1234567890</a>", html
|
||||
|
||||
html = format_value("wikipedia", "Test")
|
||||
assert_dom_equal "<a title=\"The Test article on Wikipedia\" href=\"http://en.wikipedia.org/wiki/Test?uselang=en\">Test</a>", html
|
||||
assert_dom_equal "<a title=\"The Test article on Wikipedia\" href=\"https://en.wikipedia.org/wiki/Test?uselang=en\">Test</a>", html
|
||||
|
||||
html = format_value("wikidata", "Q42")
|
||||
assert_dom_equal "<a title=\"The Q42 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q42?uselang=en\">Q42</a>", html
|
||||
|
|
@ -165,26 +165,26 @@ class BrowseHelperTest < ActionView::TestCase
|
|||
|
||||
def test_wiki_link
|
||||
link = wiki_link("key", "highway")
|
||||
assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
|
||||
assert_equal "https://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link
|
||||
|
||||
link = wiki_link("tag", "highway=primary")
|
||||
assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
|
||||
assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link
|
||||
|
||||
I18n.locale = "de"
|
||||
|
||||
link = wiki_link("key", "highway")
|
||||
assert_equal "http://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
|
||||
assert_equal "https://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link
|
||||
|
||||
link = wiki_link("tag", "highway=primary")
|
||||
assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
|
||||
assert_equal "https://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link
|
||||
|
||||
I18n.locale = "tr"
|
||||
|
||||
link = wiki_link("key", "highway")
|
||||
assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
|
||||
assert_equal "https://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link
|
||||
|
||||
link = wiki_link("tag", "highway=primary")
|
||||
assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
|
||||
assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link
|
||||
end
|
||||
|
||||
def test_wikidata_links
|
||||
|
|
@ -268,33 +268,33 @@ class BrowseHelperTest < ActionView::TestCase
|
|||
assert_nil link
|
||||
|
||||
link = wikipedia_link("wikipedia", "Test")
|
||||
assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
|
||||
assert_equal "https://en.wikipedia.org/wiki/Test?uselang=en", link[:url]
|
||||
assert_equal "Test", link[:title]
|
||||
|
||||
link = wikipedia_link("wikipedia", "de:Test")
|
||||
assert_equal "http://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
|
||||
assert_equal "https://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
|
||||
assert_equal "de:Test", link[:title]
|
||||
|
||||
link = wikipedia_link("wikipedia:fr", "de:Test")
|
||||
assert_equal "http://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
|
||||
assert_equal "https://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url]
|
||||
assert_equal "de:Test", link[:title]
|
||||
|
||||
link = wikipedia_link("wikipedia", "de:Englischer Garten (München)#Japanisches Teehaus")
|
||||
assert_equal "http://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url]
|
||||
assert_equal "https://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url]
|
||||
assert_equal "de:Englischer Garten (München)#Japanisches Teehaus", link[:title]
|
||||
|
||||
link = wikipedia_link("wikipedia", "de:Alte Brücke (Heidelberg)#Brückenaffe")
|
||||
assert_equal "http://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url]
|
||||
assert_equal "https://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url]
|
||||
assert_equal "de:Alte Brücke (Heidelberg)#Brückenaffe", link[:title]
|
||||
|
||||
link = wikipedia_link("wikipedia", "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus")
|
||||
assert_equal "http://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url]
|
||||
assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url]
|
||||
assert_equal "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus", link[:title]
|
||||
|
||||
I18n.locale = "pt-BR"
|
||||
|
||||
link = wikipedia_link("wikipedia", "zh-classical:Test#Section")
|
||||
assert_equal "http://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url]
|
||||
assert_equal "https://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url]
|
||||
assert_equal "zh-classical:Test#Section", link[:title]
|
||||
|
||||
link = wikipedia_link("foo", "Test")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue