From 958fcc0e7b79e692630ee048860a75bc61809993 Mon Sep 17 00:00:00 2001 From: Mathieu Agopian Date: Fri, 15 Nov 2013 09:46:42 +0100 Subject: [PATCH 1/3] internal link to autodoc'ed method jingo.helpers.f --- docs/index.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 02479b2..7805294 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -149,8 +149,7 @@ Since we all love L10n, let's see what it looks like in Jinja templates::

{{ _('Reviews for {0}')|f(addon.name) }}

The simple way is to use the familiar underscore and string within a ``{{ }}`` -moustache block. ``f`` is an interpolation filter documented below. Sphinx -could create a link if I knew how to do that. +moustache block. :meth:`f` is an interpolation filter documented above. The other method uses Jinja's ``trans`` tag:: From 4ca271f6f95aaf4e96fc2e81f20d2e5c4934d18f Mon Sep 17 00:00:00 2001 From: Mathieu Agopian Date: Fri, 15 Nov 2013 09:58:52 +0100 Subject: [PATCH 2/3] remove duplicated line in docs --- docs/index.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 7805294..34a7bb1 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -164,9 +164,6 @@ directly. Both methods are useful, pick the one that makes you happy. Forms ----- -Django marks its form HTML "safe" according to its own rules, which Jinja2 does -not recognize. - .. automodule:: jingo.monkey From c5bc8255993c251766b43d0d447dcf16cd8d00b9 Mon Sep 17 00:00:00 2001 From: Mathieu Agopian Date: Fri, 15 Nov 2013 10:10:05 +0100 Subject: [PATCH 3/3] add project information and link to travis --- README.rst | 14 ++++++++++++++ docs/index.rst | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/README.rst b/README.rst index 89448ce..86e8409 100644 --- a/README.rst +++ b/README.rst @@ -11,6 +11,20 @@ Jingo Jingo is an adapter for using Jinja2_ templates within Django. +.. image:: https://secure.travis-ci.org/jbalogh/jingo.png?branch=master + :alt: Build Status + :target: https://secure.travis-ci.org/jbalogh/jingo + +:Author: Jeff Balogh and contributors_ +:Licence: BSD +:Compatibility: Python 2.6, 2.7 and 3.3, Django 1.4, 1.5 and 1.6 +:Requirements: jinja2 +:Project URL: https://github.com/jbalogh/jingo/ +:Documentation: http://jingo.readthedocs.org/en/latest/ + +.. _contributors: https://github.com/jbalogh/jingo/contributors + + .. note:: Coffin or Jingo? Jingo differs from Coffin_ in two major ways: diff --git a/docs/index.rst b/docs/index.rst index 34a7bb1..12202d9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -7,6 +7,19 @@ Jingo Jingo is an adapter for using Jinja2_ templates within Django. +.. image:: https://secure.travis-ci.org/jbalogh/jingo.png?branch=master + :alt: Build Status + :target: https://secure.travis-ci.org/jbalogh/jingo + +* Author: Jeff Balogh and contributors_ +* Licence: BSD +* Compatibility: Python 2.6, 2.7 and 3.3, Django 1.4, 1.5 and 1.6 +* Requirements: jinja2 +* Project URL: https://github.com/jbalogh/jingo/ +* Documentation: http://jingo.readthedocs.org/en/latest/ + +.. _contributors: https://github.com/jbalogh/jingo/contributors + .. note:: Coffin or Jingo? Jingo differs from Coffin_ in two major ways: