Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Fixed #26136 -- Removed URL reversing by dotted path from JavaScript catalog example.

Browse Source 
Backport of 31817dd2eb69db54eb559716aae42fe55ada5fea from master
This commit is contained in:
Yoong Kang Lim 2016-01-27 21:32:06 +11:00 committed by Tim Graham
parent 79c3950562
commit c2dfc3616a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -721,6 +721,7 @@ answer newbie questions, and generally made Django that much better:
Yasushi Masuda <whosaysni@gmail.com> Yasushi Masuda <whosaysni@gmail.com>
ye7cakf02@sneakemail.com ye7cakf02@sneakemail.com
ymasuda@ethercube.com ymasuda@ethercube.com
Yoong Kang Lim <yoongkang.lim@gmail.com>
Zachary Voase <zacharyvoase@gmail.com> Zachary Voase <zacharyvoase@gmail.com>
Zach Thompson <zthompson47@gmail.com> Zach Thompson <zthompson47@gmail.com>
Zain Memon Zain Memon

6
docs/topics/i18n/translation.txt
View File

@ -958,7 +958,7 @@ You hook it up like this::
} }
urlpatterns = [ urlpatterns = [
url(r'^jsi18n/$', javascript_catalog, js_info_dict), url(r'^jsi18n/$', javascript_catalog, js_info_dict, name='javascript-catalog'),
] ]
Each string in ``packages`` should be in Python dotted-package syntax (the Each string in ``packages`` should be in Python dotted-package syntax (the
@ -978,7 +978,7 @@ changed by altering the ``domain`` argument.
You can make the view dynamic by putting the packages into the URL pattern:: You can make the view dynamic by putting the packages into the URL pattern::
urlpatterns = [ urlpatterns = [
url(r'^jsi18n/(?P<packages>\S+?)/$', javascript_catalog), url(r'^jsi18n/(?P<packages>\S+?)/$', javascript_catalog, name='javascript-catalog'),
] ]
With this, you specify the packages as a list of package names delimited by '+' With this, you specify the packages as a list of package names delimited by '+'
@ -1003,7 +1003,7 @@ To use the catalog, just pull in the dynamically generated script like this:
.. code-block:: html+django .. code-block:: html+django
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script> <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
This uses reverse URL lookup to find the URL of the JavaScript catalog view. This uses reverse URL lookup to find the URL of the JavaScript catalog view.
When the catalog is loaded, your JavaScript code can use the following methods: When the catalog is loaded, your JavaScript code can use the following methods: