summaryrefslogtreecommitdiff
path: root/users/config
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-06-17 01:27:55 -0700
committerelijah <elijah@riseup.net>2013-07-04 04:00:47 -0700
commite58fd0550b4a29fac9d52dc8a78d04333ccc8c06 (patch)
tree6267b104a0578645aa3a2f6a88cf2211a47d3d0d /users/config
parentd00fe5bded29ad816bb70caa31414f86c69aaa53 (diff)
new ui - initial user changes
Diffstat (limited to 'users/config')
-rw-r--r--users/config/locales/en.yml17
-rw-r--r--users/config/routes.rb3
2 files changed, 14 insertions, 6 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 32d183b..3c42b55 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -1,9 +1,14 @@
en:
- none: "None."
- signup: "Sign up"
+ email_settings: "Email Settings"
+ account_settings: "Account Settings"
+ logout: "Logout"
+ none: "None"
+ signup: "Sign Up"
signup_message: "Please create an account."
cancel: "Cancel"
- login: "Login"
+ login: "Log In"
+ username: "Username"
+ password: "Password"
login_message: "Please login with your account."
invalid_user_pass: "Not a valid username/password combination"
all_strategies_failed: "Could not understand your login attempt. Please first send your login and a SRP ephemeral value A and then send the client_auth in the same session (using cookies)."
@@ -20,7 +25,7 @@ en:
user_updated_successfully: "Settings have been updated successfully."
user_created_successfully: "Successfully created your account."
email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'."
- use_ascii_key: "Use ASCII-armored PGP key"
+ use_ascii_key: "Use ASCII-armored OpenPGP key"
can_retype_old_password: "Retype your old password if you would like to keep that"
associated_email: "The associated email address is"
cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies."
@@ -28,7 +33,7 @@ en:
activemodel:
models:
- user:
+ user:
one: User
other: "%{count} Users"
simple_form:
@@ -42,4 +47,4 @@ en:
placeholders:
user:
email_forward: "my_other_email@domain.net"
-
+
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 9a9a40e..d07cda9 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -14,6 +14,9 @@ Rails.application.routes.draw do
get "signup" => "users#new", :as => "signup"
resources :users do
+ resource :overview, :only => [:show]
+ resource :email_settings, :only => [:edit, :update]
+ resource :account_settings, :only => [:edit, :update]
resources :email_aliases, :only => [:destroy], :id => /.*/
end