Merge pull request #1 from foodcoop-adam/extended-i18n

cleanup of profile layout + set session on login

app/controllers/sessions_controller.rb

@@ -12,6 +12,7 @@ class SessionsController < ApplicationController
       session[:locale] = user.locale
       session[:user_id] = user.id
       session[:scope] = FoodsoftConfig.scope  # Save scope in session to not allow switching between foodcoops with one account
+      session[:locale] = user_settings_language
       if session[:return_to].present?
         redirect_to_url = session[:return_to]
         session[:return_to] = nil

app/views/shared/_user_form_fields.html.haml

@@ -6,35 +6,28 @@
 = f.input :password, :required => f.object.new_record?
 = f.input :password_confirmation
 
-.settings
-  %h4
-    =t 'simple_form.labels.settings.settings_groups'
-    = f.simple_fields_for :settings_attributes do |s|
-    
-      .settings-group
-        %div{class: 'control-group h_wrapper'}
-          %h5{class: 'control-label'}
-            = t 'simple_form.labels.settings.settings_group.profile'
-          
+= f.simple_fields_for :settings_attributes do |s|
   = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|
     = profile.input 'language', as: :select,  collection: available_locales, required: false, selected: f.object.settings.profile['language']
+  
+  .settings
+    .settings-group
+      = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|
+
+        %div{class: 'control-group h_wrapper'}
+          %h5{class: 'controls'}
+            = t 'simple_form.labels.settings.settings_group.privacy'
         = profile.input 'phone_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['phone_is_public'] }
         = profile.input 'email_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['email_is_public'] }
         = profile.input 'name_is_public',   as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
   
     .settings-group
       %div{class: 'control-group'}
-          %h5{class: 'control-label'}
-            =t 'simple_form.labels.settings.settings_group.messages'
+        %h5{class: 'controls'}
+          = t 'simple_form.labels.settings.settings_group.messages'
         
       = s.simple_fields_for :messages, defaults: { inline_label: true, label: false } do |messages|
         = messages.input 'send_as_email',   as: :boolean, input_html: { checked: f.object.settings.messages['send_as_email'] }
-          
-      .settings-group
-        %div{class: 'control-group'}
-          %h5{class: 'control-label'}
-            = t 'simple_form.labels.settings.settings_group.notify'
-          
       = s.simple_fields_for :notify, defaults: { inline_label: true, label: false } do |notify|
         = notify.input 'order_finished',    as: :boolean, input_html: { checked: f.object.settings.notify['order_finished'] }
         = notify.input 'negative_balance',  as: :boolean, input_html: { checked: f.object.settings.notify['negative_balance'] }

config/locales/de.yml

@@ -1621,10 +1621,8 @@ de:
           one: Arbeitsgruppe
           other: Arbeitsgruppen
       settings:
-        settings_groups: Einstellungen
         settings_group:
-          profile: Porfil
-          notify: Benachrichtigungen
+          privacy:
           messages: Nachrichten
         profile:
           language: Sprache

config/locales/en.yml

@@ -1624,10 +1624,8 @@ en:
           one: Workgroup
           other: Workgroups
       settings:
-        settings_groups: Preferences
         settings_group:
-          profile: Porfile
-          notify: Notifications
+          privacy: Privacy
           messages: Messages
         profile:
           language: Language