Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarah Mei & Tim Frazer <pair+sarah+tim@joindiaspora.com>2011-11-15 05:02:13 +0400
committerSarah Mei & Tim Frazer <pair+sarah+tim@joindiaspora.com>2011-11-15 05:02:13 +0400
commite38cb41f855f8f59ea3cbaf3cfc6f5df6bf26409 (patch)
treef6bb4e63997e6acdb357fd79537caa747f056168 /config/locales/devise
parentebad0f5ec373c55565f827456ab763948994f9e6 (diff)
Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button.
Get rid of 500 error on the "view this invitation in your browser" link
Diffstat (limited to 'config/locales/devise')
-rw-r--r--config/locales/devise/devise.en.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 77abe5e1a..cb69e049c 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -52,7 +52,7 @@ en:
resend_unlock: "Resend unlock instructions"
invitations:
send_instructions: 'Your invitation has been sent.'
- invitation_token_invalid: 'The invitation token provided is not valid!'
+ invitation_token_invalid: 'Our apologies! That invitation token is not valid.'
updated: 'Your password was set successfully. You are now signed in.'
mailer:
welcome: "Welcome %{email}!"
@@ -73,8 +73,8 @@ en:
click_to_unlock: "Click the link below to unlock your account:"
unlock: "Unlock my account"
invitation_instructions:
- displaying_correctly: "Email not displaying correctly? %{link} in your browser"
- view_in: "View in"
+ displaying_correctly: "Email not displaying correctly? %{link}"
+ view_in: "View it in your browser."
finally: "Finally - it's here"
arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
sign_up_now: "Sign up now &rarr;"