From: Kai Krueger <kakrueger@gmail.com>
Date: Sun, 2 May 2010 00:06:30 +0000 (+0100)
Subject: Make a missing string translatable. Add a note about not needing a password with... 
X-Git-Tag: live~6320
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/900fdde6646f572912f4422bfee10131d95b7a73

Make a missing string translatable. Add a note about not needing a password with OpenID
---

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 8f4c6d603..7ac168eba 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -35,9 +35,10 @@
     <tr id="openid-url"><td class="fieldName"><%= t 'user.new.openID' %></td><td><%= text_field('user', 'openid_url',{:size => 50, :maxlength => 255, :tabindex => 6, :value => @openID, :class => "openid_url"}) %></td></tr>
     <tr id="openid-note"><td></td><td><span class="minorNote"><%= t 'user.new.openID description' %></span></td></tr>
   <% else %>
-    <tr id="openid-prompt"><td></td><td><span class="minorNote"><%= link_to_function('Associate an OpenID with your account') { |page| page.hide 'openid-prompt'; page.show 'openid-url', 'openid-note' } %></span></td></tr>
+    <tr id="openid-prompt"><td></td><td><span class="minorNote"><%= link_to_function(t 'user.new.openID associate') { |page| page.hide 'openid-prompt'; page.show 'openid-url', 'openid-note', 'openid-note-2' } %></span></td></tr>
     <tr id="openid-url" style="display: none"><td class="fieldName"><%= t 'user.new.openID' %></td><td><%= text_field('user', 'openid_url',{:size => 50, :maxlength => 255, :tabindex => 6, :value => @openID, :class => "openid_url"}) %></td></tr>
     <tr id="openid-note" style="display: none"><td></td><td><span class="minorNote"><%= t 'user.new.openID description' %></span></td></tr>
+    <tr id="openid-note-2" style="display: none"><td></td><td><span class="minorNote"><%= t 'user.new.openID nopassword' %></span></td></tr>   
   <% end %>
   <tr><td colspan="2" >&nbsp;<!--vertical spacer--></td></tr>
   <tr><td></td><td align="right"><input type="submit" value="<%= t'user.new.signup' %>" tabindex="7"></td></tr>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2d4a634ad..bb01b4df2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1573,8 +1573,10 @@ en:
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
+      openID associate: "Associate an OpenID with your account"
       openID: "OpenID:"
       openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'
+      openID nopassword: "With OpenID, you don't need to specify a password during signup, but some extra OpenStreetMap services or tools may still need one"
       openID association: 'Your OpenID is not associated with a OpenStreetMap account yet.<br><ul><li>If you are new to OpenStreetMap, please create a new account.<li>If you already have an account, you can normally login to your account and then associate the account with your openID in your user settings</ul> '
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."