Replace the donate button with a text version that can be translated.

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 59b7c304bd94e573c030e057f750b802dd782dcd..af399f34a6ce0e2fcda008bdcb8257ce71743f53 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -117,8 +117,8 @@
       <%= yield :optionals %>
 
       <center>
-        <div class="button" style="width: 115px">
-          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="<%= t 'layouts.alt_donation' %>" title="<%= t 'layouts.alt_donation' %>" /></a>
+        <div class="donate">
+          <a href="http://donate.openstreetmap.org/"><%= t 'layouts.make_a_donation' %></a>
         </div>
 
         <div id="cclogo" class="button" style="width: 88px">

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 24ee9ef031dcaf9489e00554fe0f2ccd640cb3c0..620381525378f4887ef421d2cb18a9b6e0cf5a8f 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -269,7 +269,7 @@ af:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
-    alt_donation: Skenk 'n donasie
+    make_a_donation: 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 2183534d8acd8b812c8d541fbb8467229a922bbf..4a2b0146926c0a8050d1b74c75a348a5e15f848b 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -276,7 +276,7 @@ be:
     results: 
       no_results: Нічога не знойдзена
   layouts: 
-    alt_donation: Зрабіць ахвяраванне
+    make_a_donation: Зрабіць ахвяраванне
     donate: Падтрымайце OpenStreetMap {{link}} у фонд абнаўлення тэхнікі.
     donate_link_text: ахвяраваннем
     edit: Змяніць

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 82d09626a2ded7b6fc89b7f8246a9637048f0359..22f2464f7bb0e06284176f2822f511170a7c94b9 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -379,7 +379,7 @@ br:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})"
       suffix_place: " {{distance}} {{direction}} diouzh {{placename}}"
   layouts: 
-    alt_donation: Ober un donezon
+    make_a_donation: 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 6a1f5305709d57d69c1ca052cac58c1d8bc621e5..577b4ad8f62aa0a299def59862d48f12c8a98365 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -348,7 +348,7 @@ de:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
-    alt_donation: Spenden
+    make_a_donation: 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 d3cde84fb19262d607a1a581f0b9c5f97598194d..80d34c4a6125749faefbbb4afad11855844dc75e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -456,7 +456,7 @@ 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!'
-    alt_donation: Make a Donation
+    make_a_donation: 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 49ccd827d6990442bae7bc47bfbfd05d18d60100..4b1f3661542a6d48d7e8049e2479cd79e4a7735a 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -371,7 +371,7 @@ es:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Hacer una donación
+    make_a_donation: 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 a9ddf6bc23e316037ea279c2be7b1c207fb23cfd..f04bb8f8c4ff178554dc6e0b3f9f0cdc47e69ee8 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -304,7 +304,7 @@ fi:
     results: 
       no_results: Mitään ei löytynyt
   layouts: 
-    alt_donation: Tee lahjoitus
+    make_a_donation: 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 5a4d813755bd8580d02eed588c48b273e2e61efd..571351811ef7bebf5d99f9e0cd721adec1abacad 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -354,7 +354,7 @@ fr:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Faire un don
+    make_a_donation: 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 76acf55231e03d287b763bda0786104c9b9059a5..d08a089b472825301f597b4639447f2260c58604 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -105,7 +105,7 @@ 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: 
-    alt_donation: Ba OpenStreetMap On Fòs
+    make_a_donation: 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 600488b27f4f685b9aaa798d6b97eab08f513e13..6c0f60d549abfb930400c3791b45611fd7ebf354 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -378,7 +378,7 @@ hsb:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wot {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} z {{placename}}"
   layouts: 
-    alt_donation: Darić
+    make_a_donation: 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 1538133d17340173f22080b98add20b96156aecd..afb3118e981a9f9f8dcc25ced1d5c239df5ec89d 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -380,7 +380,7 @@ hu:
       suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
       suffix_suburb: "{{suffix}} ({{parentname}})"
   layouts: 
-    alt_donation: Adományozz
+    make_a_donation: 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 095496c0093f119a786d3ebbb684f6efdf53edad..1bb0fa99818a242419a67b3748a9caeaf179d642 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -381,7 +381,7 @@ is:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} af {{placename}}"
   layouts: 
-    alt_donation: Fjárframlagssíða
+    make_a_donation: 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 cf1907b002cad939b586feab1537d79266709946..8d2267cc77b98fb18c5504f59860260d41a160d6 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -262,7 +262,7 @@ 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: 
-    alt_donation: Fai una donazione
+    make_a_donation: 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 d564db72488edf5cbb0ac4efc80bae18db0f369e..9d62a38a8e09b57412effe22d086ccc4a19d1641 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -323,7 +323,7 @@ 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: 
-    alt_donation: 寄付
+    make_a_donation: 寄付
     donate_link_text: 寄付
     edit: 編集
     edit_tooltip: 地図を編集する

diff --git a/config/locales/km.yml b/config/locales/km.yml
index d6754bb193719ea25695601b67f38defda47adf8..5cd9fbb376ba7b2cdddb7f06e7397e245a185ba0 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -223,7 +223,7 @@ 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: 
-    alt_donation: ជួយ​ឧបត្ថម្ភ​
+    make_a_donation: ជួយ​ឧបត្ថម្ភ​
     edit: កែប្រែ​
     edit_tooltip: កែប្រែ​ផែនទី​
     export: នាំចេញ​

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

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 35fd00787bc639281539549f27623bca63e1298b..bf6796302f80f15dd29e1a417e6e0e48063e303e 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -214,7 +214,7 @@ nds:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
-    alt_donation: Spenn wat
+    make_a_donation: 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 4d9a1904bfe4cc94f3f404b5c279a852a5d75b06..69ba549172762512ab00f7ba45d69b15913c191f 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -364,7 +364,7 @@ nl:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
-    alt_donation: Doneren
+    make_a_donation: 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 db3f19c62c6fd7711fc811b722daee815b8a3155..ddece393a30e81081521ac92f8cf555e4e708ee9 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -348,7 +348,7 @@
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} av {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} av {{placename}}"
   layouts: 
-    alt_donation: Doner
+    make_a_donation: Doner
     donate_link_text: donering
     edit: Rediger
     edit_tooltip: Rediger kart

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 586f837022077099a4cc1d7fce9b1ecfd2de46cd..e690ef458faf1319965f0cb5a5a02c67c50ee07b 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -260,7 +260,7 @@ 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: 
-    alt_donation: Zrób Donację
+    make_a_donation: 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 f405b0bd49712ff39f217b4f978d451915b90d77..b0396f8a7e54279bea7492d549adf6005cdc1ff7 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -368,7 +368,7 @@ pt-BR:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Faça uma doação
+    make_a_donation: 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 99d0d49ad08528b0404365a19f7f0b6838915774..be711db84b107c1bb1c377707ebda87e817d4d07 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -377,7 +377,7 @@ ru:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} {{placename}}"
   layouts: 
-    alt_donation: Сделать пожертвование
+    make_a_donation: Сделать пожертвование
     donate: Поддержите OpenStreetMap {{link}} в Фонд обновления оборудования.
     donate_link_text: пожертвованиями
     edit: Правка

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index fd2b857009890e999a8ba88fd0e2e9d008d0b7b4..0eddb52520e0a309198b24d930213dc914d8ca3b 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -358,7 +358,7 @@ sl:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} od {{placename}}"
   layouts: 
-    alt_donation: Prispevajte finančna sredstva
+    make_a_donation: 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 c98f662b20c512c8cea806f9639093bd81022c42..a668e3d74d1c0b5ce9aeb1781661714431e7d53f 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -379,7 +379,7 @@ vi:
       suffix_parent: "{{suffix}} ({{parentdistance}} về phía {{parentdirection}} của {{parentname}})"
       suffix_place: ", {{distance}} về phía {{direction}} của {{placename}}"
   layouts: 
-    alt_donation: Quyên góp
+    make_a_donation: 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 d8acd5cac76c6838dee23b5681bcba4991dc2950..1470d53be48efe079e6391d857bf03deae6bc181 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -49,7 +49,7 @@ yo:
     view: 
       login: wole
   layouts: 
-    alt_donation: Da wo si openstreetmap.org
+    make_a_donation: 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 8caf4b6323076fb941c2cf493af6ea1be863139d..bb82797c1fec256f6041f57b09ebac0888f6fb97 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -257,7 +257,7 @@ 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: 
-    alt_donation: 捐款
+    make_a_donation: 捐款
     donate: 通过下面的link到Hardware Upgrade Fund来支持。
     donate_link_text: 捐款
     edit: 编辑

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

diff --git a/public/images/donate.png b/public/images/donate.png
deleted file mode 100644 (file)
index 9cd9a7c..0000000
Binary files a/public/images/donate.png and /dev/null differ

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index c44d54bcea0b18bae8acbf5472381984b2a9bf50..2dedab08653cec6d6b71d18629aa2987327d79b4 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -123,6 +123,17 @@ body {
   font-size: 14px;
 }
 
+.donate {
+  width: 150px;
+  margin: 10px;
+  padding: 10px;
+  border: 1px solid #ccc;
+  background: #cbeea7;
+  line-height: 1.2em;
+  text-align: left;
+  font-size: 14px;
+}
+
 .left_menu {
   width: 150px;
   min-width: 150px;