diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
| commit | 5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch) | |
| tree | 727028ad4eeb596c291d0f96fbc9bb520ec971fd /docs/narr/i18n.rst | |
| parent | b210ce350a3856166376f63a32725cc1516ba294 (diff) | |
| parent | 7319ab677216063581e47a231fd70b8b55a19466 (diff) | |
| download | pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2 pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/i18n.rst')
| -rw-r--r-- | docs/narr/i18n.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst index 74765f8e2..2964686d3 100644 --- a/docs/narr/i18n.rst +++ b/docs/narr/i18n.rst @@ -808,7 +808,7 @@ If this setting is supplied within the :app:`Pyramid` application default_locale_name = settings['pyramid.default_locale_name'] .. index:: - single: detecting langauges + single: detecting languages "Detecting" Available Languages ------------------------------- @@ -984,7 +984,7 @@ requires no additional coding or configuration. The default locale negotiator implementation named :class:`~pyramid.i18n.default_locale_negotiator` uses the following -set of steps to dermine the locale name. +set of steps to determine the locale name. - First, the negotiator looks for the ``_LOCALE_`` attribute of the request object (possibly set directly by view code or by a listener |