Commit 31817dd2 authored by Yoong Kang Lim's avatar Yoong Kang Lim Committed by Tim Graham
Browse files

Fixed #26136 -- Removed URL reversing by dotted path from JavaScript catalog example.

parent 8e6a08e9

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -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>

docs/topics/i18n/translation.txt

+3 −3
Original line number Diff line number Diff line
@@ -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: