Skip to content

Commit

Permalink
Merge pull request #224 from mmoll/fc_loc_path
Browse files Browse the repository at this point in the history
Fix fullcalender locale JS path
  • Loading branch information
jorgelzpz committed Oct 28, 2017
2 parents 1a3ef40 + f9b0476 commit 4673c76
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Use npm to download dependencies instead of using bower
- Upgrade Symfony components to 2.8.27
- Session cookies are now marked with HttpOnly flag by default (#215)
- Fix URL used for Fullcalender frontend translations

## [2.2.0] - 2017-05-23

Expand Down
2 changes: 1 addition & 1 deletion web/templates/parts/bottom.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

{% if load_fullcalendar_locale is defined and attribute(app, 'fullcalendar.languages')[app.translator.locale] is defined %}
{% set fullcalendar_locale = attribute(app, 'fullcalendar.languages')[app.translator.locale] %}
{% set locale_path = '/fullcalendar-locale/' ~ fullcalendar_locale ~ '.js' %}
{% set locale_path = 'fullcalendar-locale/' ~ fullcalendar_locale ~ '.js' %}
<script language="JavaScript" type="text/javascript" src="{{ asset(locale_path) }}"></script>
{% endif %}

0 comments on commit 4673c76

Please sign in to comment.