From: Richard Fairhurst Date: Tue, 11 Sep 2012 10:12:42 +0000 (+0100) Subject: New /copyright page for ODbL X-Git-Tag: live~5341 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a302ddeb8a36048a6593b7f2b671aa19cfbe257d New /copyright page for ODbL --- diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 0ef9d7b2b..4a7a57bea 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,15 +1,3 @@ - - <% if @locale == 'en' %> <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> @@ -45,6 +33,7 @@

<%= 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 "license_page.legal_babble.credit_title_html", :locale => @locale %>

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

@@ -53,20 +42,21 @@

<%= 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 "license_page.legal_babble.more_3_html", :locale => @locale %>

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

<%= t "license_page.legal_babble.contributors_intro_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 "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 %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index c4704fa3b..04972fa0d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1024,43 +1024,40 @@ en: title_html: Copyright and License intro_1_html: | OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). + href="http://opendatacommons.org/licenses/odbl/">Open Data + Commons Open Database License (ODbL). intro_2_html: | - You are free to copy, distribute, transmit and adapt our maps - and data, as long as you credit OpenStreetMap and its - contributors. If you alter or build upon our maps or data, you + 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 + 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: | - If you are using OpenStreetMap map images, we request that - your credit reads at least “© OpenStreetMap - contributors, CC BY-SA”. If you are using map data only, - we request “Map data © OpenStreetMap contributors, - CC BY-SA”. + We require that you use the credit “© OpenStreetMap + contributors”. credit_2_html: | - Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ - and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If - you are using a medium where links are not possible (e.g. a - printed work), we suggest you direct your readers to - www.openstreetmap.org (perhaps by expanding - ‘OpenStreetMap’ to this full address) and to - www.creativecommons.org. + 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. more_title_html: Finding out more more_1_html: | - Read more about using our data at the Legal FAQ. more_2_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. - more_3_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our API Usage Policy, @@ -1068,17 +1065,9 @@ en: and Nominatim Usage Policy. contributors_title_html: Our contributors contributors_intro_html: | - Our CC BY-SA licence requires you to “give the Original - Author credit reasonable to the medium or means You are - utilising”. Individual OSM mappers do not request a - credit over and above that to “OpenStreetMap - contributors”, but where data from a national mapping - agency or other major source has been included in - OpenStreetMap, it may be reasonable to credit them by directly - reproducing their credit or by linking to it on this page. - contributors_au_html: | - Australia: Contains suburb data based - on Australian Bureau of Statistics data. + 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 @@ -1100,12 +1089,6 @@ en: contributors_nz_html: | New Zealand: Contains data sourced from Land Information New Zealand. Crown Copyright reserved. - contributors_pl_html: | - Poland: Contains data from UMP-pcPL maps. Copyright - UMP-pcPL contributors. - - More about OSM's use of UMP data contributors_za_html: | South Africa: Contains data sourced from Chief Directorate: @@ -1113,7 +1096,7 @@ en: contributors_gb_html: | United Kingdom: Contains Ordnance Survey data © Crown copyright and database right - 2010. + 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 takedown + procedure or file directly at our + on-line filing page. notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry"