The display:none attribution table looks horrid in text browsers

(e.g. w3m). And there's no reason to include plain URLs to CC-BY-SA
and OSM *AND* mention both in the message below without including any
links.

Instead erase those links and work them into the message instead.

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 3bccb7e044070aa31453abe79643095faa0456cd..f816dddd22004cd970d6412f5fef8c6904ad5c43 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -23,11 +23,11 @@
 <div id="attribution">
   <table width="100%">
     <tr>
 <div id="attribution">
   <table width="100%">
     <tr>

-      <td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
-      <td align="right">http://openstreetmap.org/</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center"><%= t 'site.index.license' %></td>
+      <td align="center"><%=
+        I18n.t('site.index.license.notice',
+          :license_name => ('<a href="' + t('site.index.license.license_url') + '">' + t('site.index.license.license_name') + '</a>'),
+          :project_name => ('<a href="' + t('site.index.license.project_url') + '">' + t('site.index.license.project_name') + '</a>'))
+        %></td>

     </tr>
   </table>
 </div>
     </tr>
   </table>
 </div>

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 30e341ab22a247de385340810651abd89d6a53e4..43c79ca604ea2ebbb1bae94cf9b0e033975ca882 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -415,7 +415,10 @@ be:
       js_2: "OpenStreetMap выкарыстоўвае javascript для адлюстравання карты на сайце."
       js_3: 'Вы можаце паспрабаваць выкарыстаць <a href="http://tah.openstreetmap.org/Browse/">статычны агляд Tiles@Home</a> калі не можаце уключыць javascript.'
       permalink: Спасылка сюды
       js_2: "OpenStreetMap выкарыстоўвае javascript для адлюстравання карты на сайце."
       js_3: 'Вы можаце паспрабаваць выкарыстаць <a href="http://tah.openstreetmap.org/Browse/">статычны агляд Tiles@Home</a> калі не можаце уключыць javascript.'
       permalink: Спасылка сюды

-      license: "Ліцэнзіруецца на ўмовах Creative Commons Attribution-Share Alike 2.0 праектам OpenStreetMap і яго карыстальнікамі."
+      license:
+        notice: "Ліцэнзіруецца на ўмовах {{license_name}} праектам {{project_name}} і яго карыстальнікамі."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap"

     edit:
       not_public: "Вы не дазволілі зрабіць усе вашыя змены публічнымі."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "Вы не дазволілі зрабіць усе вашыя змены публічнымі."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."

diff --git a/config/locales/de.yml b/config/locales/de.yml
index a54078de2db29154a4d6b0063db7d473cce1d40e..ae02514f7b3d75bc4cb44f789135160a1524d70a 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -492,7 +492,10 @@ de:
       js_2: "OpenStreetMap nutzt Javascript für die Kartendarstellung."
       js_3: 'Solltest bei dir kein Javascript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne Javascript benutzen.'
       permalink: Permalink
       js_2: "OpenStreetMap nutzt Javascript für die Kartendarstellung."
       js_3: 'Solltest bei dir kein Javascript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne Javascript benutzen.'
       permalink: Permalink

-      license: "Lizenziert unter Creative Commons Attribution-Share Alike 2.0 Lizenz durch das OpenStreetMap Projekt und seine Mitwirkenden."
+      license:
+        notice: "Lizenziert unter {{license_name}} Lizenz durch das {{project_name}} und seine Mitwirkenden."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap Projekt"

     edit:
       not_public: "Deine Einstellungen sind auf anonymes Bearbeiten gestellt."
       not_public_description: "Du musst deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun."
     edit:
       not_public: "Deine Einstellungen sind auf anonymes Bearbeiten gestellt."
       not_public_description: "Du musst deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun."

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 716ab0e03ee75cc6735f71b5429fbacf5768a8ff..b3a678cd3b2b414724868768c5480c68d555ca0d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -515,7 +515,12 @@ en:
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink

-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"

     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 426eb40b76a98906c5eb38ece7bd520f1ac5a8e8..50ffa7ac7e8a9f3519fab73d4ceb209cca268c1c 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -144,7 +144,10 @@ fr:
       js_2: "OpenStreetMap utilise Javascript pour ses cartes glissantes."
       js_3: "Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>."
       permalink: "Permalink"
       js_2: "OpenStreetMap utilise Javascript pour ses cartes glissantes."
       js_3: "Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>."
       permalink: "Permalink"

-      license: "Sous license Creative Commons Attribution-Share Alike 2.0 par le projet OpenStreetMap et ses contributeurs."
+      license:
+        notice: "Sous license {{license_name}} par le {{project_name}} et ses contributeurs."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "projet OpenStreetMap"

     edit:
       not_public: "Vous n'avez pas réglé vos éditions pour qu'elles soient publiques."
       not_public_description: "Vous ne pouvez plus éditer la carte a moins que vous ne rendiez vos éditions publiques. Vous pouvez rendre vos éditions publiques à partir de votre {{user_page}}."
     edit:
       not_public: "Vous n'avez pas réglé vos éditions pour qu'elles soient publiques."
       not_public_description: "Vous ne pouvez plus éditer la carte a moins que vous ne rendiez vos éditions publiques. Vous pouvez rendre vos éditions publiques à partir de votre {{user_page}}."

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 15fee96e3cda4bb46a04b061b3f600f1c68ec846..f7ea0958809e17c732a04c45e40613afcc21d5f4 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -416,7 +416,12 @@ he:
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink

-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"

     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."

diff --git a/config/locales/is.yml b/config/locales/is.yml
index e59bc1ecf842b3a7ea0aad566bf7d5b69e414cad..a21df9ed51b48f24fb4bd92d3346e4feada72874 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -491,7 +491,10 @@ is:
       js_2: "OpenStreetMap notar JavaScript til að útfæra gagnvirk kort."
       js_3: 'Þú getur einnig notað <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasýnina</a> sem krefst ekki JavaScript stuðnings.'
       permalink: "Varanlegur tengill"
       js_2: "OpenStreetMap notar JavaScript til að útfæra gagnvirk kort."
       js_3: 'Þú getur einnig notað <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasýnina</a> sem krefst ekki JavaScript stuðnings.'
       permalink: "Varanlegur tengill"

-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Gefið út undir {{license_name}} leyfinu af þáttakendum í {{project_name}}."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap verkefninu"

     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1673b9e008da0131969cfafe0bffe6851a225320..ea3565e3a377389c61737152de2b8a8e6f8df052 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -416,7 +416,10 @@ it:
       js_2: "OpenStreetMap utilizza javascript per le sua mappa."
       js_3: 'Se non si riesce ad abilitare javascript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.'
       permalink: Permalink
       js_2: "OpenStreetMap utilizza javascript per le sua mappa."
       js_3: 'Se non si riesce ad abilitare javascript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.'
       permalink: Permalink

-      license: "Rilasciato sotto la licenza Creative Commons Attribution-Share Alike 2.0 dal progetto OpenStreetMap ed i suoi contributori."
+      license:
+        notice: "Rilasciato sotto la licenza {{license_name}} dal {{project_name}} ed i suoi contributori."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "progetto OpenStreetMap"

     edit:
       not_public: "Non si sono impostate come pubbliche le proprie modifiche."
       not_public_description: "Non si può più modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}."
     edit:
       not_public: "Non si sono impostate come pubbliche le proprie modifiche."
       not_public_description: "Non si può più modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}."

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index fd181a10ecad4b773330b7ed36452e61653f89f0..82fee69d912f1be07ead8b3597e9861f18e06e00 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -416,7 +416,10 @@ nl:
       js_2: "OpenStreetMap gebruikt JavaScript voor de slippy-kaart."
       js_3: 'Je kunt de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> gebruiken als je niet de mogelijkheid hebt om JavaScript aan te zetten.'
       permalink: Permalink
       js_2: "OpenStreetMap gebruikt JavaScript voor de slippy-kaart."
       js_3: 'Je kunt de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> gebruiken als je niet de mogelijkheid hebt om JavaScript aan te zetten.'
       permalink: Permalink

-      license: "Gelicenseerd onder de Creative Commons Attribution-Share Alike 2.0 licentie door het OpenStreetMap-project en zijn bijdragers."
+      license:
+        notice: "Gelicenseerd onder de {{license_name}} licentie door het {{project_name}} en zijn bijdragers."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap-project"

     edit:
       not_public: "Je hebt ingesteld dat je bewerkingen niet openbaar zijn."
       not_public_description: "Je kunt de kaart niet meer bewerken, behalve als je je bewerkingen openbaar maak. Je kunt dit instellen op je {{user_page}}."
     edit:
       not_public: "Je hebt ingesteld dat je bewerkingen niet openbaar zijn."
       not_public_description: "Je kunt de kaart niet meer bewerken, behalve als je je bewerkingen openbaar maak. Je kunt dit instellen op je {{user_page}}."

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6d4de8e26afca592137481bec25a4510523c268e..42ff565a137cc5b1a2b57ccd4fc28eed1301b994 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -419,7 +419,10 @@ pl:
       js_2: "OpenStreetMap używa javaskryptów do wyświetlania mapki slippy map."
       js_3: 'Spróbuj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglądarki Tiles@Home</a> jeśli nie masz możliwości włączyć javaskryptu.'
       permalink: Permalink
       js_2: "OpenStreetMap używa javaskryptów do wyświetlania mapki slippy map."
       js_3: 'Spróbuj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglądarki Tiles@Home</a> jeśli nie masz możliwości włączyć javaskryptu.'
       permalink: Permalink

-      license: "Dostęp na zasadach licencji Creative Commons Attribution-Share Alike 2.0, prawa autorskie projektu OpenStreetMap i jego uczestników."
+      license:
+        notice: "Dostęp na zasadach licencji {{license_name}}, prawa autorskie {{project_name}} i jego uczestników."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "projektu OpenStreetMap"

     edit:
       not_public: "Nie wybrałeś(aś) by twoje edycje były publiczne."
       not_public_description: "W tym trybie nie można już zmieniać mapy.  Możesz ustawić je na publiczne na Twojej {{user_page}}."
     edit:
       not_public: "Nie wybrałeś(aś) by twoje edycje były publiczne."
       not_public_description: "W tym trybie nie można już zmieniać mapy.  Możesz ustawić je na publiczne na Twojej {{user_page}}."

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 65f35140c114f3c4f94effea7df260c9b2a159ce..f3d8e5072bdf4623b57d14ca2479593ad7ca84e8 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -416,7 +416,10 @@ ru:
       js_2: "OpenStreetMap использует JavaScript для отображения карт."
       js_3: 'Вы можете попробовать <a href="http://tah.openstreetmap.org/Browse/">статичную карту от Tiles@Home</a>, если вы не можете включить JavaScript.'
       permalink: Постоянная ссылка
       js_2: "OpenStreetMap использует JavaScript для отображения карт."
       js_3: 'Вы можете попробовать <a href="http://tah.openstreetmap.org/Browse/">статичную карту от Tiles@Home</a>, если вы не можете включить JavaScript.'
       permalink: Постоянная ссылка

-      license: "Защищено лицензией Creative Commons Attribution-Share Alike 2.0 проектом OpenStreetMap и его пользователями."
+      license:
+        notice: "Защищено лицензией {{license_name}} проектом {{project_name}} и его пользователями."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap"

     edit:
       not_public: "Вы не сделали свои правки публичными."
       not_public_description: "Вы не можете больше анонимно редактировать карту. Вы можете сделать ваши правки публичными здесь {{user_page}}."
     edit:
       not_public: "Вы не сделали свои правки публичными."
       not_public_description: "Вы не можете больше анонимно редактировать карту. Вы можете сделать ваши правки публичными здесь {{user_page}}."

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 13186dae47a726d76f40fd38518d4f0abbb76459..cd4c6a4fd1c8289d83f0dbc9cdf6b57f8dbf4f30 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -483,7 +483,12 @@ sl:
       js_2: "OpenStreetMap za prikaz zemljevida uporablja Javascript."
       js_3: 'Če Javascripta ne morete omogočiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statičen pregledovalnik zemljevida Tiles@Home</a>.'
       permalink: Trajna povezava
       js_2: "OpenStreetMap za prikaz zemljevida uporablja Javascript."
       js_3: 'Če Javascripta ne morete omogočiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statičen pregledovalnik zemljevida Tiles@Home</a>.'
       permalink: Trajna povezava

-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"

     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9962ef270902551180f3c350326af4adae51d892..26ea27a5b31b8cc43b37a4b2444bad3f13894b34 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -406,7 +406,12 @@ zh-CN:
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink

-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"

     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."