From 49425bcce4f754d706bb7917f24c7e1b36231d3c Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Thu, 13 Oct 2011 02:24:39 +0300 Subject: fix static_url docstring about absolute path since pyramid 1.2, the path can be absolute and no ValueError is raised anymore (see commit b8c79771a186f1032635fc640b3cecc2c9e281ad ) --- pyramid/url.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pyramid/url.py b/pyramid/url.py index 7a7dd3b4c..2402a79c4 100644 --- a/pyramid/url.py +++ b/pyramid/url.py @@ -340,10 +340,9 @@ class URLMethodsMixin(object): The ``path`` argument points at a file or directory on disk which a URL should be generated for. The ``path`` may be either a - relative path (e.g. ``static/foo.css``) or a :term:`asset - specification` (e.g. ``mypackage:static/foo.css``). A ``path`` - may not be an absolute filesystem path (a :exc:`ValueError` will - be raised if this function is supplied with an absolute path). + relative path (e.g. ``static/foo.css``) or an absolute path (e.g. + ``/abspath/to/static/foo.css``) or a :term:`asset specification` + (e.g. ``mypackage:static/foo.css``). The purpose of the ``**kw`` argument is the same as the purpose of the :meth:`pyramid.request.Request.route_url` ``**kw`` argument. See -- cgit v1.2.3 From c1265329e28bc513a2304fd451e727d9bc95f7ba Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Fri, 14 Oct 2011 14:39:15 -0500 Subject: fixed translationstring docs, default is not the first argument --- docs/narr/i18n.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst index c2ecba9bb..631654d32 100644 --- a/docs/narr/i18n.rst +++ b/docs/narr/i18n.rst @@ -149,7 +149,7 @@ generated by using it. For example: from pyramid.i18n import TranslationStringFactory _ = TranslationStringFactory('pyramid') - ts = _('Add ${number}', msgid='add-number', mapping={'number':1}) + ts = _('add-number', default='Add ${number}', mapping={'number':1}) .. note:: We assigned the translation string factory to the name ``_``. This is a convention which will be supported by translation @@ -170,7 +170,7 @@ to: :linenos: from pyramid.i18n import TranslationString as _ - ts = _('Add ${number}', msgid='add-number', mapping={'number':1}, + ts = _('add-number', default='Add ${number}', mapping={'number':1}, domain='pyramid') You can set up your own translation string factory much like the one @@ -185,7 +185,7 @@ do something like this: from pyramid.i18n import TranslationStringFactory _ = TranslationStringFactory('form') - ts = _('Add ${number}', msgid='add-number', mapping={'number':1}) + ts = _('add-number', default='Add ${number}', mapping={'number':1}) Creating a unique domain for your application via a translation string factory is best practice. Using your own unique translation domain -- cgit v1.2.3