mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 09:02:12 +00:00
Remove sonata-project/intl-bundle in favour of twig/intl-extra
This commit is contained in:
Kamil Kokot
parent
5f122e140f
commit
f607563d32
21 changed files with 24 additions and 24 deletions
|
|
@ -47,7 +47,6 @@
|
|||
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
|
||||
"ramsey/uuid": "^3.7",
|
||||
"sonata-project/block-bundle": "^3.3",
|
||||
"sonata-project/intl-bundle": "^2.2",
|
||||
"stof/doctrine-extensions-bundle": "^1.2",
|
||||
"swiftmailer/swiftmailer": "^6.0",
|
||||
"sylius-labs/association-hydrator": "^1.1",
|
||||
|
|
@ -92,8 +91,8 @@
|
|||
"symfony/twig-bundle": "^4.3",
|
||||
"symfony/validator": "^4.3",
|
||||
"symfony/yaml": "^4.3",
|
||||
"twig/extensions": "^1.4",
|
||||
"twig/twig": "^2.6",
|
||||
"twig/intl-extra": "^2.12",
|
||||
"twig/twig": "^2.12",
|
||||
"webmozart/assert": "^1.1",
|
||||
"white-october/pagerfanta-bundle": "^1.0.8",
|
||||
"willdurand/hateoas": "^2.12",
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ return [
|
|||
winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
|
||||
Sonata\CoreBundle\SonataCoreBundle::class => ['all' => true],
|
||||
Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true],
|
||||
Sonata\IntlBundle\SonataIntlBundle::class => ['all' => true],
|
||||
Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
|
||||
JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
|
||||
FOS\RestBundle\FOSRestBundle::class => ['all' => true],
|
||||
|
|
|
|||
|
|
@ -2,3 +2,11 @@ twig:
|
|||
paths: ['%kernel.project_dir%/templates']
|
||||
debug: '%kernel.debug%'
|
||||
strict_variables: '%kernel.debug%'
|
||||
|
||||
services:
|
||||
_defaults:
|
||||
public: false
|
||||
autowire: true
|
||||
autoconfigure: true
|
||||
|
||||
Twig\Extra\Intl\IntlExtension: ~
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
{{ order.currencyCode }}
|
||||
</div>
|
||||
<div class="item">
|
||||
{{ flags.fromLocaleCode(order.localeCode) }}{{ order.localeCode|locale }}
|
||||
{{ flags.fromLocaleCode(order.localeCode) }}{{ order.localeCode|locale_name }}
|
||||
</div>
|
||||
<div class="item">
|
||||
{{ 'sylius.ui.purchased_from'|trans }}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<strong class="gray text">{{ attributeValue.name }}</strong>
|
||||
</td>
|
||||
<td>
|
||||
{% include [('@SyliusAdmin/Product/Show/Types/'~attributeValue.type~'.html.twig'), '@SyliusAttribute/Types/default.html.twig'] with {'attribute': attributeValue, 'locale': configuration.request.locale, 'fallbackLocale': configuration.request.defaultLocale} %}
|
||||
{% include [('@SyliusAdmin/Product/Show/Types/'~attributeValue.type~'.html.twig'), '@SyliusAdmin/Product/Show/Types/default.html.twig'] with {'attribute': attributeValue, 'locale': configuration.request.locale, 'fallbackLocale': configuration.request.defaultLocale} %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -22,19 +22,17 @@
|
|||
"require": {
|
||||
"php": "^7.2",
|
||||
|
||||
"sonata-project/intl-bundle": "^2.2",
|
||||
"sylius/core-bundle": "^1.2",
|
||||
"sylius/ui-bundle": "^1.2",
|
||||
"symfony/framework-bundle": "^4.3"
|
||||
"symfony/framework-bundle": "^4.3",
|
||||
"twig/intl-extra": "^2.12",
|
||||
"twig/twig": "^2.12"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpspec/phpspec": "^5.0",
|
||||
"phpunit/phpunit": "^7.0",
|
||||
"symfony/dependency-injection": "^4.3"
|
||||
},
|
||||
"conflict": {
|
||||
"twig/twig": "^1.0"
|
||||
},
|
||||
"config": {
|
||||
"bin-dir": "bin"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
"php": "^7.2",
|
||||
|
||||
"ramsey/uuid": "^3.7",
|
||||
"sonata-project/intl-bundle": "^2.2",
|
||||
"stof/doctrine-extensions-bundle": "^1.2",
|
||||
"sylius/attribute": "^1.2",
|
||||
"sylius/resource-bundle": "^1.2",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
"jms/serializer-bundle": "^2.0",
|
||||
"knplabs/gaufrette": "^0.8",
|
||||
"knplabs/knp-gaufrette-bundle": "^0.7",
|
||||
"sonata-project/intl-bundle": "^2.2",
|
||||
"swiftmailer/swiftmailer": "^6.0",
|
||||
"sylius/addressing-bundle": "^1.2",
|
||||
"sylius/attribute-bundle": "^1.2",
|
||||
|
|
@ -64,9 +63,6 @@
|
|||
"phpunit/phpunit": "^7.0",
|
||||
"symfony/dependency-injection": "^4.3"
|
||||
},
|
||||
"conflict": {
|
||||
"twig/twig": "^1.0"
|
||||
},
|
||||
"config": {
|
||||
"bin-dir": "bin"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
{{ order.currencyCode }}
|
||||
</div>
|
||||
<div class="item">
|
||||
{{ flags.fromLocaleCode(order.localeCode) }}{{ order.localeCode|locale }}
|
||||
{{ flags.fromLocaleCode(order.localeCode) }}{{ order.localeCode|locale_name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
{{ order.currencyCode }}
|
||||
</div>
|
||||
<div class="item" id="sylius-order-locale-name">
|
||||
{{ flags.fromLocaleCode(sylius.localeCode) }}{{ sylius.localeCode|locale }}
|
||||
{{ flags.fromLocaleCode(sylius.localeCode) }}{{ sylius.localeCode|locale_name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<tr>
|
||||
<td class="sylius-product-attribute-name" {{ sylius_test_html_attribute('product-attribute-name', attribute.name) }}>{{ attribute.name }}</td>
|
||||
<td class="sylius-product-attribute-value" {{ sylius_test_html_attribute('product-attribute-value', attribute.name) }}>
|
||||
{% include [('@SyliusAttribute/Types/'~attribute.attribute.type~'.html.twig'), '@SyliusAttribute/Types/default.html.twig'] with {'attribute': attribute, 'locale': configuration.request.locale, 'fallbackLocale': configuration.request.defaultLocale} %}
|
||||
{% include [('@SyliusShop/Product/Show/Types/'~attribute.attribute.type~'.html.twig'), '@SyliusShop/Product/Show/Types/default.html.twig'] with {'attribute': attribute, 'locale': configuration.request.locale, 'fallbackLocale': configuration.request.defaultLocale} %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
{{ attribute.value }}
|
||||
|
|
@ -28,12 +28,12 @@
|
|||
"require": {
|
||||
"php": "^7.2",
|
||||
|
||||
"sonata-project/intl-bundle": "^2.2",
|
||||
"sylius/core-bundle": "^1.2",
|
||||
"sylius/ui-bundle": "^1.2",
|
||||
"symfony/framework-bundle": "^4.3",
|
||||
"symfony/security-bundle": "^4.3",
|
||||
"twig/twig": "^2.6"
|
||||
"twig/intl-extra": "^2.12",
|
||||
"twig/twig": "^2.12"
|
||||
},
|
||||
"require-dev": {
|
||||
"matthiasnoback/symfony-config-test": "^4.0",
|
||||
|
|
|
|||
|
|
@ -518,9 +518,6 @@
|
|||
"sonata-project/doctrine-extensions": {
|
||||
"version": "1.3.1"
|
||||
},
|
||||
"sonata-project/intl-bundle": {
|
||||
"version": "2.5.0"
|
||||
},
|
||||
"squizlabs/php_codesniffer": {
|
||||
"version": "3.3.1"
|
||||
},
|
||||
|
|
@ -854,6 +851,9 @@
|
|||
"ref": "ddb2e0a77773b7fd75d8d649545f174e664500ab"
|
||||
}
|
||||
},
|
||||
"twig/intl-extra": {
|
||||
"version": "v2.12.2"
|
||||
},
|
||||
"twig/twig": {
|
||||
"version": "v2.5.0"
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue