From dfe1cee4cd64dd76b0eef32a3b534fc2fd90b04c Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Thu, 18 Jul 2013 16:23:29 +0200
Subject: [PATCH] german i18n + mini fix

---
 app/controllers/sessions_controller.rb | 4 ++--
 config/locales/de.yml                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 06497456..7de1b9de 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -9,10 +9,10 @@ class SessionsController < ApplicationController
   def create
     user = User.authenticate(params[:nick], params[:password])
     if user
-      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
+      session[:locale] = user.locale
+
       if session[:return_to].present?
         redirect_to_url = session[:return_to]
         session[:return_to] = nil
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7990d756..5ecc1cce 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1622,7 +1622,7 @@ de:
           other: Arbeitsgruppen
       settings:
         settings_group:
-          privacy:
+          privacy: Privatsphäre
           messages: Nachrichten
         profile:
           language: Sprache