Rework the PD question on the confirmation screen.

diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb
index 100206c31c0f3882f32542c5ddd7f5e0271222dc..068e6eeee91d6b707eed1a4d19d717bb4b17a50d 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -38,8 +38,8 @@
 <form method="post">
   <p>
     <label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label>
-    <input id="confirm_pd_checkbox" type="checkbox"
-    name="consider_pd"/><br/>
+    <input id="confirm_pd_checkbox" type="checkbox" name="consider_pd"/>
+    <span class="minorNote">(<%= link_to(t('user.confirm.consider_pd_why'), t('user.confirm.consider_pd_why_url'), :target => :new)%>)</span>
   </p>
   <p>
     <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3cf5a9c10f879bc39a0b8db000b2a350f80bec7e..c141dbe6e12bcdc43149b7c4bdb563648afcfa9c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1495,7 +1495,9 @@ en:
     confirm:
       heading: Confirm a user account
       press confirm button: "Please read the agreement below and press the agree button to activate your account."
-      consider_pd: "I consider my contributions to be in the <a href=\"http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain\">Public Domain</a>."
+      consider_pd: "I consider my contributions to be in the Public Domain"
+      consider_pd_why: what's this?
+      consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
       button: Agree
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."