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

Convert various URLs to https

Browse source
This commit is contained in:
Tom Hughes 2018-01-08 20:18:21 +00:00
parent af1397436f
commit be86e4824f
23 changed files with 124 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/example.application.yml
View file

@ -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: ""

112
config/locales/en.yml
View file

@ -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">&reg;</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&reg;, GeoGratis (&copy; 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 &copy; 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."