New /copyright page for ODbL

This commit is contained in:
Richard Fairhurst 2012-09-11 11:12:42 +01:00 committed by Tom Hughes
parent 2805118a60
commit a302ddeb8a
2 changed files with 43 additions and 59 deletions

View file

@ -1,15 +1,3 @@
<p id="cc_logo">
<%= link_to(
image_tag("cc_button.png",
:alt => t('layouts.license.alt'),
:border => 0,
:width => 88,
:height => 31,
:title => t('layouts.license.title')),
"http://creativecommons.org/licenses/by-sa/2.0/",
{ :rel => "license" }) %>
</p>
<% if @locale == 'en' %>
<!-- Maybe ease foreigners back to their native page -->
<% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>
@ -45,6 +33,7 @@
<p><%= t "license_page.legal_babble.intro_1_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.intro_2_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.intro_3_html", :locale => @locale %></p>
<h3><%= t "license_page.legal_babble.credit_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.credit_1_html", :locale => @locale %></p>
@ -53,20 +42,21 @@
<h3><%= t "license_page.legal_babble.more_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.more_1_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.more_2_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.more_3_html", :locale => @locale %></p>
<h3><%= t "license_page.legal_babble.contributors_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %></p>
<ul id="contributors">
<li><%= t "license_page.legal_babble.contributors_au_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_pl_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_za_html", :locale => @locale %></li>
<li><%= t "license_page.legal_babble.contributors_gb_html", :locale => @locale %></li>
</ul>
<p><%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %></p>
<h3><%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>

View file

@ -1024,43 +1024,40 @@ en:
title_html: Copyright and License
intro_1_html: |
OpenStreetMap is <i>open data</i>, licensed under the <a
href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
href="http://opendatacommons.org/licenses/odbl/">Open Data
Commons Open Database License</a> (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 <a
href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
full <a href="http://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
Commons Attribution-ShareAlike 2.0</a> 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 &ldquo;&copy; OpenStreetMap
contributors, CC BY-SA&rdquo;. If you are using map data only,
we request &ldquo;Map data &copy; OpenStreetMap contributors,
CC BY-SA&rdquo;.
We require that you use the credit &ldquo;&copy; OpenStreetMap
contributors&rdquo;.
credit_2_html: |
Where possible, OpenStreetMap should be hyperlinked to <a
href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
and CC BY-SA to <a
href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. 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
&lsquo;OpenStreetMap&rsquo; 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
<a href="http://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
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 <a
Read more about using our data, and how to credit us, at the <a
href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
FAQ</a>.
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 <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
@ -1068,17 +1065,9 @@ en:
and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
contributors_title_html: Our contributors
contributors_intro_html: |
Our CC BY-SA licence requires you to &ldquo;give the Original
Author credit reasonable to the medium or means You are
utilising&rdquo;. Individual OSM mappers do not request a
credit over and above that to &ldquo;OpenStreetMap
contributors&rdquo;, 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: |
<strong>Australia</strong>: 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: |
<strong>Austria</strong>: Contains data from
<a href="http://data.wien.gv.at/">Stadt Wien</a> (under
@ -1100,12 +1089,6 @@ en:
contributors_nz_html: |
<strong>New Zealand</strong>: Contains data sourced from
Land Information New Zealand. Crown Copyright reserved.
contributors_pl_html: |
<strong>Poland</strong>: Contains data from <a
href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
UMP-pcPL contributors.
<a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing">
More about OSM&apos;s use of UMP data</a>
contributors_za_html: |
<strong>South Africa</strong>: Contains data sourced from
<a href="http://www.ngi.gov.za/">Chief Directorate:
@ -1113,7 +1096,7 @@ en:
contributors_gb_html: |
<strong>United Kingdom</strong>: Contains Ordnance
Survey data &copy; 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 <a
@ -1123,6 +1106,17 @@ en:
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: Finding out more
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 <a href="http://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>.
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"