From 81e6a3567ae8164d51c3efd81d69dbdbd836db59 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 10 May 2013 09:58:15 +0200 Subject: [PATCH] Default language for new users now respects LANGUAGE_CODE. fixes #385 --- modoboa/userprefs/app_settings.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modoboa/userprefs/app_settings.py b/modoboa/userprefs/app_settings.py index 0d7c68075..e48791581 100644 --- a/modoboa/userprefs/app_settings.py +++ b/modoboa/userprefs/app_settings.py @@ -1,14 +1,21 @@ # coding: utf-8 from django import forms from django.utils.translation import ugettext_lazy +from django.conf import settings from modoboa.lib.parameters import UserParametersForm +def translate_language_code(value): + if "-" in value: + return value.split("-")[0] + return value + + class UserSettings(UserParametersForm): app = "general" lang = forms.ChoiceField( - initial="en", + initial=translate_language_code(settings.LANGUAGE_CODE), label=ugettext_lazy("Prefered language"), choices=[("de", "deutsch"), ("en", "english"), ("es", "español"), ("fr", "français"),