Commit 33503c57 authored by Tim Graham's avatar Tim Graham
Browse files

[1.6.x] Fixed spelling ("dependant" -> "dependent") 

Dependent means reliant on.
A dependant is a person like a child or spouse.

Thanks Andrew Wilcox for the report.

Backport of 090315f5 from master
parent 35fd14cf

django/utils/cache.py

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ def _i18n_cache_key_suffix(request, cache_key): 
        cache_key += '.%s' % getattr(request, 'LANGUAGE_CODE', get_language())

    if settings.USE_TZ:

        # The datetime module doesn't restrict the output of tzname().

        # Windows is known to use non-standard, locale-dependant names.

        # Windows is known to use non-standard, locale-dependent names.

        # User-defined tzinfo classes may return absolutely anything.

        # Hence this paranoid conversion to create a valid cache key.

        tz_name = force_text(get_current_timezone_name(), errors='ignore')

django/utils/feedgenerator.py

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ from django.utils.six.moves.urllib.parse import urlparse 
from django.utils.timezone import is_aware



def rfc2822_date(date):

    # We can't use strftime() because it produces locale-dependant results, so

    # We can't use strftime() because it produces locale-dependent results, so

    # we have to map english month and day names manually

    months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',)

    days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')

docs/ref/templates/builtins.txt

+1 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ Formats a time according to the given format. 


Given format can be the predefined one :setting:`TIME_FORMAT`, or a custom

format, same as the :tfilter:`date` filter. Note that the predefined format

is locale-dependant.

is locale-dependent.



The time filter will only accept parameters in the format string that relate

to the time of day, not the date (for obvious reasons). If you need to

docs/topics/i18n/translation.txt

+2 −2
Original line number Diff line number Diff line
@@ -991,8 +991,8 @@ for a given version of a site — it's a good candidate for caching. 


Server-side caching will reduce CPU load. It's easily implemented with the

:func:`~django.views.decorators.cache.cache_page` decorator. To trigger cache

invalidation when your translations change, provide a version-dependant key

prefix, as shown in the example below, or map the view at a version-dependant

invalidation when your translations change, provide a version-dependent key

prefix, as shown in the example below, or map the view at a version-dependent

URL.



.. code-block:: python