# HG changeset patch # User verrierj # Date 1315904536 -7200 # Node ID d5d2439e2503863d6ddd951e4a2fa7ce2b65f317 # Parent 43748b6b0678049909ab46397f3ca3d696262754 Profile migration + translations diff -r 43748b6b0678 -r d5d2439e2503 src/ldt/ldt/locale/en/LC_MESSAGES/django.mo Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed diff -r 43748b6b0678 -r d5d2439e2503 src/ldt/ldt/locale/en/LC_MESSAGES/django.po --- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Fri Sep 09 11:40:09 2011 +0200 +++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Sep 13 11:02:16 2011 +0200 @@ -945,7 +945,7 @@ #: .\user\templates\ldt\user\change_profile.html.py:52 msgid "Name" -msgstr "name" +msgstr "Name" #: .\user\templates\ldt\user\change_profile.html.py:60 msgid "Email" diff -r 43748b6b0678 -r d5d2439e2503 src/ldt/ldt/user/migrations/0003_auto__add_userprofile.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/user/migrations/0003_auto__add_userprofile.py Tue Sep 13 11:02:16 2011 +0200 @@ -0,0 +1,76 @@ +#@PydevCodeAnalysisIgnore +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'UserProfile' + db.create_table('user_userprofile', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)), + ('language', self.gf('django.db.models.fields.CharField')(default='fr', max_length=2)), + )) + db.send_create_signal('user', ['UserProfile']) + + + def backwards(self, orm): + + # Deleting model 'UserProfile' + db.delete_table('user_userprofile') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'user.ldt': { + 'Meta': {'object_name': 'Ldt', '_ormbases': ['auth.User']}, + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'user.userprofile': { + 'Meta': {'object_name': 'UserProfile'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "'fr'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) + } + } + + complete_apps = ['user'] diff -r 43748b6b0678 -r d5d2439e2503 src/ldt/ldt/user/models.py --- a/src/ldt/ldt/user/models.py Fri Sep 09 11:40:09 2011 +0200 +++ b/src/ldt/ldt/user/models.py Tue Sep 13 11:02:16 2011 +0200 @@ -1,4 +1,5 @@ from django.contrib import admin +from django.conf import settings from django.db import models from django.contrib.auth.models import User, UserManager from django.db.models.signals import post_save @@ -30,7 +31,7 @@ class UserProfile (models.Model): user = models.OneToOneField(User) - language = models.CharField(max_length=2, default='fr') + language = models.CharField(max_length=2, default=settings.LANGUAGE_CODE[:2]) @staticmethod def create_user_profile(sender, instance, created, **kwargs): diff -r 43748b6b0678 -r d5d2439e2503 src/ldt/ldt/user/templates/ldt/user/change_profile.html --- a/src/ldt/ldt/user/templates/ldt/user/change_profile.html Fri Sep 09 11:40:09 2011 +0200 +++ b/src/ldt/ldt/user/templates/ldt/user/change_profile.html Tue Sep 13 11:02:16 2011 +0200 @@ -1,5 +1,5 @@ {% extends "ldt/user/user_base.html" %} -{# form of password change #} +{# form of profile change #} {% load i18n %} {% block css_import %}