From: Ævar Arnfjörð Bjarmason Date: Fri, 2 Oct 2009 13:04:47 +0000 (+0000) Subject: Amend [17942]: X-Git-Tag: live~6621 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8c1d3fdd6bd4e80f3cbf2fcd6842ebf3a5050992 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 af399f34a..53867995b 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -118,11 +118,19 @@
diff --git a/config/locales/af.yml b/config/locales/af.yml index 620381525..b3dbc85ca 100644 --- 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 4a2b01469..522fd9832 100644 --- 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 22f2464f7..2fd0cafba 100644 --- 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 577b4ad8f..751fc95fd 100644 --- 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 80d34c4a6..025c73357 100644 --- 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 4b1f36615..5f6ff0408 100644 --- 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 f04bb8f8c..ae40862a0 100644 --- 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 571351811..e6d7a5948 100644 --- 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 d08a089b4..da038f17c 100644 --- 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 6c0f60d54..cdfe83d38 100644 --- 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 afb3118e9..153f4d10b 100644 --- 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 1bb0fa998..885fe2f3a 100644 --- 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 8d2267cc7..c377c9851 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -262,7 +262,8 @@ it: uk_postcode: Risultati da NPEMap / FreeThe Postcode us_postcode: Risultati da Geocoder.us 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 9d62a38a8..04533bd73 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -323,7 +323,8 @@ ja: uk_postcode: NPEMap / FreeThe Postcodeからの結果 us_postcode: Geocoder.usからの結果 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 5cd9fbb37..9176fdbc8 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -223,7 +223,8 @@ km: uk_postcode: លទ្ធផលពី NPEMap / FreeThe Postcode us_postcode: លទ្ធផលពី Geocoder.us 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 fb229ccd2..8312c77df 100644 --- 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 bf6796302..358b5fd70 100644 --- 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 69ba54917..a3c200b88 100644 --- 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 ddece393a..e10969176 100644 --- 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 e690ef458..487ab9f58 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -260,7 +260,8 @@ pl: uk_postcode: Wyniki z NPEMap / FreeThe Postcode us_postcode: Wyniki z Geocoder.us 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 b0396f8a7..949c6d81e 100644 --- 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 be711db84..e7b1129d6 100644 --- 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 0eddb5252..c523f5a8a 100644 --- 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 a668e3d74..62dbf5b47 100644 --- 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 1470d53be..80373e768 100644 --- 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 bb82797c1..57cdbae07 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -257,7 +257,8 @@ zh-CN: uk_postcode: 结果 从 NPEMap / FreeThe Postcode us_postcode: 结果 从 Geocoder.us 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 b700e5517..409ec49ee 100644 --- 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 c6d26414b..f0a944e0b 100644 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 2dedab086..b243928e7 100644 --- 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; }