Skip to content

Commit e776af7

Browse files
miracle2kmiracle2k
committed
Merge branch 'release/0.8' into stable
2 parents 185b475 + c12fabd commit e776af7

File tree

13 files changed

+378
-110
lines changed

13 files changed

+378
-110
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*.un~
44

55
/.tox
6-
/BRANCH_TODO
6+
/LOCAL_TODO*
77

88
# IDEs
99
/flask-assets.wpr

‎CHANGES

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
0.8 (2012-11-23)
2+
This release is compatible with webassets 0.8.
3+
4+
- Flask-Script's ``build`` command now has ``--parse-templates`` option.
5+
- ``Environment`` class now has ``from_yaml`` and ``from_module``
6+
shortcuts (Sean Lynch).
7+
- Jinja2 filter uses the Flask template environment.
8+
- Fixed PySscss filter.
9+
110
0.7 (2012-04-11)
211
This release is compatible with webassets 0.7.
312

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
# make sure we are documenting the local version with autodoc
2525
sys.path.insert(0, os.path.abspath('../src'))
26-
from flaskext import assets as flaskassets
26+
from flask.ext import assets as flaskassets
2727

2828

2929
# -- General configuration -----------------------------------------------------

‎docs/index.rst

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,27 @@ configuration. The following two statements are equivalent:
144144
For a list of available settings, see the full
145145
:ref:`webassets documentation <webassets:environment-configuration>`.
146146

147+
Babel Configuration
148+
~~~~~~~~~~~~~~~~~~~
149+
150+
If you use `Babel`_ for internationalization, then you will need to
151+
add the extension to your babel configuration file
152+
as ``webassets.ext.jinja2.AssetsExtension``
153+
154+
Otherwise, babel will not extract strings from any templates that
155+
include an ``assets`` tag.
156+
157+
Here is an example ``babel.cfg``:
158+
159+
.. code-block:: python
160+
161+
[python: **.py]
162+
[jinja2: **.html]
163+
extensions=jinja2.ext.autoescape,jinja2.ext.with_,webassets.ext.jinja2.AssetsExtension
164+
165+
166+
.. _Babel: http://babel.edgewall.org/
167+
147168

148169
Management Command
149170
------------------
@@ -153,12 +174,12 @@ as ``flaskext.assets.ManageAssets``:
153174

154175
.. code-block:: python
155176
156-
from flaskext.assets import ManageAssets
177+
from flask.ext.assets import ManageAssets
157178
manager = Manager(app)
158179
manager.add_command("assets", ManageAssets(assets_env))
159180
160-
You can explicitly pass the ``assets_env`` when adding the comm`and as above.
161-
Alternatively, ``ManageAssets`` will import the ``current_app` from Flask and
181+
You can explicitly pass the ``assets_env`` when adding the command as above.
182+
Alternatively, ``ManageAssets`` will import the ``current_app`` from Flask and
162183
use the ``jinja_env``.
163184

164185
The command allows you to do things like rebuilding bundles from the

‎requirements-dev.pip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ nose
22
Flask
33
Flask-Script
44
webassets
5+
PyYAML

0 commit comments

Comments
 (0)