Merge pull request #4515 from fubik/develop

Disables submit button in sign up form after submission to avoid email already exists error

Changelog.md

@@ -17,6 +17,7 @@
 * Adjust 404 message description to not leak logged out users if a post exists or not [#4477](https://github.com/diaspora/diaspora/pull/4477)
 * Make I18n system more robust against missing keys in pluralization data
 * Prevent overflow of too long strings in the single post view [#4487](https://github.com/diaspora/diaspora/pull/4487)
+* Disable submit button in sign up form after submission to avoid email already exists error [#4506](https://github.com/diaspora/diaspora/issues/4506)
 
 ## Features
 * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)

app/views/registrations/new.html.erb

@@ -63,7 +63,7 @@
                   <%= invite_hidden_tag(invite) %>
                 </fieldset>
 
-                <%= f.submit t('.continue'), :class => "new-btn" %>
+                <%= f.submit t('.continue'), :class => "new-btn", :disable_with => t('.submitting') %>
             <% end %>
         </div>
     </div>

app/views/registrations/new.mobile.haml

@@ -45,7 +45,7 @@
                 = f.password_field :password_confirmation, :placeholder => "••••••••"
 
             .controls
-              = f.submit t('registrations.new.create_my_account'), :class => 'btn primary'
+              = f.submit t('registrations.new.create_my_account'), :class => 'btn primary', :disable_with => t('registrations.new.submitting')
               = link_to t('devise.sessions.new.sign_in'), new_user_session_path(), :class => 'btn primary', :style => "float: right;"
 
 %footer

config/locales/diaspora/en.yml

@@ -894,6 +894,7 @@ en:
       password: "PASSWORD"
       password_confirmation: "PASSWORD CONFIRMATION"
       continue: "Continue"
+      submitting: "Submitting..."
     create:
       success: "You've joined Diaspora!"
     edit: