# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1371555318 -7200
# Node ID d55bf067b61ab9feed6eaadbf4530b12715973e8
# Parent  4129164c0d1ebc7ccba823022bc7fa5c06eb6eef
correct user administration

diff -r 4129164c0d1e -r d55bf067b61a src/jocondelab/admin.py
--- a/src/jocondelab/admin.py	Tue Jun 18 10:51:50 2013 +0200
+++ b/src/jocondelab/admin.py	Tue Jun 18 13:35:18 2013 +0200
@@ -1,9 +1,20 @@
+from .models import User
+from django.conf import settings
 from django.contrib import admin
-from .models import User
+from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
+from django.contrib.auth.forms import UserChangeForm as AuthUserChangeForm 
+from django.forms.fields import ChoiceField
+from django.utils.translation import gettext_lazy as _
 
 
-class UserAdmin(admin.ModelAdmin):
-    pass
+class UserChangeForm(AuthUserChangeForm):
+    language = ChoiceField(label=_("language"), choices=[(k,_(v)) for k,v in settings.LANGUAGES], initial=settings.LANGUAGE_CODE[:2])
+    class Meta:
+        model = User
+
+class UserAdmin(AuthUserAdmin):
+    form = UserChangeForm
+    fieldsets = tuple(list(AuthUserAdmin.fieldsets) + [(_('language'), {'fields':('language',)})])
 
 
 admin.site.register(User, UserAdmin)
diff -r 4129164c0d1e -r d55bf067b61a src/jocondelab/locale/en/LC_MESSAGES/django.mo
Binary file src/jocondelab/locale/en/LC_MESSAGES/django.mo has changed
diff -r 4129164c0d1e -r d55bf067b61a src/jocondelab/locale/en/LC_MESSAGES/django.po
--- a/src/jocondelab/locale/en/LC_MESSAGES/django.po	Tue Jun 18 10:51:50 2013 +0200
+++ b/src/jocondelab/locale/en/LC_MESSAGES/django.po	Tue Jun 18 13:35:18 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-18 10:42+0200\n"
+"POT-Creation-Date: 2013-06-18 12:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin.py:11 admin.py:17
+msgid "language"
+msgstr "language"
+
 #: forms.py:30
 msgid "thesaurus"
 msgstr "thesaurus"
@@ -66,7 +70,7 @@
 
 #: settings.py:42
 msgid "English"
-msgstr "Anglais"
+msgstr "English"
 
 #: templates/jocondelab/term_edit.html:74
 msgid "id"
diff -r 4129164c0d1e -r d55bf067b61a src/jocondelab/locale/fr/LC_MESSAGES/django.mo
Binary file src/jocondelab/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 4129164c0d1e -r d55bf067b61a src/jocondelab/locale/fr/LC_MESSAGES/django.po
--- a/src/jocondelab/locale/fr/LC_MESSAGES/django.po	Tue Jun 18 10:51:50 2013 +0200
+++ b/src/jocondelab/locale/fr/LC_MESSAGES/django.po	Tue Jun 18 13:35:18 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-18 10:42+0200\n"
+"POT-Creation-Date: 2013-06-18 12:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin.py:11 admin.py:17
+msgid "language"
+msgstr "langue"
+
 #: forms.py:30
 msgid "thesaurus"
 msgstr "thésaurus"
diff -r 4129164c0d1e -r d55bf067b61a src/jocondelab/settings.py
--- a/src/jocondelab/settings.py	Tue Jun 18 10:51:50 2013 +0200
+++ b/src/jocondelab/settings.py	Tue Jun 18 13:35:18 2013 +0200
@@ -39,7 +39,6 @@
 
 LANGUAGES = ( 
     ('fr', ugettext('French')),
-    ('en', ugettext('English')),
 )
 
 
@@ -101,8 +100,9 @@
 )
 
 MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.common.CommonMiddleware',    
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',