Browse Source

Fixed #19555 - Removed '2012' from tutorial 1.

Thanks rodrigorosa.lg and others for the report.
Tim Graham 12 năm trước cách đây
mục cha
commit
99315f709e
1 tập tin đã thay đổi với 7 bổ sung4 xóa
  1. 7 4
      docs/intro/tutorial01.txt

+ 7 - 4
docs/intro/tutorial01.txt

@@ -647,8 +647,10 @@ Save these changes and start a new Python interactive shell by running
     >>> Poll.objects.filter(question__startswith='What')
     [<Poll: What's up?>]
 
-    # Get the poll whose year is 2012.
-    >>> Poll.objects.get(pub_date__year=2012)
+    # Get the poll that was published this year.
+    >>> from django.utils import timezone
+    >>> current_year = timezone.now().year
+    >>> Poll.objects.get(pub_date__year=current_year)
     <Poll: What's up?>
 
     # Request an ID that doesn't exist, this will raise an exception.
@@ -699,8 +701,9 @@ Save these changes and start a new Python interactive shell by running
     # The API automatically follows relationships as far as you need.
     # Use double underscores to separate relationships.
     # This works as many levels deep as you want; there's no limit.
-    # Find all Choices for any poll whose pub_date is in 2012.
-    >>> Choice.objects.filter(poll__pub_date__year=2012)
+    # Find all Choices for any poll whose pub_date is in this year
+    # (reusing the 'current_year' variable we created above).
+    >>> Choice.objects.filter(poll__pub_date__year=current_year)
     [<Choice: Not much>, <Choice: The sky>, <Choice: Just hacking again>]
 
     # Let's delete one of the choices. Use delete() for that.