From 7561eacbf4d1e45ae3bf954a55093b4ff1be5ba4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Mon, 26 Apr 2010 18:00:02 +0000 Subject: [PATCH 1/1] Enable localization of the copyright page The copyright page introduced in ecbd526 wasn't localize-able. Rectify that with a page that: * Displays a header in non-English languages indicating that the version you're looking at isn't canonical. * Links back to the local version from the English one in a non-English locale. Additionally I fixed a regression with the cc_button.png. It now has a meaningful alt="" text again. --- app/views/site/copyright.html.erb | 94 ++++++++++----------- config/locales/en.yml | 135 ++++++++++++++++++++++++++++++ config/locales/is.yml | 36 ++++++++ 3 files changed, 216 insertions(+), 49 deletions(-) diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 3bc9bb202..897f9cda3 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,49 +1,45 @@ -

- -

Copyright and License

- -

OpenStreetMap is open data, licensed under the Creative Commons Attribution-ShareAlike 2.0 licence (CC-BY-SA).

- -

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 legal code explains your rights and responsibilities.

- -

How to credit OpenStreetMap

- -

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”.

- -

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.

- -

Finding out more

- -

Read more about using our data at the Legal FAQ. - -

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.

- -

Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our API Usage Policy, Tile Usage Policy and Nominatim Usage Policy. - -

Our contributors

- -

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.

- - - - - -

Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability.

+

+ <%= 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" }) %> +

+ +<% if I18n.locale.to_s == "en" or params['locale'] == 'en' %> + + <% if params['orig_locale'] and params['orig_locale'] != params['locale'] %> +

<%= t 'license_page.native.title' %>

+

+ <%= 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') %> +

+
+ <% end %> + + <%= t('license_page.legal_babble', :locale => 'en') %> +<% else %> + + <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => 'en') %> +

<%= t 'license_page.foreign.title' %>

+

+ <%= t 'license_page.foreign.text', + :english_original_link => link_to(t('license_page.foreign.english_link'), + :controller => 'site', + :action => 'copyright', + :locale => 'en', + :orig_locale => I18n.locale.to_s) %> +

+
+ <% end %> + <%= t('license_page.legal_babble') %> +<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index f1e0e6a85..17f621d8d 100644 --- 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: | +

Copyright and License

+ +

+ OpenStreetMap is open data, licensed under the Creative + Commons Attribution-ShareAlike 2.0 licence (CC-BY-SA). +

+ +

+ 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 legal + code explains your rights and responsibilities. +

+ +

How to credit OpenStreetMap

+ +

+ 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”. +

+ +

+ 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. +

+ +

Finding out more

+ +

+ Read more about using our data at the Legal + FAQ. +

+ +

+ 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. +

+ +

+ Although OpenStreetMap is open data, we cannot provide a + free-of-charge map API for third-party developers. + + See our API Usage Policy, + Tile Usage Policy + and Nominatim Usage Policy. +

+ +

Our contributors

+ +

+ 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. +

+ + + + + +

+ Inclusion of data in OpenStreetMap does not imply that the original + data provider endorses OpenStreetMap, provides any warranty, or + accepts any liability. +

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 048143e3b..aa10dbb9a 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -573,6 +573,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: | +

Höfundaréttur og leyfi

+ +

+ OpenStreetMap er frjáls kortagrunnur undir Creative + Commons Attribution-ShareAlike 2.0 leyfinu. (CC-BY-SA). +

+ +

Frekari upplýsingar

+ +

+ Frekari upplýsingar má nálgast í ensku útgáfu + þessa skjals. +

+ message: delete: deleted: Skilaboðunum var eytt -- 2.39.5