Merge branch 'master' into openID

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 3bc9bb202e9e8656e7861ef28e43a6540e030b83..eaaf3f3661f4ff9ba8b4e068753f1ad382164ec6 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,49 +1,45 @@
-<p style="float: right"><a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a></p>
-
-<h2>Copyright and License</h2>
-
-<p>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).</p>
-
-<p>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 may distribute the result only under the same or similar licence. The full <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code</a> explains your rights and responsibilities.</p>
-
-<h3>How to credit OpenStreetMap</h3>
-
-<p>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;.</p>
-
-<p>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.</p>
-
-<h3>Finding out more</h3>
-
-<p>Read more about using our data at the <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>.
-       
-<p>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.</p>
-
-<p>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>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a> and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
-
-<h3>Our contributors</h3>
-
-<p>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.</p>
-
-<!--
-
-Information for page editors
-
-The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data.
-
-Any additions here must be discussed with OSM sysadmins first.
-
--->
-
-<ul id="contributors">
-       
-<li><strong>Australia</strong>: Contains suburb data based on Australian Bureau of Statistics data.
-
-<li><strong>Canada</strong>: Contains data from GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).
-
-<li><strong>New Zealand</strong>: Contains data sourced from Land Information New Zealand. Crown Copyright reserved.
-
-<li><strong>United Kingdom</strong>: Contains Ordnance Survey data &copy; Crown copyright and database right 2010.
-
-</ul>
-
-<p>Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability.</p>
+<p style="float: right">
+  <%= 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 I18n.locale == 'en' or params[:copyright_locale] == 'en' %>
+  <!-- Maybe ease foreigners back to their native page -->
+  <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %>
+    <h2><%= t 'license_page.native.title' %></h2>
+    <p>
+      <%= t 'license_page.native.text',
+              :native_link => link_to(t('license_page.native.native_link'),
+                                          :controller => 'site',
+                                          :action => 'copyright'),
+              :mapping_link => link_to(t('license_page.native.mapping_link'),
+                                          :controller => 'site',
+                                          :action => 'index') %>
+    </p>
+    <hr />
+  <% end %>
+
+  <%= t('license_page.legal_babble', :locale => :en) %>
+<% else %>
+  <!-- Maybe note that this page has been translated -->
+  <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %>
+    <h2><%= t 'license_page.foreign.title' %></h2>
+    <p>
+      <%= t 'license_page.foreign.text',
+              :english_original_link => link_to(t('license_page.foreign.english_link'),
+                                                :controller => 'site',
+                                                :action => 'copyright',
+                                                :copyright_locale => 'en') %>
+    </p>
+    <hr />
+  <% end %>
+
+  <%= t('license_page.legal_babble') %>
+<% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e6e0c6c0e47bb9e0077bd7653954436f1fde840b..8053e710ed00e1eaadc967095d958e6aec79c48f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -937,6 +937,141 @@ en:
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
+
+  license_page:
+    foreign:
+      title: About this translation
+      text: |
+        In the event of a conflict between this translated page and
+        {{english_original_link}}, the English page shall take
+        precedence
+      english_link: the English original
+    native:
+      title: About this page
+      text: |
+
+        You are viewing the English version of the copyright page. You
+        can go back to the {{native_link}} of this page; Or you can
+        stop reading about copyright and {{mapping_link}}.
+
+      native_link: THIS_LANGUAGE_NAME_HERE version
+      mapping_link: start mapping
+    legal_babble: |
+      <h2>Copyright and License</h2>
+      
+      <p>
+         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).
+      </p>
+      
+      <p>
+        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
+        may distribute the result only under the same licence. The
+        full <a
+        href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
+        code</a> explains your rights and responsibilities.
+      </p>
+      
+      <h3>How to credit OpenStreetMap</h3>
+      
+      <p>
+        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;.
+      </p>
+      
+      <p>
+        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.
+      </p>
+      
+      <h3>Finding out more</h3>
+      
+      <p>
+        Read more about using our data at the <a
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
+        FAQ</a>.
+      </p>
+       
+      <p>
+        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.
+      </p>
+      
+      <p>
+        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>,
+        <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
+        and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+      </p>
+      
+      <h3>Our contributors</h3>
+      
+      <p>
+        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.
+      </p>
+      
+      <!--
+      
+      Information for page editors
+      
+      The following lists only those organisations who require attribution
+      as a condition of their data being used in OpenStreetMap. It is not a
+      general catalogue of imports, and must not be used except when
+      attribution is required to comply with the licence of the imported
+      data.
+      
+      Any additions here must be discussed with OSM sysadmins first.
+      
+      -->
+      
+      <ul id="contributors">
+      
+          <li><strong>Australia</strong>: Contains suburb data based
+          on Australian Bureau of Statistics data.</li>
+      
+          <li><strong>Canada</strong>: Contains data from
+          GeoBase&reg;, GeoGratis (&copy; Department of Natural
+          Resources Canada), CanVec (&copy; Department of Natural
+          Resources Canada), and StatCan (Geography Division,
+          Statistics Canada).</li>
+      
+          <li><strong>New Zealand</strong>: Contains data sourced from
+          Land Information New Zealand. Crown Copyright reserved.</li>
+      
+          <li><strong>United Kingdom</strong>: Contains Ordnance
+          Survey data &copy; Crown copyright and database right
+          2010.</li>
+
+      </ul>
+      
+      <p>
+        Inclusion of data in OpenStreetMap does not imply that the original
+        data provider endorses OpenStreetMap, provides any warranty, or
+        accepts any liability.
+      </p>
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 048143e3b1256207b872d05a7654063fd8335a2d..3825244d75d999f8563453ef835490a5f17fd677 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -534,6 +534,7 @@ is:
     help_wiki: Hjálp & Wiki
     help_wiki_tooltip: Hjálpar og wiki-síða fyrir verkefnið
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Fors%C3%AD%C3%B0a?uselang=is
+    copyright: "Höfundaréttur & leyfi"
     history: Breytingarskrá
     home: heim
     home_tooltip: Færa kortasýnina á þína staðsetningu
@@ -573,6 +574,42 @@ is:
     view_tooltip: Kortasýn
     welcome_user: Hæ {{user_link}}
     welcome_user_link_tooltip: Notandasíðan þín
+  license_page:
+    foreign:
+      title: Um þessa þýðingu
+      text: |
+
+        Stangist þessi þýðing á við {{english_original_link}} gildir
+        hin síðari fram yfir íslenskuna.
+
+      english_link: ensku útgáfuna
+    native:
+      title: Um þessa síðu
+      text: |
+
+        Þú ert að skoða höfundaréttarsíðuna á frummálinu. Þú getur
+        lesið þessa útgáfu, farið aftur á {{native_link}}, eða hætt
+        þessu lagabulli og {{mapping_link}}.
+
+      native_link: íslensku útgáfuna
+      mapping_link: farið að kortleggja
+    legal_babble: |
+      <h2>Höfundaréttur og leyfi</h2>
+      
+      <p>
+         OpenStreetMap er <i>frjáls kortagrunnur</i> undir <a
+         href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+         Commons Attribution-ShareAlike 2.0</a> leyfinu. (CC-BY-SA).
+      </p>
+
+      <h2>Frekari upplýsingar</h2>
+      
+      <p>
+        Frekari upplýsingar má nálgast <a
+        href="/copyright?locale=en&orig_locale=is">í ensku útgáfu</a>
+        þessa skjals.
+      </p>
+
   message: 
     delete: 
       deleted: Skilaboðunum var eytt

diff --git a/config/routes.rb b/config/routes.rb
index df6efef60643cdf05941fb2cfe2f6cc74386eaff..9a86f920058a179eecdb1f7d3ba9183801a30287 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,6 +89,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/edit', :controller => 'site', :action => 'edit'
   map.connect '/copyright', :controller => 'site', :action => 'copyright'
+  map.connect '/copyright/:copyright_locale', :controller => 'site', :action => 'copyright'
   map.connect '/history', :controller => 'changeset', :action => 'list'
   map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom
   map.connect '/export', :controller => 'site', :action => 'export'