From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Oct 2009 23:37:05 +0000 (+0000)
Subject: Merge 18123:18249 from trunk.
X-Git-Tag: live~7054^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0166abe88a2c082500f208d6f6be1343e6d0bedd

Merge 18123:18249 from trunk.
---

0166abe88a2c082500f208d6f6be1343e6d0bedd
diff --cc app/views/user/new.html.erb
index 83edc9b89,a25097e16..88a1d7bf9
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@@ -24,9 -24,10 +24,10 @@@
    <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.confirm email address' %></td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %></td></tr>
    <tr><td></td><td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td></tr>
 -  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
 +  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %></td></tr>
+   <tr><td></td><td><span class="minorNote"><%= t 'user.new.display name description' %></span></td></tr>
 -  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
 +  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>