Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
D
django
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
django
Commits
730173d1
Kaydet (Commit)
730173d1
authored
Agu 07, 2018
tarafından
Tim Graham
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fixed #29623 -- Fixed translation failure of DurationField's "overflow" error message.
üst
9fee2298
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
7 deletions
+18
-7
fields.py
django/forms/fields.py
+5
-7
2.1.1.txt
docs/releases/2.1.1.txt
+3
-0
test_durationfield.py
tests/forms_tests/field_tests/test_durationfield.py
+10
-0
No files found.
django/forms/fields.py
Dosyayı görüntüle @
730173d1
...
@@ -468,12 +468,7 @@ class DateTimeField(BaseTemporalField):
...
@@ -468,12 +468,7 @@ class DateTimeField(BaseTemporalField):
class
DurationField
(
Field
):
class
DurationField
(
Field
):
default_error_messages
=
{
default_error_messages
=
{
'invalid'
:
_
(
'Enter a valid duration.'
),
'invalid'
:
_
(
'Enter a valid duration.'
),
'overflow'
:
_
(
'overflow'
:
_
(
'The number of days must be between {min_days} and {max_days}.'
)
'The number of days must be between {min_days} and {max_days}.'
.
format
(
min_days
=
datetime
.
timedelta
.
min
.
days
,
max_days
=
datetime
.
timedelta
.
max
.
days
,
)
)
}
}
def
prepare_value
(
self
,
value
):
def
prepare_value
(
self
,
value
):
...
@@ -489,7 +484,10 @@ class DurationField(Field):
...
@@ -489,7 +484,10 @@ class DurationField(Field):
try
:
try
:
value
=
parse_duration
(
str
(
value
))
value
=
parse_duration
(
str
(
value
))
except
OverflowError
:
except
OverflowError
:
raise
ValidationError
(
self
.
error_messages
[
'overflow'
],
code
=
'overflow'
)
raise
ValidationError
(
self
.
error_messages
[
'overflow'
]
.
format
(
min_days
=
datetime
.
timedelta
.
min
.
days
,
max_days
=
datetime
.
timedelta
.
max
.
days
,
),
code
=
'overflow'
)
if
value
is
None
:
if
value
is
None
:
raise
ValidationError
(
self
.
error_messages
[
'invalid'
],
code
=
'invalid'
)
raise
ValidationError
(
self
.
error_messages
[
'invalid'
],
code
=
'invalid'
)
return
value
return
value
...
...
docs/releases/2.1.1.txt
Dosyayı görüntüle @
730173d1
...
@@ -21,3 +21,6 @@ Bugfixes
...
@@ -21,3 +21,6 @@ Bugfixes
* Fixed a regression in Django 2.0 where combining ``Q`` objects with ``__in``
* Fixed a regression in Django 2.0 where combining ``Q`` objects with ``__in``
lookups and lists crashed (:ticket:`29643`).
lookups and lists crashed (:ticket:`29643`).
* Fixed translation failure of ``DurationField``'s "overflow" error message
(:ticket:`29623`).
tests/forms_tests/field_tests/test_durationfield.py
Dosyayı görüntüle @
730173d1
...
@@ -3,6 +3,7 @@ import datetime
...
@@ -3,6 +3,7 @@ import datetime
from
django.core.exceptions
import
ValidationError
from
django.core.exceptions
import
ValidationError
from
django.forms
import
DurationField
from
django.forms
import
DurationField
from
django.test
import
SimpleTestCase
from
django.test
import
SimpleTestCase
from
django.utils
import
translation
from
django.utils.duration
import
duration_string
from
django.utils.duration
import
duration_string
from
.
import
FormFieldAssertionsMixin
from
.
import
FormFieldAssertionsMixin
...
@@ -31,6 +32,15 @@ class DurationFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
...
@@ -31,6 +32,15 @@ class DurationFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
with
self
.
assertRaisesMessage
(
ValidationError
,
msg
):
with
self
.
assertRaisesMessage
(
ValidationError
,
msg
):
f
.
clean
(
'-1000000000 00:00:00'
)
f
.
clean
(
'-1000000000 00:00:00'
)
def
test_overflow_translation
(
self
):
msg
=
"Le nombre de jours doit être entre {min_days} et {max_days}."
.
format
(
min_days
=
datetime
.
timedelta
.
min
.
days
,
max_days
=
datetime
.
timedelta
.
max
.
days
,
)
with
translation
.
override
(
'fr'
):
with
self
.
assertRaisesMessage
(
ValidationError
,
msg
):
DurationField
()
.
clean
(
'1000000000 00:00:00'
)
def
test_durationfield_render
(
self
):
def
test_durationfield_render
(
self
):
self
.
assertWidgetRendersTo
(
self
.
assertWidgetRendersTo
(
DurationField
(
initial
=
datetime
.
timedelta
(
hours
=
1
)),
DurationField
(
initial
=
datetime
.
timedelta
(
hours
=
1
)),
...
...
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