From: Ævar Arnfjörð Bjarmason Date: Sun, 7 Jun 2009 17:08:25 +0000 (+0000) Subject: The display:none attribution table looks horrid in text browsers X-Git-Tag: live~7079 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/86a0ba0172e8744a58edae7399a05f8412fa14aa?ds=sidebyside 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 3bccb7e04..f816dddd2 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -23,11 +23,11 @@
- - - - - +
http://creativecommons.org/licenses/by-sa/2.0/http://openstreetmap.org/
<%= t 'site.index.license' %><%= + I18n.t('site.index.license.notice', + :license_name => ('' + t('site.index.license.license_name') + ''), + :project_name => ('' + t('site.index.license.project_name') + '')) + %>
diff --git a/config/locales/be.yml b/config/locales/be.yml index 30e341ab2..43c79ca60 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -415,7 +415,10 @@ be: js_2: "OpenStreetMap выкарыстоўвае javascript для адлюстравання карты на сайце." js_3: 'Вы можаце паспрабаваць выкарыстаць статычны агляд Tiles@Home калі не можаце уключыць 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}}." diff --git a/config/locales/de.yml b/config/locales/de.yml index a54078de2..ae02514f7 100644 --- 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 Tiles@Home Website 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." diff --git a/config/locales/en.yml b/config/locales/en.yml index 716ab0e03..b3a678cd3 100644 --- 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 Tiles@Home static tile browser 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}}." diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 426eb40b7..50ffa7ac7 100644 --- 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 navigateur statique de Tiles@Home." 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}}." diff --git a/config/locales/he.yml b/config/locales/he.yml index 15fee96e3..f7ea09588 100644 --- 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 Tiles@Home static tile browser 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}}." diff --git a/config/locales/is.yml b/config/locales/is.yml index e59bc1ecf..a21df9ed5 100644 --- 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ð Tiles@Home kortasýnina 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}}." diff --git a/config/locales/it.yml b/config/locales/it.yml index 1673b9e00..ea3565e3a 100644 --- 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 browser statico Tiles@Home.' 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}}." diff --git a/config/locales/nl.yml b/config/locales/nl.yml index fd181a10e..82fee69d9 100644 --- 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 Tiles@Home statische tilebrowser 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}}." diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 6d4de8e26..42ff565a1 100644 --- 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 statycznej przeglądarki Tiles@Home 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}}." diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 65f35140c..f3d8e5072 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -416,7 +416,10 @@ ru: js_2: "OpenStreetMap использует JavaScript для отображения карт." js_3: 'Вы можете попробовать статичную карту от Tiles@Home, если вы не можете включить 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}}." diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 13186dae4..cd4c6a4fd 100644 --- 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 statičen pregledovalnik zemljevida Tiles@Home.' 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}}." diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 9962ef270..26ea27a5b 100644 --- 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 Tiles@Home static tile browser 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}}."