Skip to content

Commit c7cf1db

Browse files
committed
Utilisation de TranslatedString
1 parent 08029ee commit c7cf1db

25 files changed

+245
-509
lines changed

app/AppKernel.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
44
use FOS\RestBundle\FOSRestBundle;
5+
use Mnapoli\Translated\Integration\Symfony2\TranslatedBundle;
56
use Mopa\Bundle\BootstrapBundle\MopaBootstrapBundle;
67
use MyCLabs\UnitBundle\UnitBundle;
78
use Sensio\Bundle\DistributionBundle\SensioDistributionBundle;
89
use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
910
use Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle;
1011
use Sonata\IntlBundle\SonataIntlBundle;
11-
use Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle;
1212
use Symfony\Bundle\AsseticBundle\AsseticBundle;
1313
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
1414
use Symfony\Bundle\MonologBundle\MonologBundle;
1515
use Symfony\Bundle\SecurityBundle\SecurityBundle;
16-
use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
1716
use Symfony\Bundle\TwigBundle\TwigBundle;
1817
use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
1918
use Symfony\Component\HttpKernel\Kernel;
@@ -28,14 +27,13 @@ public function registerBundles()
2827
new SecurityBundle(),
2928
new TwigBundle(),
3029
new MonologBundle(),
31-
new SwiftmailerBundle(),
3230
new AsseticBundle(),
3331
new DoctrineBundle(),
34-
new StofDoctrineExtensionsBundle(),
3532
new SensioFrameworkExtraBundle(),
3633
new MopaBootstrapBundle(),
3734
new FOSRestBundle(),
3835
new SonataIntlBundle(),
36+
new TranslatedBundle(),
3937
new UnitBundle(),
4038
];
4139

app/config/config.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
use Doctrine\ORM\EntityManager;
4+
use Mnapoli\Translated\Translator;
45
use Psr\Log\LoggerInterface;
56
use Symfony\Component\Translation\TranslatorInterface;
67

@@ -9,4 +10,7 @@
910
LoggerInterface::class => DI\link('logger'),
1011
EntityManager::class => DI\link('doctrine.orm.entity_manager'),
1112
TranslatorInterface::class => DI\link('translator'),
13+
14+
Translator::class => DI\object()
15+
->constructor(DI\link('locale')),
1216
];

app/config/config.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,16 @@ doctrine:
5858
mappings:
5959
UnitBundle:
6060
type: yml
61-
gedmo_translatable:
62-
type: annotation
63-
prefix: Gedmo\Translatable\Entity
64-
dir: "%kernel.root_dir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Translatable/Entity"
65-
alias: GedmoTranslatable
66-
is_bundle: false
67-
68-
# Swiftmailer Configuration
69-
swiftmailer:
70-
transport: %mailer_transport%
71-
host: %mailer_host%
72-
username: %mailer_user%
73-
password: %mailer_password%
74-
spool: { type: memory }
75-
76-
stof_doctrine_extensions:
77-
default_locale: en
78-
translation_fallback: true
79-
persist_default_translation: true
80-
orm:
81-
default:
82-
translatable: true
8361

8462
fos_rest:
8563
routing_loader:
8664
default_format: json
8765
service:
8866
serializer: serializer
8967

68+
translated:
69+
default_locale: "%locale%"
70+
9071
parameters:
9172
default_locale: %locale%
9273
available_locales: [ en, fr ]

app/config/config_dev.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ monolog:
2626

2727
assetic:
2828
use_controller: true
29-
30-
#swiftmailer:
31-
# delivery_address: [email protected]

app/config/config_test.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ web_profiler:
1212
toolbar: false
1313
intercept_redirects: false
1414

15-
swiftmailer:
16-
disable_delivery: true
17-
1815
# Uses sqlite
1916
doctrine:
2017
dbal:

app/config/parameters.yml.dist

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,5 @@ parameters:
66
database_user: root
77
database_password: ~
88

9-
mailer_transport: smtp
10-
mailer_host: 127.0.0.1
11-
mailer_user: ~
12-
mailer_password: ~
13-
149
locale: en
1510
secret: ThisTokenIsNotSoSecretChangeIt

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,18 @@
1616
"doctrine/doctrine-bundle": "~1.2",
1717
"twig/extensions": "~1.0",
1818
"symfony/assetic-bundle": "~2.3",
19-
"symfony/swiftmailer-bundle": "~2.3",
2019
"symfony/monolog-bundle": "~2.3",
2120
"sensio/distribution-bundle": "~2.3",
2221
"sensio/framework-extra-bundle": "~2.3",
2322
"sensio/generator-bundle": "~2.3",
2423
"incenteev/composer-parameter-handler": "~2.0",
25-
"gedmo/doctrine-extensions": "~2.3",
26-
"stof/doctrine-extensions-bundle": "~1.0",
2724
"mopa/bootstrap-bundle": "v3.0.0-beta3",
2825
"friendsofsymfony/rest-bundle": "dev-master",
2926
"sonata-project/intl-bundle": "~2.0",
3027
"jms/parser-lib": "~1.0",
3128
"mnapoli/php-di": "~4.1",
3229
"mnapoli/php-di-symfony2": "*",
30+
"mnapoli/doctrine-translated": "dev-master",
3331
"myclabs/units-api": "dev-master"
3432
},
3533
"scripts": {

0 commit comments

Comments
 (0)