summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoong Kang Lim <yoongkang.lim@gmail.com>2016-01-27 21:32:06 +1100
committerTim Graham <timograham@gmail.com>2016-01-27 08:58:12 -0500
commit31817dd2eb69db54eb559716aae42fe55ada5fea (patch)
treede8eefc19f2c4a57087d3fcba76158875b7714f2
parent8e6a08e937272f088902cdbec65a9f2e919783bf (diff)
Fixed #26136 -- Removed URL reversing by dotted path from JavaScript catalog example.
-rw-r--r--AUTHORS1
-rw-r--r--docs/topics/i18n/translation.txt6
2 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 39ec468caf..4e7aab8a86 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -760,6 +760,7 @@ answer newbie questions, and generally made Django that much better:
Yasushi Masuda <whosaysni@gmail.com>
ye7cakf02@sneakemail.com
ymasuda@ethercube.com
+ Yoong Kang Lim <yoongkang.lim@gmail.com>
Yusuke Miyazaki <miyazaki.dev@gmail.com>
Zachary Voase <zacharyvoase@gmail.com>
Zach Thompson <zthompson47@gmail.com>
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 0394790152..842003e6d6 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -984,7 +984,7 @@ You hook it up like this::
}
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
@@ -1004,7 +1004,7 @@ changed by altering the ``domain`` argument.
You can make the view dynamic by putting the packages into the URL pattern::
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 '+'
@@ -1054,7 +1054,7 @@ To use the catalog, just pull in the dynamically generated script like this:
.. 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.
When the catalog is loaded, your JavaScript code can use the following methods: