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.

11 files changed, 64 insertions, 76 deletions

diff --git a/app/views/common/_action_buttons.html.haml b/app/views/common/_action_buttons.html.haml
index c74fcd1..d00cf74 100644
--- a/app/views/common/_action_buttons.html.haml
+++ b/app/views/common/_action_buttons.html.haml
@@ -2,10 +2,10 @@
   .row-fluid.second
     .login.span4
       %span.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn')
-      %span.info= t(:login_info)
+      %span.info= t(:login_info, default: "")
     .signup.span4
       %span.link= link_to(icon('user', icon_color) + t(:signup), signup_path, :class => 'btn')
-      %span.info= t(:signup_info)
+      %span.info= t(:signup_info, default: "")
     .help.span4
-      %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), new_ticket_path, :class => 'btn')
-      %span.info= t(:help_info)
+      %span.link= link_to(icon('question-sign', icon_color) + t(:support_tickets), new_ticket_path, :class => 'btn')
+      %span.info= t(:support_info, default: "")
diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml
index e57c56b..d6d7bde 100644
--- a/app/views/common/_download_button.html.haml
+++ b/app/views/common/_download_button.html.haml
@@ -4,5 +4,5 @@
     .download.span8
       = link_to client_download_url, class: "btn btn-large btn-primary" do
         = big_icon('download')
-        = t(:download_client)
+        = t(:download_bitmask)
     .span2
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml
new file mode 100644
index 0000000..e38fdc8
--- /dev/null
+++ b/app/views/users/_overview.html.haml
@@ -0,0 +1,24 @@
+.overview
+
+  %h2.first= t(".welcome", username: @user.login, cascade: true)
+
+  - if admin?
+    %p
+      = t(:created)
+      = @user.created_at
+      %br
+      = t(:updated)
+      = @user.updated_at
+      %br
+      = t(:enabled)
+      = @user.enabled?
+
+  %p= t(:overview_intro, default: "")
+
+  %ul.unstyled
+    %li= icon('user') + link_to(t(".account"), edit_user_path(@user))
+    - # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly}
+    %li= icon('question-sign') + link_to(t(".tickets"), user_tickets_path(@user))
+    %li= icon('shopping-cart') + link_to(t(".billing"), billing_top_link(@user)) if APP_CONFIG[:billing]
+
+
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
index bc36068..41a9d55 100644
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -17,5 +17,5 @@
     = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
     = f.input :password,              :required => false, :validate => true, :input_html => { :id => :srp_password }
     = f.input :password_confirmation, :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
-    = f.button :wrapped, value: t(:signup), cancel: home_path
+    = f.button :wrapped, cancel: home_path
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ddc33ab..6760099 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,30 +1,7 @@
-.overview
-
-  %h2.first= t(:overview_welcome, :username => @user.login)
-
-  - if admin?
-    %p
-      = t(:created)
-      = @user.created_at
-      %br
-      = t(:updated)
-      = @user.updated_at
-      %br
-      = t(:enabled)
-      = @user.enabled?
-
-  %p= t(:overview_intro)
-
-  %ul.unstyled
-    %li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
-    - # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly}
-    %li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user))
-    %li= icon('shopping-cart') + link_to(t(:overview_billing), billing_top_link(@user)) if APP_CONFIG[:billing]
-
-
-  .container-fluid
-    .row-fluid
-      %h4 To use bitmask services:
-      = link_to client_download_url, class: "btn btn-primary" do
-        %i.icon-arrow-down.icon-white
-        = t(:download_client)
+= render 'overview'
+.container-fluid
+  .row-fluid
+    %h4 To use bitmask services:
+    = link_to client_download_url, class: "btn btn-primary" do
+      %i.icon-arrow-down.icon-white
+      = t(:download_bitmask)
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
diff --git a/engines/support/config/locales/en.yml b/engines/support/config/locales/en.yml
index f2caecc..8d2af67 100644
--- a/engines/support/config/locales/en.yml
+++ b/engines/support/config/locales/en.yml
@@ -1,4 +1,5 @@
 en:
+  support_tickets: "Support"
   # translations used in the layout views or @title
   layouts:
     # fallback for all translations of "tickets" nested below: