Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity

german i18n + mini fix

This commit is contained in:
Manuel Wiedenmann 2013-07-18 16:23:29 +02:00
parent 0401572580
commit dfe1cee4cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/sessions_controller.rb
View File

@ -9,10 +9,10 @@ class SessionsController < ApplicationController
def create def create
user = User.authenticate(params[:nick], params[:password]) user = User.authenticate(params[:nick], params[:password])
if user if user
session[:locale] = user.locale
session[:user_id] = user.id session[:user_id] = user.id
session[:scope] = FoodsoftConfig.scope # Save scope in session to not allow switching between foodcoops with one account 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? if session[:return_to].present?
redirect_to_url = session[:return_to] redirect_to_url = session[:return_to]
session[:return_to] = nil session[:return_to] = nil

2
config/locales/de.yml
View File

@ -1622,7 +1622,7 @@ de:
other: Arbeitsgruppen other: Arbeitsgruppen
settings: settings:
settings_group: settings_group:
privacy: privacy: Privatsphäre
messages: Nachrichten messages: Nachrichten
profile: profile:
language: Sprache language: Sprache