From: Siebrand Mazeland Date: Thu, 29 Apr 2010 20:58:18 +0000 (+0200) Subject: Merge branch 'master' of git://git.openstreetmap.org/rails X-Git-Tag: live~6319^2~6 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1ae014afa1e9cb79abea820610beea1bcf66b99c?hp=5dcd2ad70c5006d1b33838274b9a9167c81cfc90 Merge branch 'master' of git://git.openstreetmap.org/rails --- diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index d2c2b5807..ff702aed1 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -49,6 +49,9 @@ private end def wikipedia_link(key, value) + # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL + return nil if value =~ /^http:\/\// + if key == "wikipedia" # This regex should match Wikipedia language codes, everything # from de to zh-classical @@ -68,9 +71,6 @@ private return nil end - # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL - return nil if value =~ /^http:\/\// - return { :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}", :title => value diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 3bc9bb202..eaaf3f366 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 == 'en' or params[:copyright_locale] == 'en' %> + + <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %> +

<%= 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', + :copyright_locale => 'en') %> +

+
+ <% end %> + + <%= t('license_page.legal_babble') %> +<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index f1e0e6a85..3f6518d4e 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 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 32d81b0f5..e5a3542b4 100644 --- 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,41 @@ 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 diff --git a/config/routes.rb b/config/routes.rb index df6efef60..9a86f9200 100644 --- 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' diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml index 92856e0ab..37973766b 100644 --- a/config/wiki_pages.yml +++ b/config/wiki_pages.yml @@ -9,6 +9,8 @@ cz: tag: route=trolleybus: Cz:Tag:route=trolleybus da: + key: + maxheight: Da:Key:maxheight tag: highway=tertiary: Da:Tag:highway=tertiary highway=track: Da:Tag:highway=track @@ -559,6 +561,7 @@ en: landuse=military: Tag:landuse=military landuse=orchard: Tag:landuse=orchard landuse=peat_cutting: Tag:landuse=peat cutting + landuse=pond: Tag:landuse=pond landuse=quarry: Tag:landuse=quarry landuse=railway: Tag:landuse=railway landuse=recreation_ground: Tag:landuse=recreation ground @@ -899,24 +902,36 @@ fr: waterway: FR:Key:waterway tag: aeroway=runway: FR:Tag:aeroway=runway + amenity=bicycle_parking: FR:Tag:amenity=bicycle parking amenity=bicycle_rental: FR:Tag:amenity=bicycle rental + amenity=fire_station: FR:Tag:amenity=fire station amenity=pharmacy: FR:Tag:amenity=pharmacy amenity=recycling: FR:Tag:amenity=recycling + amenity=townhall: FR:Tag:amenity=townhall + barrier=bollard: FR:Tag:barrier=bollard barrier=gate: FR:Tag:barrier=gate cycleway=bike_box: FR:Tag:cycleway=bike box highway=bus_stop: FR:Tag:highway=bus stop highway=crossing: FR:Tag:highway=crossing highway=cycleway: FR:Tag:highway=cycleway highway=motorway: FR:Tag:highway=motorway + highway=motorway_link: FR:Tag:highway=motorway link landuse=farmyard: FR:Tag:landuse=farmyard landuse=forest: FR:Tag:landuse=forest leisure=playground: FR:Tag:leisure=playground + man_made=water_works: FR:Tag:man made=water works natural=tree: FR:Tag:natural=tree + place=city: FR:Tag:place=city + place=hamlet: FR:Tag:place=hamlet + place=locality: FR:Tag:place=locality + place=town: FR:Tag:place=town + place=village: FR:Tag:place=village power=generator: FR:Tag:power=generator power=line: FR:Tag:power=line power=tower: FR:Tag:power=tower railway=subway_entrance: FR:Tag:railway=subway entrance shop=bakery: FR:Tag:shop=bakery + shop=supermarket: FR:Tag:shop=supermarket waterway=riverbank: FR:Tag:waterway=riverbank waterway=stream: FR:Tag:waterway=stream hr: @@ -1203,6 +1218,7 @@ ru: capacity: RU:Key:capacity comment: RU:Key:comment construction: RU:Key:construction + covered: RU:Key:covered created_by: RU:Key:created by crossing: RU:Key:crossing cuisine: RU:Key:cuisine @@ -1388,6 +1404,7 @@ ru: shop=confectionery: RU:Tag:shop=confectionery shop=department_store: RU:Tag:shop=department store shop=fabrics: RU:Tag:shop=fabrics + shop=florist: RU:Tag:shop=florist shop=hairdresser: RU:Tag:shop=hairdresser shop=kiosk: RU:Tag:shop=kiosk shop=supermarket: RU:Tag:shop=supermarket