diff options
author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-19 21:44:00 +0400 |
---|---|---|
committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-19 21:44:00 +0400 |
commit | 9797e0495714fbb12a43928e8f7292cb9a373e50 (patch) | |
tree | 95632e0fac659ec10c95d3560089203156c9a1f8 /config | |
parent | 9789d1d6cb2c44589670bde8a084d060db0d4fa8 (diff) | |
parent | 0af9aa7716be72e3e83b6f65fcfebab5bb6a8e86 (diff) |
Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
Conflicts:
app/controllers/users_controller.rb
config/locales/diaspora/en.yml
db/schema.rb
spec/controllers/users_controller_spec.rb
spec/mailers/notifier_spec.rb
Diffstat (limited to 'config')
-rw-r--r-- | config/locales/diaspora/en.yml | 11 | ||||
-rw-r--r-- | config/routes.rb | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index cf1a843d4..b08d09126 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -420,7 +420,9 @@ en: liked: liked: "%{name} just liked your post" view_post: "View post >" - + confirm_email: + subject: "Please activate your new e-mail address %{unconfirmed_email}" + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" people: zero: "no people" one: "1 person" @@ -723,6 +725,7 @@ en: close_account: "Close Account" change_language: "Change Language" change_password: "Change Password" + change_email: "Change E-Mail" new_password: "New Password" current_password: "Current password" download_xml: "download my xml" @@ -738,6 +741,7 @@ en: private_message: "...you receive a private message?" liked: "...someone likes your post?" change: "Change" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." destroy: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." getting_started: welcome: "Welcome to Diaspora!" @@ -761,8 +765,13 @@ en: language_changed: "Language Changed" language_not_changed: "Language Change Failed" email_notifications_changed: "Email notifications changed" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" public: does_not_exist: "User %{username} does not exist!" + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" diff --git a/config/routes.rb b/config/routes.rb index bca90dd5c..9b792f21e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -68,6 +68,7 @@ Diaspora::Application.routes.draw do get 'public/:username' => :public, :as => 'users_public' match 'getting_started' => :getting_started, :as => 'getting_started' get 'getting_started_completed' => :getting_started_completed + get 'confirm_email/:token' => :confirm_email, :as => 'confirm_email' end # This is a hack to overide a route created by devise. |