Amend [17942]:

 * Center-align donation text
 * Add title="" to the donate link
 * Use an official cc_button.png from http://1.1.1.1/bmi/i.creativecommons.org/l/by-sa/2.0/88x31.png that doesn't include English text
 * Add rel=license to license link as suggested by CC
 * Add width/height to CC button

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index af399f34a6ce0e2fcda008bdcb8257ce71743f53..53867995b24d2199c3cfffb821da6321edd881cb 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -118,11 +118,19 @@
 
       <center>
         <div class="donate">
-          <a href="http://donate.openstreetmap.org/"><%= t 'layouts.make_a_donation' %></a>
+          <a href="http://donate.openstreetmap.org/" title="<%= h(t 'layouts.make_a_donation.title') %>"><%= h(t 'layouts.make_a_donation.text') %></a>
         </div>
 
         <div id="cclogo" class="button" style="width: 88px">
-          <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+          <%= 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" }) %>
         </div>
       </center>
     </div>

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 620381525378f4887ef421d2cb18a9b6e0cf5a8f..b3dbc85caf64d6f21f895a85b10fe1903b6f6c85 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -269,7 +269,8 @@ af:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
-    make_a_donation: Skenk 'n donasie
+    make_a_donation:
+      text: Skenk 'n donasie
     donate_link_text: skenk
     edit: Wysig
     edit_tooltip: Wysig kaarte

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 4a2b0146926c0a8050d1b74c75a348a5e15f848b..522fd98328531c37ffa1264d7d3ab300b52b3322 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -276,7 +276,8 @@ be:
     results: 
       no_results: Нічога не знойдзена
   layouts: 
-    make_a_donation: Зрабіць ахвяраванне
+    make_a_donation:
+      text: Зрабіць ахвяраванне
     donate: Падтрымайце OpenStreetMap {{link}} у фонд абнаўлення тэхнікі.
     donate_link_text: ахвяраваннем
     edit: Змяніць

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 22f2464f7bb0e06284176f2822f511170a7c94b9..2fd0cafba719541441591dcac5e6abf06c87b31a 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -379,7 +379,8 @@ br:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})"
       suffix_place: " {{distance}} {{direction}} diouzh {{placename}}"
   layouts: 
-    make_a_donation: Ober un donezon
+    make_a_donation:
+      text: Ober un donezon
     donate: Skoazellit OpenStreetMap dre {{link}} d'an Hardware Upgrade Fund.
     donate_link_text: oc'h ober un donezon
     edit: Aozañ

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 577b4ad8f62aa0a299def59862d48f12c8a98365..751fc95fd37fce4fe6d8c7f6ef22330ab22067fb 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -348,7 +348,8 @@ de:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
-    make_a_donation: Spenden
+    make_a_donation:
+      text: Spenden
     donate: Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}.
     donate_link_text: Spende
     edit: Bearbeiten

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 80d34c4a6125749faefbbb4afad11855844dc75e..025c733573b280b5a4087dddb86bbcf5e0265d37 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -456,7 +456,12 @@ en:
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    make_a_donation: Make a Donation
+    license:
+      alt: CC by-sa 2.0
+      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
+    make_a_donation:
+      title: Support OpenStreetMap with a monetary donation
+      text: Make a Donation
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4b1f3661542a6d48d7e8049e2479cd79e4a7735a..5f6ff0408c18aca51f25112d422bb081cf0d62ae 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -371,7 +371,8 @@ es:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    make_a_donation: Hacer una donación
+    make_a_donation:
+      text: Hacer una donación
     donate: Apoye a OpenStreetMap {{link}} al Fondo de Actualización de Hardware.
     donate_link_text: donando
     edit: Editar

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index f04bb8f8c4ff178554dc6e0b3f9f0cdc47e69ee8..ae40862a088bd68d73811de194ad501107190e58 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -304,7 +304,8 @@ fi:
     results: 
       no_results: Mitään ei löytynyt
   layouts: 
-    make_a_donation: Tee lahjoitus
+    make_a_donation:
+      text: Tee lahjoitus
     donate_link_text: lahjoittaminen
     edit: Muokkaa
     edit_tooltip: Muokkaa karttoja

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 571351811ef7bebf5d99f9e0cd721adec1abacad..e6d7a5948c4fd4fbc811b752078bc080815531c8 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -354,7 +354,8 @@ fr:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    make_a_donation: Faire un don
+    make_a_donation:
+      text: Faire un don
     donate: Soutenez OpenStreetMap, {{link}} au fond pour améliorer le matériel.
     donate_link_text: participez
     edit: Éditer

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index d08a089b472825301f597b4639447f2260c58604..da038f17c9a8bd83323bfa3292b6b9403d736ce0 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -105,7 +105,8 @@ gcf:
     no_such_user: 
       body: Woy, Pa ti ni pon itilizatè non ay sé {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
   layouts: 
-    make_a_donation: Ba OpenStreetMap On Fòs
+    make_a_donation:
+      text: Ba OpenStreetMap On Fòs
     donate: Ba OpenStreetMap on Fòs, {{link}} Pou fè matériel la vansé.
     donate_link_text: Bay Chabon
     edit: Modifié

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 6c0f60d549abfb930400c3791b45611fd7ebf354..cdfe83d389c0259608ce55aa15446efb8d1c0664 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -378,7 +378,8 @@ hsb:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wot {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} z {{placename}}"
   layouts: 
-    make_a_donation: Darić
+    make_a_donation:
+      text: Darić
     donate: Podpěraj OpenStreetMap přez {{link}} k fondsej aktualizacije hardwary.
     donate_link_text: Darjenje
     edit: Wobdźěłać

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index afb3118e981a9f9f8dcc25ced1d5c239df5ec89d..153f4d10be1b7e797ba0da4b3c8928ddea8ff6b2 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -380,7 +380,8 @@ hu:
       suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
       suffix_suburb: "{{suffix}} ({{parentname}})"
   layouts: 
-    make_a_donation: Adományozz
+    make_a_donation:
+      text: Adományozz
     donate: Támogasd az OpenStreetMapot a Hardverfrissítési Alapba történő {{link}}sal.
     donate_link_text: adományozás
     edit: Szerkesztés

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 1bb0fa99818a242419a67b3748a9caeaf179d642..885fe2f3a1f22d9f994f2a69d6c1c038e4498a97 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -381,7 +381,8 @@ is:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} af {{placename}}"
   layouts: 
-    make_a_donation: Fjárframlagssíða
+    make_a_donation:
+      text: Fjárframlagssíða
     donate: Hjálpaðu OpenStreetMap verkefninu með {{link}} í vélbúnaðarsjóðinn.
     donate_link_text: fjárframlagi
     edit: Breyta

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8d2267cc77b98fb18c5504f59860260d41a160d6..c377c9851254507956467702a9bb82b8b8c36e9e 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -262,7 +262,8 @@ it:
         uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Risultati da <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    make_a_donation: Fai una donazione
+    make_a_donation:
+      text: Fai una donazione
     donate: Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware.
     donate_link_text: donando
     edit: Modifica

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9d62a38a8e09b57412effe22d086ccc4a19d1641..04533bd73334957d86b1212a810ad03b08245ded 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -323,7 +323,8 @@ ja:
         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>からの結果
         us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>からの結果
   layouts: 
-    make_a_donation: 寄付
+    make_a_donation:
+      text: 寄付
     donate_link_text: 寄付
     edit: 編集
     edit_tooltip: 地図を編集する

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 5cd9fbb376ba7b2cdddb7f06e7397e245a185ba0..9176fdbc88caeee4bb5607fc261565b72c28af0b 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -223,7 +223,8 @@ km:
         uk_postcode: លទ្ធផលពី <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: លទ្ធផលពី <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    make_a_donation: ជួយ​ឧបត្ថម្ភ​
+    make_a_donation:
+      text: ជួយ​ឧបត្ថម្ភ​
     edit: កែប្រែ​
     edit_tooltip: កែប្រែ​ផែនទី​
     export: នាំចេញ​

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index fb229ccd2539381e92dbd705ccf4a935932da732..8312c77df9f88230524a608e574aad8078ca04b3 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -239,7 +239,8 @@ ko:
       manually_select: 다른 지역 선택
       view_larger_map: 큰 지도 보기
   layouts: 
-    make_a_donation: 기부하기
+    make_a_donation:
+      text: 기부하기
     donate_link_text: 기부
     edit: 편집
     edit_tooltip: 지도 편집

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index bf6796302f80f15dd29e1a417e6e0e48063e303e..358b5fd701511bbf2df4358fec9b664412e9bcfe 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -214,7 +214,8 @@ nds:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
-    make_a_donation: Spenn wat
+    make_a_donation:
+      text: Spenn wat
     donate_link_text: Spennen
     edit: Ännern
     export_tooltip: Koortendaten exporteren

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 69ba549172762512ab00f7ba45d69b15913c191f..a3c200b88c94557c1313a43ca972cf4bf9ade9b5 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -364,7 +364,8 @@ nl:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
-    make_a_donation: Doneren
+    make_a_donation:
+      text: Doneren
     donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
     donate_link_text: doneren
     edit: Bewerken

diff --git a/config/locales/no.yml b/config/locales/no.yml
index ddece393a30e81081521ac92f8cf555e4e708ee9..e1096917642b0c7998106c0531cf5ba83bfe6880 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -348,7 +348,8 @@
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} av {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} av {{placename}}"
   layouts: 
-    make_a_donation: Doner
+    make_a_donation:
+      text: Doner
     donate_link_text: donering
     edit: Rediger
     edit_tooltip: Rediger kart

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e690ef458faf1319965f0cb5a5a02c67c50ee07b..487ab9f582cbda541abcad268f0070e88f1c3808 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -260,7 +260,8 @@ pl:
         uk_postcode: Wyniki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Wyniki z <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    make_a_donation: Zrób Donację
+    make_a_donation:
+      text: Zrób Donację
     donate: Wspomóż Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego Sprzętu.
     donate_link_text: dokonując darowizny
     edit: Edycja

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b0396f8a7e54279bea7492d549adf6005cdc1ff7..949c6d81e32908b1869548c43bce79b27414982b 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -368,7 +368,8 @@ pt-BR:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    make_a_donation: Faça uma doação
+    make_a_donation:
+      text: Faça uma doação
     donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: {{link}}."
     donate_link_text: doando
     edit: Editar

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index be711db84b107c1bb1c377707ebda87e817d4d07..e7b1129d68c2643f003cd1f44b09f1611082abb6 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -377,7 +377,8 @@ ru:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} {{placename}}"
   layouts: 
-    make_a_donation: Сделать пожертвование
+    make_a_donation:
+      text: Сделать пожертвование
     donate: Поддержите OpenStreetMap {{link}} в Фонд обновления оборудования.
     donate_link_text: пожертвованиями
     edit: Правка

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0eddb52520e0a309198b24d930213dc914d8ca3b..c523f5a8a3620f0b8c8037778f451729580cad8c 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -358,7 +358,8 @@ sl:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} od {{placename}}"
   layouts: 
-    make_a_donation: Prispevajte finančna sredstva
+    make_a_donation:
+      text: Prispevajte finančna sredstva
     donate: Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme.
     donate_link_text: donacijo
     edit: Uredi

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a668e3d74d1c0b5ce9aeb1781661714431e7d53f..62dbf5b479beaeb42c4947d41289972d1e67f3cf 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -379,7 +379,8 @@ vi:
       suffix_parent: "{{suffix}} ({{parentdistance}} về phía {{parentdirection}} của {{parentname}})"
       suffix_place: ", {{distance}} về phía {{direction}} của {{placename}}"
   layouts: 
-    make_a_donation: Quyên góp
+    make_a_donation:
+      text: Quyên góp
     donate: Hỗ trợ OpenStreetMap bằng cách {{link}} cho Quỹ Nâng cấp Phần cứng.
     donate_link_text: quyên góp
     edit: Sửa đổi

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 1470d53be48efe079e6391d857bf03deae6bc181..80373e7683af4a94d563625bd7da4d675242267f 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -49,7 +49,8 @@ yo:
     view: 
       login: wole
   layouts: 
-    make_a_donation: Da wo si openstreetmap.org
+    make_a_donation:
+      text: Da wo si openstreetmap.org
     donate_link_text: idawo
     home: ile
     home_tooltip: Lo si ile

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index bb82797c1fec256f6041f57b09ebac0888f6fb97..57cdbae073070c55e5a06d272b00a1966ba02c06 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -257,7 +257,8 @@ zh-CN:
         uk_postcode: 结果 从 <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: 结果 从 <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    make_a_donation: 捐款
+    make_a_donation:
+      text: 捐款
     donate: 通过下面的link到Hardware Upgrade Fund来支持。
     donate_link_text: 捐款
     edit: 编辑

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b700e5517a976314214bb271959603ce51fb07f1..409ec49ee385b77c63c1270e357e1e3902c3a5b2 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -370,7 +370,8 @@ zh-TW:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} ／ {{parentname}})"
       suffix_place: ", {{direction}} {{distance}} ／ {{placename}}"
   layouts: 
-    make_a_donation: 進行捐款
+    make_a_donation:
+      text: 進行捐款
     donate: 以 {{link}} 給硬體升級基金來支援 OpenStreetMap。
     donate_link_text: 捐獻
     edit: 編輯

diff --git a/public/images/cc_button.png b/public/images/cc_button.png
index c6d26414b024d3bbfe5cb622d8bd29d050ee7cfb..f0a944e0b89642ae282047846e55393007b04686 100644 (file)
Binary files a/public/images/cc_button.png and b/public/images/cc_button.png differ

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index 2dedab08653cec6d6b71d18629aa2987327d79b4..b243928e769b7af977d549a82a493599c1e6c28e 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -130,7 +130,7 @@ body {
   border: 1px solid #ccc;
   background: #cbeea7;
   line-height: 1.2em;
-  text-align: left;
+  text-align: center;
   font-size: 14px;
 }