matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #39, Fix common model messages capitalization

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-08 10:22:16 -04:00
parent bd63d19899
commit 3990900433
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mayan/apps/common/models.py
View File

@@ -17,14 +17,13 @@ class AnonymousUserSingleton(SingletonModel):
return ugettext('Anonymous user')
class Meta:
verbose_name = _(u'anonymous user')
verbose_name_plural = _(u'anonymous user')
verbose_name = verbose_name_plural = _(u'Anonymous user')
class AutoAdminSingleton(SingletonModel):
account = models.ForeignKey(User, null=True, blank=True, related_name='auto_admin_account', verbose_name=_(u'account'))
password = models.CharField(null=True, blank=True, verbose_name=_(u'password'), max_length=128)
password_hash = models.CharField(null=True, blank=True, verbose_name=_(u'password hash'), max_length=128)
account = models.ForeignKey(User, null=True, blank=True, related_name='auto_admin_account', verbose_name=_(u'Account'))
password = models.CharField(null=True, blank=True, verbose_name=_(u'Password'), max_length=128)
password_hash = models.CharField(null=True, blank=True, verbose_name=_(u'Password hash'), max_length=128)
class Meta:
verbose_name = verbose_name_plural = _(u'auto admin properties')
verbose_name = verbose_name_plural = _(u'Auto admin properties')

6
mayan/apps/common/views.py
View File

@@ -19,8 +19,8 @@ from django.views.generic.list import ListView
from acls.models import AccessEntry
from permissions.models import Permission
from .forms import (ChoiceForm, UserForm, UserForm_view, LicenseForm,
EmailAuthenticationForm)
from .forms import (ChoiceForm, EmailAuthenticationForm, LicenseForm,
UserForm, UserForm_view)
from .settings import LOGIN_METHOD
@@ -200,7 +200,7 @@ def current_user_edit(request):
'main/generic_form.html', {
'form': form,
'next': next,
'title': _(u'edit current user details'),
'title': _(u'Edit current user details'),
},
context_instance=RequestContext(request))