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

matches the method name.
This commit is contained in:
Tom Hughes 2009-06-03 07:42:40 +00:00
parent 9a051df2d2
commit 11f457e842
7 changed files with 10 additions and 10 deletions

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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"

View file

@ -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