From 4085e3fabef6427cd3f8be9b61c209bd82eaa595 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 24 May 2014 10:33:31 +0200 Subject: navigation works with empty locale selected Just in case some translation keys are not present things should still work and make sense. So translation keys should be picked in a meaningful way and scoped rather than prefixed. For example overview.account will turn into "Account" if no translation is present while "overview_account" will turn into "Overview Account". We usually want the former. --- config/locales/users.en.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'config/locales/users.en.yml') diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml index 0ca5a73..3f4fbed 100644 --- a/config/locales/users.en.yml +++ b/config/locales/users.en.yml @@ -2,9 +2,6 @@ en: account_settings: "Account Settings" logout: "Logout" none: "None" - signup: "Sign Up" - cancel: "Cancel" - login: "Log In" username: "Username" password: "Password" change_password: "Change Password" @@ -42,11 +39,13 @@ en: # # overview # - overview_welcome: "Welcome %{username}." - overview_intro: "From this user control panel, you can:" - overview_tickets: "Create and check support tickets." - overview_email: "Modify email settings." - overview_account: "Destroy your account." + users: + overview: + welcome: "Welcome %{username}." + intro: "From this user control panel, you can:" + tickets: "Create and check support tickets." + email: "Modify email settings." + account: "Destroy your account." # # rails -- cgit v1.2.3 From bbeb4b629dc38d82b3b3200706dd25b8def8892e Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 24 May 2014 13:39:10 +0200 Subject: sorting translation keys some --- config/locales/users.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/locales/users.en.yml') diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml index 3f4fbed..0375174 100644 --- a/config/locales/users.en.yml +++ b/config/locales/users.en.yml @@ -1,7 +1,7 @@ en: + overview: "Overview" + user_control_panel: "user control panel" account_settings: "Account Settings" - logout: "Logout" - none: "None" username: "Username" password: "Password" change_password: "Change Password" -- cgit v1.2.3 From 8ca32588c969ee9eca986da8cf1de92b39ce3576 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 27 May 2014 17:52:26 +0200 Subject: move users key into layouts scope so it does not conflict with users scope --- config/locales/users.en.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/locales/users.en.yml') diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml index 0375174..f0fcb3d 100644 --- a/config/locales/users.en.yml +++ b/config/locales/users.en.yml @@ -1,5 +1,6 @@ en: - overview: "Overview" + layouts: + users: "Users" user_control_panel: "user control panel" account_settings: "Account Settings" username: "Username" -- cgit v1.2.3