Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
5ff4caad
Commit
5ff4caad
authored
Jun 29, 2015
by
Andrew Chadwick
Committed by
Michal Čihař
Jun 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
English strings clarification
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
293a4eee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
weblate/accounts/forms.py
weblate/accounts/forms.py
+9
-5
No files found.
weblate/accounts/forms.py
View file @
5ff4caad
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#
#
from
django
import
forms
from
django
import
forms
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
,
pgettext
from
django.contrib.auth
import
authenticate
from
django.contrib.auth
import
authenticate
from
crispy_forms.helper
import
FormHelper
from
crispy_forms.helper
import
FormHelper
...
@@ -82,8 +82,8 @@ class NoStripEmailField(forms.EmailField):
...
@@ -82,8 +82,8 @@ class NoStripEmailField(forms.EmailField):
class
UsernameField
(
forms
.
RegexField
):
class
UsernameField
(
forms
.
RegexField
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
help_text
=
_
(
help_text
=
_
(
'Username may
contain only
letters, '
'Username may
only contain
letters, '
'numbers
and
following characters: @ . + - _'
'numbers
or the
following characters: @ . + - _'
)
)
kwargs
[
'max_length'
]
=
30
kwargs
[
'max_length'
]
=
30
kwargs
[
'regex'
]
=
r'^[\
w.@+-]+$
'
kwargs
[
'regex'
]
=
r'^[\
w.@+-]+$
'
...
@@ -234,7 +234,7 @@ class UserForm(forms.ModelForm):
...
@@ -234,7 +234,7 @@ class UserForm(forms.ModelForm):
email = forms.ChoiceField(
email = forms.ChoiceField(
label=_('
E
-
mail
'),
label=_('
E
-
mail
'),
help_text=_(
help_text=_(
'
You
can
add
another
email
s
on
Authentication
tab
.
'
'
You
can
add
another
email
address
on
the
Authentication
tab
.
'
),
),
choices=(
choices=(
('', ''),
('', ''),
...
@@ -377,7 +377,11 @@ class CaptchaRegistrationForm(RegistrationForm):
...
@@ -377,7 +377,11 @@ class CaptchaRegistrationForm(RegistrationForm):
self.tampering = True
self.tampering = True
# Set correct label
# Set correct label
self.fields['
captcha
'].label = _('
What
is
%
s
?
') % self.captcha.display
self.fields['
captcha
'].label = pgettext(
'
Question
for
a
mathematics
-
based
CAPTCHA
,
'
'
the
%
s
is
an
arithmetic
problem
',
'
What
is
%
s
?
'
) % self.captcha.display
self.fields['
captcha_id
'].initial = self.captcha.hashed
self.fields['
captcha_id
'].initial = self.captcha.hashed
def clean_captcha(self):
def clean_captcha(self):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment