Commit 22bb0acb authored by Michal Čihař's avatar Michal Čihař

Merge branch 'master' into bootstrap

parents 8c8b300d 5cde655f
...@@ -503,7 +503,8 @@ urlpatterns = patterns( ...@@ -503,7 +503,8 @@ urlpatterns = patterns(
name='widgets-compat-render', name='widgets-compat-render',
), ),
url( url(
r'^widgets/(?P<project>[^/]+)-' + WIDGET + '-' + LANGUAGE + r'\.' + EXTENSION + r'$', r'^widgets/(?P<project>[^/]+)-' + WIDGET + '-' +
LANGUAGE + r'\.' + EXTENSION + r'$',
'weblate.trans.views.widgets.render_widget', 'weblate.trans.views.widgets.render_widget',
name='widget-image-lang-dash', name='widget-image-lang-dash',
), ),
...@@ -515,12 +516,13 @@ urlpatterns = patterns( ...@@ -515,12 +516,13 @@ urlpatterns = patterns(
# Engagement widgets # Engagement widgets
url( url(
r'^widgets/' + PROJECT + '-/' + WIDGET + r'\.' + EXTENSION + r'$', r'^widgets/' + PROJECT + '-/' + WIDGET + r'\.' + EXTENSION + r'$',
'weblate.trans.views.widgets.render_widget', 'weblate.trans.views.widgets.render_widget',
name='widget-image', name='widget-image',
), ),
url( url(
r'^widgets/' + PROJECT + LANGUAGE + '/' + WIDGET + r'\.' + EXTENSION + r'$', r'^widgets/' + PROJECT + LANGUAGE + '/' +
WIDGET + r'\.' + EXTENSION + r'$',
'weblate.trans.views.widgets.render_widget', 'weblate.trans.views.widgets.render_widget',
name='widget-image-lang', name='widget-image-lang',
), ),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment