summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-11-01 21:29:39 -0400
committerTim Graham <timograham@gmail.com>2013-11-01 21:32:05 -0400
commit33503c57ef369f07dd6a3a33ecf5cdd3fbbd0a6b (patch)
tree6649fc4c028e6af2c375fa115edd42573ff220cc
parent35fd14cf42f5461520e755da7bad4d4629ea26bc (diff)
downloaddjango-33503c57ef369f07dd6a3a33ecf5cdd3fbbd0a6b.tar.gz
[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 090315f5df from master
-rw-r--r--django/utils/cache.py2
-rw-r--r--django/utils/feedgenerator.py2
-rw-r--r--docs/ref/templates/builtins.txt2
-rw-r--r--docs/topics/i18n/translation.txt4
4 files changed, 5 insertions, 5 deletions
diff --git a/django/utils/cache.py b/django/utils/cache.py
index 917949d4d3..1c8587dc5d 100644
--- a/django/utils/cache.py
+++ b/django/utils/cache.py
@@ -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')
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index fee8e17865..13708d49ad 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -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')
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index c579cb489a..6a3a6bd58b 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -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
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 041d627bad..77a02988b1 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -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