Commit 9a279edc authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed some ReST errors from e-mail -> email change in docs, and changed some... 

Fixed some ReST errors from e-mail -> email change in docs, and changed some docs that shouldn't have been changed (because translation strings haven't been converted yet)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 94af19c4

docs/howto/error-reporting.txt

+1 −1
Original line number Diff line number Diff line 
Error reporting via email

==========================

=========================



When you're running a public site you should always turn off the

:setting:`DEBUG` setting. That will make your server run much faster, and will

docs/ref/forms/api.txt

+5 −5
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ Access the :attr:`~Form.errors` attribute to get a dictionary of error 
messages::



    >>> f.errors

    {'sender': [u'Enter a valid email address.'], 'subject': [u'This field is required.']}

    {'sender': [u'Enter a valid e-mail address.'], 'subject': [u'This field is required.']}



In this dictionary, the keys are the field names, and the values are lists of

Unicode strings representing the error messages. The error messages are stored
@@ -537,18 +537,18 @@ method you're using:: 
    >>> print f.as_table()

    <tr><th>Subject:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="subject" maxlength="100" /></td></tr>

    <tr><th>Message:</th><td><input type="text" name="message" value="Hi there" /></td></tr>

    <tr><th>Sender:</th><td><ul class="errorlist"><li>Enter a valid email address.</li></ul><input type="text" name="sender" value="invalid email address" /></td></tr>

    <tr><th>Sender:</th><td><ul class="errorlist"><li>Enter a valid e-mail address.</li></ul><input type="text" name="sender" value="invalid email address" /></td></tr>

    <tr><th>Cc myself:</th><td><input checked="checked" type="checkbox" name="cc_myself" /></td></tr>

    >>> print f.as_ul()

    <li><ul class="errorlist"><li>This field is required.</li></ul>Subject: <input type="text" name="subject" maxlength="100" /></li>

    <li>Message: <input type="text" name="message" value="Hi there" /></li>

    <li><ul class="errorlist"><li>Enter a valid email address.</li></ul>Sender: <input type="text" name="sender" value="invalid email address" /></li>

    <li><ul class="errorlist"><li>Enter a valid e-mail address.</li></ul>Sender: <input type="text" name="sender" value="invalid email address" /></li>

    <li>Cc myself: <input checked="checked" type="checkbox" name="cc_myself" /></li>

    >>> print f.as_p()

    <p><ul class="errorlist"><li>This field is required.</li></ul></p>

    <p>Subject: <input type="text" name="subject" maxlength="100" /></p>

    <p>Message: <input type="text" name="message" value="Hi there" /></p>

    <p><ul class="errorlist"><li>Enter a valid email address.</li></ul></p>

    <p><ul class="errorlist"><li>Enter a valid e-mail address.</li></ul></p>

    <p>Sender: <input type="text" name="sender" value="invalid email address" /></p>

    <p>Cc myself: <input checked="checked" type="checkbox" name="cc_myself" /></p>
@@ -571,7 +571,7 @@ pass that in at construction time:: 
    <div class="errorlist"><div class="error">This field is required.</div></div>

    <p>Subject: <input type="text" name="subject" maxlength="100" /></p>

    <p>Message: <input type="text" name="message" value="Hi there" /></p>

    <div class="errorlist"><div class="error">Enter a valid email address.</div></div>

    <div class="errorlist"><div class="error">Enter a valid e-mail address.</div></div>

    <p>Sender: <input type="text" name="sender" value="invalid email address" /></p>

    <p>Cc myself: <input checked="checked" type="checkbox" name="cc_myself" /></p>

docs/ref/forms/fields.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ exception or returns the clean value:: 
    >>> f.clean('invalid email address')

    Traceback (most recent call last):

    ...

    ValidationError: [u'Enter a valid email address.']

    ValidationError: [u'Enter a valid e-mail address.']



Core field arguments

--------------------

docs/ref/forms/validation.txt

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ a look at Django's ``EmailField``:: 


    class EmailField(CharField):

        default_error_messages = {

            'invalid': _(u'Enter a valid email address.'),

            'invalid': _(u'Enter a valid e-mail address.'),

        }

        default_validators = [validators.validate_email]
@@ -200,7 +200,7 @@ on field definition so:: 
is equivalent to::



    email = forms.CharField(validators=[validators.validate_email],

            error_messages={'invalid': _(u'Enter a valid email address.')})

            error_messages={'invalid': _(u'Enter a valid e-mail address.')})





Form field default cleaning

docs/ref/unicode.txt

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ A couple of tips to remember when writing your own template tags and filters: 
      strings at that point.



Email

======

=====



Django's email framework (in ``django.core.mail``) supports Unicode

transparently. You can use Unicode data in the message bodies and any headers.