From 97fedcc03175f6ced6c46145be930aad4977c54f Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 14 Jun 2006 03:31:34 +0000 Subject: [PATCH] Fixed #2143 -- Changed a few places where the pre-magic-removal-merge syntax was still being used in the docs. Thanks to mssnlayam@yahoo.com for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3125 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/db-api.txt | 2 +- docs/forms.txt | 16 +++++++++------- docs/i18n.txt | 12 ++++++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/docs/db-api.txt b/docs/db-api.txt index 1109df72c9..7427f36374 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -559,7 +559,7 @@ following models:: # ... hometown = models.ForeignKey(City) - class Book(meta.Model): + class Book(models.Model): # ... author = models.ForeignKey(Person) diff --git a/docs/forms.txt b/docs/forms.txt index 2f8a3106fc..5026bc1bab 100644 --- a/docs/forms.txt +++ b/docs/forms.txt @@ -15,6 +15,8 @@ We'll take a top-down approach to examining Django's form validation framework, because much of the time you won't need to use the lower-level APIs. Throughout this document, we'll be working with the following model, a "place" object:: + from django.db import models + PLACE_TYPES = ( (1, 'Bar'), (2, 'Restaurant'), @@ -22,13 +24,13 @@ this document, we'll be working with the following model, a "place" object:: (4, 'Secret Hideout'), ) - class Place(meta.Model): - name = meta.CharField(maxlength=100) - address = meta.CharField(maxlength=100, blank=True) - city = meta.CharField(maxlength=50, blank=True) - state = meta.USStateField() - zip_code = meta.CharField(maxlength=5, blank=True) - place_type = meta.IntegerField(choices=PLACE_TYPES) + class Place(models.Model): + name = models.CharField(maxlength=100) + address = models.CharField(maxlength=100, blank=True) + city = models.CharField(maxlength=50, blank=True) + state = models.USStateField() + zip_code = models.CharField(maxlength=5, blank=True) + place_type = models.IntegerField(choices=PLACE_TYPES) class Admin: pass diff --git a/docs/i18n.txt b/docs/i18n.txt index cd24ba0f93..1220ea95b3 100644 --- a/docs/i18n.txt +++ b/docs/i18n.txt @@ -133,8 +133,8 @@ For example, to translate a model's ``help_text``, do the following:: from django.utils.translation import gettext_lazy - class MyThing(meta.Model): - name = meta.CharField(help_text=gettext_lazy('This is the help text')) + class MyThing(models.Model): + name = models.CharField(help_text=gettext_lazy('This is the help text')) In this example, ``gettext_lazy()`` stores a lazy reference to the string -- not the actual translation. The translation itself will be done when the string @@ -145,8 +145,8 @@ If you don't like the verbose name ``gettext_lazy``, you can just alias it as from django.utils.translation import gettext_lazy as _ - class MyThing(meta.Model): - name = meta.CharField(help_text=_('This is the help text')) + class MyThing(models.Model): + name = models.CharField(help_text=_('This is the help text')) Always use lazy translations in `Django models`_. And it's a good idea to add translations for the field names and table names, too. This means writing @@ -155,8 +155,8 @@ class, though:: from django.utils.translation import gettext_lazy as _ - class MyThing(meta.Model): - name = meta.CharField(_('name'), help_text=_('This is the help text')) + class MyThing(models.Model): + name = models.CharField(_('name'), help_text=_('This is the help text')) class Meta: verbose_name = _('my thing') verbose_name_plural = _('mythings')