Use "confirm_email" instead "confirm email" in resource names so it

matches the method name.

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index b58a6a71c08b86927b2309a90839f08ea29ba11c..1dbc9368dc440b387e1966cec3670f65dfd1e9ec 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -206,11 +206,11 @@ class UserController < ApplicationController
         @user.email_valid = true
         @user.save!
         token.destroy
-        flash[:notice] = I18n.t('user.confirm email.success')
+        flash[:notice] = I18n.t('user.confirm_email.success')
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
-        @notice = I18n.t('user.confirm email.failure')
+        @notice = I18n.t('user.confirm_email.failure')
       end
     end
   end

diff --git a/app/views/user/confirm_email.rhtml b/app/views/user/confirm_email.rhtml
index 154dbb7c278f225ce37b30218401461b725ed85e..b9bd97fcd7e94491ec8a6804f385a444e8020efc 100644 (file)
--- a/app/views/user/confirm_email.rhtml
+++ b/app/views/user/confirm_email.rhtml
@@ -1,8 +1,8 @@
-<h1><%= t 'user.confirm email.heading' %></h1>
+<h1><%= t 'user.confirm_email.heading' %></h1>
 
-<p><%= t 'user.confirm email. press confirm button' %></p>
+<p><%= t 'user.confirm_email. press confirm button' %></p>
 
 <form method="post">
 <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
-<input type="submit" name="confirm_action" value="<%= t 'user.confirm email.button' %>">
+<input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">
 </form>

diff --git a/config/locales/de.yml b/config/locales/de.yml
index ae3d09591fa62d8475bbef2a517287aa67484764..7ddbb8ede7b0b7db12824402c64d6d6ea9ffb154 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -599,7 +599,7 @@ de:
       heading: Bestätige das Benutzerkonto
       press confirm button: "Benutzerkonto aktivieren, indem du auf den Bestätigungsbutton klickst."
       button: Bestätigen
-    confirm email:
+    confirm_email:
       heading: Bestätige die Änderung der E-Mail-Adresse
       press confirm button: "Neue E-Mail-Adresse bestätigen, indem du auf den Bestätigungsbutton klickst."
       button: Bestätigen

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 974449171d550e70d0d461cbd755cbe4c742a903..0cabeaec0385d7b24128e85ab53db14f184b6e9b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -603,7 +603,7 @@ en:
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."
-    confirm email:
+    confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3085d510b537ff22133ea09f3ddcecc34b37c1c8..8a5c36c873b6a7fc88d7b7cb5e9375583575fc76 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -253,7 +253,7 @@ fr:
       heading: "Confirmer un compte utilisateur"
       press confirm button: "Appuyer le bouton confirmer ci-dessous pour activer votre compte."
       button: "Confirmer"
-    confirm email:
+    confirm_email:
       heading: "Confirmer le changement de votre adresse e-mail"
       press confirm button: "Appuyer sur le bouton confirmer pour confirmer votre nouvelle adresse e-mail."
       button: "Confirmer"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 3c480eec21aff282a8d0c11a6f7c8ac3b1c4f8f0..f3858dfe40658926264c138bd95cb222c47fb0b1 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -601,7 +601,7 @@ is:
       button: "Staðfesta"
       success: "Notandinn þinn hefur verið staðfestur."
       failure: "Notandi hefur þegar verið staðfestur með þessum lykli."
-    confirm email:
+    confirm_email:
       heading: "Staðfesta breytingu á tölvupóstfangi"
       press confirm button: "Hér getur þú staðfest breytingu á tölvupóstfangi."
       button: "Staðfesta"

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 8e4e631da44bad65515ed877a87a078f4052bab0..e53c1032d8b93c026f3f17eb2d30784e30c6713e 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -599,7 +599,7 @@ sl:
       heading: Potrdite uporabniški račun
       press confirm button: "Za aktivacijo vašega uporabniškega računa pritisnite na gumb Potrdi spodaj."
       button: Potrdi
-    confirm email:
+    confirm_email:
       heading: Potrdite spremembo naslova e-pošte
       press confirm button: "Za potrditev spremembe vašega naslova elektronske pošte pritisnite na gumb Potrdi spodaj."
       button: Potrdi