Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add notification language option in the user profile and tests

Roland Geider5cd7a2139529
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index c20ba0007..78979d1eb 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -22,6 +22,7 @@ from django.template.defaultfilters import slugify # django.utils.text.slugify
from django.contrib.auth.models import User
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
+from django.utils import translation
from django.core.urlresolvers import reverse
from django.core import mail
from django.core.cache import cache
@@ -53,6 +54,12 @@ class Language(models.Model):
full_name = models.CharField(max_length=30,
verbose_name=_('Language full name'))
+ class Meta:
+ '''
+ Set Meta options
+ '''
+ ordering = ["full_name", ]
+
#
# Django methods
#
@@ -316,6 +323,7 @@ class Exercise(models.Model):
except User.DoesNotExist:
return
if self.user and user.email:
+ translation.activate(user.userprofile.notification_language.short_name)
url = request.build_absolute_uri(self.get_absolute_url())
subject = _('Exercise was successfully added to the general database')
message = (ugettext("Your exercise '{0}' was successfully added to the general"
diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.json
index bd9ed9fca..223de1e9e 100644
--- a/wger/manager/fixtures/test-user-data.json
+++ b/wger/manager/fixtures/test-user-data.json
@@ -253,7 +253,8 @@
"freetime_hours": 8,
"workout_reminder_active": false,
"workout_reminder": 20,
- "workout_duration": 8
+ "workout_duration": 8,
+ "notification_language": 1
}
},
{
@@ -277,7 +278,8 @@
"freetime_hours": 8,
"workout_reminder_active": true,
"workout_reminder": 14,
- "workout_duration": 12
+ "workout_duration": 12,
+ "notification_language": 2
}
},
{
@@ -301,7 +303,8 @@
"freetime_hours": 8,
"workout_reminder_active": true,
"workout_reminder": 10,
- "workout_duration": 15
+ "workout_duration": 15,
+ "notification_language": 2
}
}
]
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index cfffc40a6..2d9dcb5cf 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -54,7 +54,8 @@ class UserPreferencesForm(ModelForm):
'show_english_ingredients',
'workout_reminder_active',
'workout_reminder',
- 'workout_duration')
+ 'workout_duration',
+ 'notification_language')
class UserEmailForm(ModelForm):
diff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.py
index cdc3c7a1c..9b89f5a65 100644
--- a/wger/manager/management/commands/email-reminders.py
+++ b/wger/manager/management/commands/email-reminders.py
@@ -96,7 +96,7 @@ class Command(BaseCommand):
:type days int
'''
- translation.activate('en')
+ translation.activate(user.userprofile.notification_language.short_name)
site = Site.objects.get(pk=settings.SITE_ID)
workout_link = 'http://{0}{1}'.format(site.domain, workout.get_absolute_url())
add_workout_link = 'http://{0}{1}'.format(site.domain, reverse('workout-add'))
diff --git a/wger/manager/migrations/0009_auto__add_field_userprofile_notification_language.py b/wger/manager/migrations/0009_auto__add_field_userprofile_notification_language.py
new file mode 100644
index 000000000..d971defa1
--- /dev/null
+++ b/wger/manager/migrations/0009_auto__add_field_userprofile_notification_language.py
@@ -0,0 +1,183 @@
+# -*- coding: 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 field 'UserProfile.notification_language'
+ db.add_column(u'manager_userprofile', 'notification_language',
+ self.gf('django.db.models.fields.related.ForeignKey')(default=2, to=orm['exercises.Language']),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'UserProfile.notification_language'
+ db.delete_column(u'manager_userprofile', 'notification_language_id')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'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'}),
+ u'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'})
+ },
+ u'exercises.equipment': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'exercises.exercise': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Language']"}),
+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Muscle']", 'symmetrical': 'False'}),
+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),
+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.exercisecategory': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'exercises.language': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'exercises.muscle': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'manager.day': {
+ 'Meta': {'object_name': 'Day'},
+ 'day': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['manager.DaysOfWeek']", 'symmetrical': 'False'}),
+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'training': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})
+ },
+ u'manager.daysofweek': {
+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},
+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'manager.schedule': {
+ 'Meta': {'object_name': 'Schedule'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_loop': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'start_date': ('wger.utils.fields.Html5DateField', [], {'default': 'datetime.date.today'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+ },
+ u'manager.schedulestep': {
+ 'Meta': {'ordering': "['order']", 'object_name': 'ScheduleStep'},
+ 'duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '4', 'max_length': '1'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '1'}),
+ 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Schedule']"}),
+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})
+ },
+ u'manager.set': {
+ 'Meta': {'ordering': "['order']", 'object_name': 'Set'},
+ 'exerciseday': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Day']"}),
+ 'exercises': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Exercise']", 'symmetrical': 'False'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
+ 'sets': ('wger.utils.fields.Html5IntegerField', [], {'default': '4'})
+ },
+ u'manager.setting': {
+ 'Meta': {'ordering': "['order', 'id']", 'object_name': 'Setting'},
+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'blank': 'True'}),
+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),
+ 'set': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Set']"})
+ },
+ u'manager.userprofile': {
+ 'Meta': {'object_name': 'UserProfile'},
+ 'age': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),
+ 'calories': ('wger.utils.fields.Html5IntegerField', [], {'default': '2500', 'null': 'True'}),
+ 'freetime_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),
+ 'freetime_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'gender': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'height': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'notification_language': ('django.db.models.fields.related.ForeignKey', [], {'default': '2', 'to': u"orm['exercises.Language']"}),
+ 'show_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'show_english_ingredients': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'sleep_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '7', 'null': 'True'}),
+ 'sport_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '3', 'null': 'True'}),
+ 'sport_intensity': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1', 'null': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),
+ 'work_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),
+ 'work_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'workout_duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '12'}),
+ 'workout_reminder': ('wger.utils.fields.Html5IntegerField', [], {'default': '14'}),
+ 'workout_reminder_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ u'manager.workout': {
+ 'Meta': {'ordering': "['-creation_date']", 'object_name': 'Workout'},
+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+ },
+ u'manager.workoutlog': {
+ 'Meta': {'ordering': "['date', 'reps']", 'object_name': 'WorkoutLog'},
+ 'date': ('wger.utils.fields.Html5DateField', [], {}),
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+ 'weight': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})
+ }
+ }
+
+ complete_apps = ['manager']
\ No newline at end of file
diff --git a/wger/manager/models.py b/wger/manager/models.py
index c1e87162d..74330cc77 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -33,6 +33,7 @@ from django.core.cache import cache
from django.core.validators import MinValueValidator
from wger.exercises.models import Exercise
+from wger.exercises.models import Language
from wger.utils.helpers import DecimalJsonEncoder
from wger.utils.helpers import disable_for_loaddata
@@ -617,6 +618,14 @@ by the US Department of Agriculture. It is extremely complete, with around
'reminders.'),
default=12)
+ notification_language = models.ForeignKey(Language,
+ verbose_name=_('Notification language'),
+ help_text=_('Language to use when sending you email '
+ 'notifications, e.g. email reminders for '
+ 'workouts. This does not affect the '
+ 'language used on the website.'),
+ default=2)
+
#
# User statistics
#
diff --git a/wger/manager/templates/user/preferences.html b/wger/manager/templates/user/preferences.html
index a5544e321..a3f478ce0 100644
--- a/wger/manager/templates/user/preferences.html
+++ b/wger/manager/templates/user/preferences.html
@@ -15,7 +15,11 @@
{{ form.non_field_errors }}
<table>
{% for field in form %}
- {% yaml_form_field field %}
+ {% if field.name in select_lists %}
+ {% yaml_form_field field "ym-fbox-select" %}
+ {% else %}
+ {% yaml_form_field field %}
+ {% endif %}
{% endfor %}
</table>
diff --git a/wger/manager/tests/test_email_reminder.py b/wger/manager/tests/test_email_reminder.py
index eb6360299..afb8dd1e2 100644
--- a/wger/manager/tests/test_email_reminder.py
+++ b/wger/manager/tests/test_email_reminder.py
@@ -30,7 +30,7 @@ class EmailReminderTestCase(WorkoutManagerTestCase):
User 2 has setting in profile active
'''
- def atest_reminder_no_workouts(self):
+ def test_reminder_no_workouts(self):
'''
Test with no schedules or workouts
'''
@@ -40,7 +40,7 @@ class EmailReminderTestCase(WorkoutManagerTestCase):
call_command('email-reminders')
self.assertEqual(len(mail.outbox), 0)
- def atest_reminder_one_workout(self):
+ def test_reminder_one_workout(self):
'''
Test user with no schedules but one workout
@@ -53,7 +53,7 @@ class EmailReminderTestCase(WorkoutManagerTestCase):
call_command('email-reminders')
self.assertEqual(len(mail.outbox), 1)
- def atest_reminder_setting_off(self):
+ def test_reminder_setting_off(self):
'''
Test user with no schedules, one workout but setting in profile off
'''
@@ -67,7 +67,7 @@ class EmailReminderTestCase(WorkoutManagerTestCase):
call_command('email-reminders')
self.assertEqual(len(mail.outbox), 0)
- def atest_reminder_empty_schedule(self):
+ def test_reminder_empty_schedule(self):
'''
Test user with emtpy schedules and no workouts
'''
@@ -88,7 +88,7 @@ class EmailReminderTestCase(WorkoutManagerTestCase):
call_command('email-reminders')
self.assertEqual(len(mail.outbox), 0)
- def atest_reminder_schedule(self):
+ def test_reminder_schedule(self):
'''
Test user with a schedule and a workout
'''
diff --git a/wger/manager/tests/test_preferences.py b/wger/manager/tests/test_preferences.py
index e7edd7ce6..298da31b8 100644
--- a/wger/manager/tests/test_preferences.py
+++ b/wger/manager/tests/test_preferences.py
@@ -19,7 +19,9 @@ import decimal
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
+from wger.exercises.models import Language
from wger.weight.models import WeightEntry
+from wger.manager.models import UserProfile
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import ApiBaseResourceTestCase
@@ -31,14 +33,15 @@ class PreferencesTestCase(WorkoutManagerTestCase):
Tests the preferences page
'''
- def preferences(self):
+ def test_preferences(self):
'''
Helper function to test the preferences page
'''
- # Fetch the preferences page
+ self.user_login('test')
response = self.client.get(reverse('preferences'))
- profile = response.context['user'].userprofile
+
+ profile = User.objects.get(username='test').userprofile
self.assertFalse(profile.show_comments)
self.assertEqual(response.status_code, 200)
@@ -46,22 +49,32 @@ class PreferencesTestCase(WorkoutManagerTestCase):
# Change some preferences
response = self.client.post(reverse('preferences'),
- {'show_comments': 'on',
- 'show_english_ingredients': 'on',
- 'email': '[email protected]'})
+ {'show_comments': True,
+ 'show_english_ingredients': True,
+ 'email': '[email protected]',
+ 'workout_reminder_active': True,
+ 'workout_reminder': '30',
+ 'workout_duration': 12,
+ 'notification_language': 2})
- #print response
self.assertEqual(response.status_code, 302)
response = self.client.get(reverse('preferences'))
- profile = response.context['user'].userprofile
- #self.assertTrue(profile.show_comments)
+ profile = User.objects.get(username='test').userprofile
self.assertTrue(profile.show_english_ingredients)
- self.assertEqual(response.context['user'].email, '[email protected]')
+ self.assertTrue(profile.workout_reminder_active)
+ self.assertEqual(profile.workout_reminder, 30)
+ self.assertEqual(profile.workout_duration, 12)
+ self.assertEqual(User.objects.get(username='test').email, '[email protected]')
# Change some preferences
response = self.client.post(reverse('preferences'),
- {'show_english_ingredients': 'on',
- 'email': ''})
+ {'show_comments': False,
+ 'show_english_ingredients': True,
+ 'email': '',
+ 'workout_reminder_active': True,
+ 'workout_reminder': 22,
+ 'workout_duration': 10,
+ 'notification_language': 2})
self.assertEqual(response.status_code, 302)
response = self.client.get(reverse('preferences'))
@@ -70,14 +83,6 @@ class PreferencesTestCase(WorkoutManagerTestCase):
self.assertTrue(profile.show_english_ingredients)
self.assertEqual(response.context['user'].email, '')
- def test_preferences_logged_in(self):
- '''
- Tests the preferences page as a logged in user
- '''
-
- self.user_login('test')
- self.preferences()
-
class AjaxPreferencesTestCase(WorkoutManagerTestCase):
'''
diff --git a/wger/manager/tests/test_temporary_users.py b/wger/manager/tests/test_temporary_users.py
index e7016d28d..133cb105b 100644
--- a/wger/manager/tests/test_temporary_users.py
+++ b/wger/manager/tests/test_temporary_users.py
@@ -39,7 +39,8 @@ class DemoUserTestCase(WorkoutManagerTestCase):
Tests the demo user
'''
- def count_temp_users(self):
+ @staticmethod
+ def count_temp_users():
'''
Counts the number of temporary users
'''
diff --git a/wger/manager/views/user.py b/wger/manager/views/user.py
index 68067e4cc..529a7fc5c 100644
--- a/wger/manager/views/user.py
+++ b/wger/manager/views/user.py
@@ -23,6 +23,7 @@ from django.http import HttpResponseRedirect
from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
+from django.utils import translation
from django.contrib.auth import authenticate
from django.contrib.auth import login as django_login
@@ -34,6 +35,7 @@ from django.contrib import messages
from tastypie.models import ApiKey
+from wger.exercises.models import Language
from wger.manager.forms import UserPreferencesForm
from wger.manager.forms import UserEmailForm
from wger.manager.forms import RegistrationForm
@@ -85,6 +87,12 @@ def registration(request):
email,
password)
user.save()
+
+ # Save the notification language
+ language = Language.objects.get(short_name=translation.get_language())
+ user.userprofile.notification_language = language
+ user.userprofile.save()
+
user = authenticate(username=username, password=password)
django_login(request, user)
messages.success(request, _('You were successfully registered'))
@@ -134,7 +142,7 @@ def preferences(request):
# has that email
if request.method == 'POST' and request.POST["email"] != request.user.email:
email_form = UserEmailForm(data=request.POST, instance=request.user)
- if email_form.is_valid():
+ if email_form.is_valid() and redirect:
request.user.email = email_form.cleaned_data['email']
request.user.save()
redirect = True
@@ -143,6 +151,7 @@ def preferences(request):
template_data['form'] = form
template_data['email_form'] = email_form
+ template_data['select_lists'] = ('notification_language',)
if redirect:
messages.success(request, _('Settings successfully updated'))
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 73a0d9c02..e28aeeaf5 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -28,6 +28,7 @@ from django.core.cache import cache
from django.contrib.auth.models import User
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
+from django.utils import translation
from wger.exercises.models import Language
from wger.utils.constants import EMAIL_FROM
@@ -342,6 +343,7 @@ class Ingredient(models.Model):
submitted ingredients only)
'''
if self.user and self.user.email:
+ translation.activate(self.user.userprofile.notification_language.short_name)
url = request.build_absolute_uri(self.get_absolute_url())
subject = _('Ingredient was successfully added to the general database')
message = (ugettext("Your ingredient '{0}' was successfully added to the general "