Download as
Browse Code »

Commit dab8f0640fb2d491792d34c9bdad0b1415cc6c33

Authored by Sergio Oliveira
1 parent 7ce6d5d1
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixing admin translations

Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
src/accounts/admin.py
  Diff comments   View file @dab8f06
... ... @@ -2,6 +2,7 @@
2 2 from django import forms
3 3 from django.contrib import admin
4 4 from django.contrib.auth.admin import UserAdmin
  5 +from django.utils.translation import ugettext_lazy as _
5 6  
6 7 from .models import User
7 8  
... ... @@ -9,7 +10,7 @@ from .models import User
9 10 class UserCreationForm(forms.ModelForm):
10 11 class Meta:
11 12 model = User
12   - fields = ('username', 'email')
  13 + fields = ('username', 'email')
13 14  
14 15 def __init__(self, *args, **kwargs):
15 16 super(UserCreationForm, self).__init__(*args, **kwargs)
... ... @@ -22,7 +23,7 @@ class UserChangeForm(forms.ModelForm):
22 23 fields = ('username', 'first_name', 'last_name', 'email', 'is_active',
23 24 'is_staff', 'is_superuser', 'groups', 'last_login',
24 25 'date_joined', 'twitter', 'facebook', 'google_talk',
25   - 'webpage')
  26 + 'webpage')
26 27  
27 28 def __init__(self, *args, **kwargs):
28 29 super(UserChangeForm, self).__init__(*args, **kwargs)
... ... @@ -35,12 +36,13 @@ class MyUserAdmin(UserAdmin):
35 36 add_form = UserCreationForm
36 37  
37 38 fieldsets = (
38   - (None, {'fields': ('username',)}),
39   - ('Personal info', {'fields': ('first_name', 'last_name', 'email',
40   - 'twitter', 'facebook', 'google_talk',
41   - 'webpage')}),
42   - ('Permissions', {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}),
43   - ('Important Dates', {'fields': ('last_login', 'date_joined')})
  39 + (None, {'fields': ('username', 'email')}),
  40 + (_('Personal info'), {'fields': ('first_name', 'last_name', 'twitter',
  41 + 'facebook', 'google_talk', 'webpage',
  42 + )}),
  43 + (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
  44 + 'groups')}),
  45 + (_('Important dates'), {'fields': ('last_login', 'date_joined')})
44 46 )
45 47  
46 48 add_fieldsets = (
... ...