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/en.yml | 33 +-------------------------------- config/locales/footer.en.yml | 7 +++++++ config/locales/generic.en.yml | 4 ++++ config/locales/home.en.yml | 7 +++++++ config/locales/users.en.yml | 15 +++++++-------- 5 files changed, 26 insertions(+), 40 deletions(-) create mode 100644 config/locales/footer.en.yml create mode 100644 config/locales/generic.en.yml create mode 100644 config/locales/home.en.yml (limited to 'config/locales') diff --git a/config/locales/en.yml b/config/locales/en.yml index a7a76a8..feac53b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,17 +1,7 @@ en: - flash: - success: "%{resource} was successfully saved." - create: - success: "%{resource} was successfully created." - update: - success: "%{resource} was successfully updated." home: Home - privacy_policy: Privacy Policy - terms_of_service: Terms of Service - pricing: Pricing - about: About Us - contact: Contact + example_email: 'user@domain.org' not_found_title: Page not found. not_found_subtitle: "The page you were looking for doesn't exist." not_found_lead: "You may have mistyped the address or the page may have moved." @@ -19,8 +9,6 @@ en: server_error_subtitle: We ran into a server error. server_error_lead: The problem has been logged and we will look into it. no_such_thing: "No such %{thing}." - - thing_was_successfully_created: "%{thing} was successfully created." create_thing: "Create %{thing}" overview: "Overview" @@ -40,22 +28,3 @@ en: changes_saved: "Changes saved successfully." are_you_sure: "Are you sure? This change cannot be undone." - download_client: "Download Bitmask" - client_info: "The Bitmask application allows you to use %{provider} services." - all_downloads_info: "It is available for %{clients}." - other_downloads_info: "Bitmask is also available for %{clients}." - login_info: "Log in to change your account settings, create support tickets, and manage payments." - signup_info: "Get a user account via this website. We recommend registering via the Bitmask application instead unless you are only using Bitmask for Android." - welcome: "Welcome to %{provider}." - get_help: "Get Help" - help_info: "Can't login? Create a new support ticket anonymously." - example_email: 'user@domain.org' - os: - linux32: "Linux (32 bit)" - linux64: "Linux (64 bit)" - linux: "GNU/Linux" - windows: "Windows" - android: "Android" - osx: "Mac OS" - other: "(not available for your OS)" - diff --git a/config/locales/footer.en.yml b/config/locales/footer.en.yml new file mode 100644 index 0000000..65f8ab2 --- /dev/null +++ b/config/locales/footer.en.yml @@ -0,0 +1,7 @@ +en: + # layout/footer + privacy_policy: Privacy Policy + terms_of_service: Terms of Service + pricing: Pricing + about: About Us + contact: Contact diff --git a/config/locales/generic.en.yml b/config/locales/generic.en.yml new file mode 100644 index 0000000..dce6d93 --- /dev/null +++ b/config/locales/generic.en.yml @@ -0,0 +1,4 @@ +en: + signup: "Sign Up" + login: "Log In" + cancel: "Cancel" diff --git a/config/locales/home.en.yml b/config/locales/home.en.yml new file mode 100644 index 0000000..4fdbfc2 --- /dev/null +++ b/config/locales/home.en.yml @@ -0,0 +1,7 @@ +en: + welcome: "Welcome to %{provider}." + download_bitmask: "Download Bitmask" + + login_info: "Log in to change your account settings, create support tickets, and manage payments." + signup_info: "Get a user account via this website. We recommend registering via the Bitmask application instead unless you are only using Bitmask for Android." + support_info: "Can't login? Create a new support ticket anonymously." 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