Skip to content

Commit ee9fd25

Browse files
committed
use dev version of lunetics locale
1 parent e98f18a commit ee9fd25

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"jackalope/jackalope-doctrine-dbal": "^1.3",
4040
"jackalope/jackalope-jackrabbit": "^1.3",
4141
"jms/serializer-bundle": "^2.3",
42-
"lunetics/locale-bundle": "^2.6",
42+
"lunetics/locale-bundle": "dev-master",
4343
"sensio/framework-extra-bundle": "^5.1",
4444
"sonata-project/cache-bundle": "2.x-dev",
4545
"sonata-project/doctrine-phpcr-admin-bundle": "dev-allow_Symfony_4 as 2.1",
@@ -64,7 +64,8 @@
6464
"symfony/yaml": "^4.0",
6565
"sonata-project/translation-bundle": "^2.3",
6666
"sonata-project/doctrine-orm-admin-bundle": "^3.4",
67-
"friendsofsymfony/ckeditor-bundle": "^1.1"
67+
"friendsofsymfony/ckeditor-bundle": "^1.1",
68+
"symfony/asset": "^4.0"
6869
},
6970
"require-dev": {
7071
"liip/functional-test-bundle": "^2.0",

composer.lock

Lines changed: 19 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/base.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<a href="#" class="btn btn-default btn-xs navbar-btn dropdown-toggle" data-toggle="dropdown">Read this page in <span class="caret"></span></a>
5656
<ul class="dropdown-menu">
5757
{% if cmfMainContent is defined %}
58-
{# {{ locale_switcher(cmfMainContent, null, 'includes/switcher_links.html.twig') }} #}
58+
{{ locale_switcher(cmfMainContent, null, 'includes/switcher_links.html.twig') }}
5959
{% endif %}
6060
</ul>
6161
</div>

0 commit comments

Comments
 (0)