diff options
| author | Chris McDonough <chrism@plope.com> | 2013-12-12 15:49:41 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-12-12 15:49:41 -0500 |
| commit | 28c26c17d66b563140e60b95ca1ea7e6dc3ccb6c (patch) | |
| tree | ec0daf06f63f433bd622f54e72c720b5125994ce /docs | |
| parent | b13969deeb80dd9aa5130d16ea712b323ac3bafe (diff) | |
| parent | 51e5538d8e75a01fdb1c97d6b241071381cbc9fc (diff) | |
| download | pyramid-28c26c17d66b563140e60b95ca1ea7e6dc3ccb6c.tar.gz pyramid-28c26c17d66b563140e60b95ca1ea7e6dc3ccb6c.tar.bz2 pyramid-28c26c17d66b563140e60b95ca1ea7e6dc3ccb6c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/i18n.rst | 6 | ||||
| -rw-r--r-- | docs/whatsnew-1.5.rst | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst index c9b782c08..5f50ca212 100644 --- a/docs/narr/i18n.rst +++ b/docs/narr/i18n.rst @@ -607,10 +607,8 @@ object, but the domain and mapping information attached is ignored. def aview(request): localizer = request.localizer num = 1 - translated = localizer.pluralize( - _('item_plural', default="${number} items"), - None, num, 'mydomain', mapping={'number':num} - ) + translated = localizer.pluralize('item_plural', '${number} items', + num, 'mydomain', mapping={'number':num}) The corresponding message catalog must have language plural definitions and plural alternatives set. diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst index 23613896a..9ccf097a8 100644 --- a/docs/whatsnew-1.5.rst +++ b/docs/whatsnew-1.5.rst @@ -348,7 +348,10 @@ The feature additions in Pyramid 1.5 follow. signing content. The custom serializer arguments to this function should only focus on serializing, unlike its predecessor which required the serializer to also perform signing. - See https://github.com/Pylons/pyramid/pull/1142 + See https://github.com/Pylons/pyramid/pull/1142 . Note + that cookies generated using ``SignedCookieSessionFactory`` are not + compatible with cookies generated using ``UnencryptedCookieSessionFactory``, + so existing user session data will be destroyed if you switch to it. - Added a new ``BaseCookieSessionFactory`` which acts as a generic cookie factory that can be used by framework implementors to create their own @@ -504,3 +507,5 @@ Dependency Changes - Pyramid no longer depends upon ``Mako`` or ``Chameleon``. +- Pyramid now depends on WebOb>=1.3 (it uses ``webob.cookies.CookieProfile`` + from 1.3+). |