From 0b71b8472389822135b5a639b745b07f2f9da2cb Mon Sep 17 00:00:00 2001 From: Nicolas PHILIPPE <nikophil@gmail.com> Date: Wed, 15 Apr 2020 09:27:05 +0200 Subject: [PATCH] Assets: use translations in form & planing --- src/Form/Type/CommissionableAssetType.php | 26 +++++++++---------- src/Migrations/Version20200414132415.php | 5 ---- .../planning/_availabilities_assets.html.twig | 16 ++++++------ translations/messages.fr.yaml | 16 ++++++++++++ 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/src/Form/Type/CommissionableAssetType.php b/src/Form/Type/CommissionableAssetType.php index 0c685129..b5372253 100644 --- a/src/Form/Type/CommissionableAssetType.php +++ b/src/Form/Type/CommissionableAssetType.php @@ -33,45 +33,45 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $builder ->add('type', ChoiceType::class, [ 'choices' => self::TYPES, - 'label' => 'Type', + 'label' => 'asset.type', ]) ->add('name', TextType::class, [ - 'label' => 'Identifiant', + 'label' => 'asset.name', ]) ->add('hasMobileRadio', ChoiceType::class, [ 'choices' => [ - 'Oui' => true, - 'Non' => false, + 'common.yes' => true, + 'common.no' => false, ], 'expanded' => true, 'multiple' => false, - 'label' => 'Présence d\'un mobile radio ?', + 'label' => 'asset.hasMobileRadio', ]) ->add('hasFirstAidKit', ChoiceType::class, [ 'choices' => [ - 'Oui' => true, - 'Non' => false, + 'common.yes' => true, + 'common.no' => false, ], 'expanded' => true, 'multiple' => false, - 'label' => 'Présence d\'un lot de secours ?', + 'label' => 'asset.hasFirstAidKit', ]) ->add('parkingLocation', TextType::class, [ 'required' => false, - 'label' => 'Lieu de stationnement', + 'label' => 'asset.parkingLocation', ]) ->add('contact', TextType::class, [ 'required' => false, - 'label' => 'Qui contacter ?', + 'label' => 'asset.contact', ]) ->add('seatingCapacity', IntegerType::class, [ - 'label' => 'Combien de places ?', + 'label' => 'asset.seatingCapacity', ]) ->add('licensePlate', TextType::class, [ - 'label' => 'Plaque d\'immatriculation', + 'label' => 'asset.licensePlate', ]) ->add('comments', TextareaType::class, [ - 'label' => 'Commentaires', + 'label' => 'asset.comments', ]) ->add('submit', SubmitType::class) ; diff --git a/src/Migrations/Version20200414132415.php b/src/Migrations/Version20200414132415.php index e03cdc4f..b3d205e9 100644 --- a/src/Migrations/Version20200414132415.php +++ b/src/Migrations/Version20200414132415.php @@ -7,9 +7,6 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -/** - * Auto-generated Migration: Please modify to your needs! - */ final class Version20200414132415 extends AbstractMigration { public function getDescription(): string @@ -19,7 +16,6 @@ public function getDescription(): string public function up(Schema $schema): void { - // this up() migration is auto-generated, please modify it to your needs $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.'); $this->addSql('ALTER TABLE commissionable_asset ADD license_plate VARCHAR(255) DEFAULT NULL, ADD comments TEXT DEFAULT NULL'); @@ -27,7 +23,6 @@ public function up(Schema $schema): void public function down(Schema $schema): void { - // this down() migration is auto-generated, please modify it to your needs $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.'); $this->addSql('ALTER TABLE commissionable_asset DROP license_plate, DROP comments'); diff --git a/templates/organization/planning/_availabilities_assets.html.twig b/templates/organization/planning/_availabilities_assets.html.twig index d246913f..97f00a62 100644 --- a/templates/organization/planning/_availabilities_assets.html.twig +++ b/templates/organization/planning/_availabilities_assets.html.twig @@ -4,17 +4,17 @@ {# columns number of blocks itemDataHeader and itemDataDetails should be the same than in _availabilities_users.html.twig #} {% block itemDataHeader %} - <th class="item-data">Radio mobile?</th> - <th class="item-data" colspan="2">Kit de premiers soins?</th> - <th class="item-data">Contact</th> - <th class="item-data" colspan="2">Lieu de stationnement</th> - <th class="item-data">Places</th> - <th class="item-data">Immatriculation</th> + <th class="item-data">{{ 'asset.planing.hasMobileRadio'|trans }}</th> + <th class="item-data" colspan="2">{{ 'asset.planing.hasFirstAidKit'|trans }}</th> + <th class="item-data">{{ 'asset.planing.contact'|trans }}</th> + <th class="item-data" colspan="2">{{ 'asset.parkingLocation'|trans }}</th> + <th class="item-data">{{ 'asset.planing.seatingCapacity'|trans }}</th> + <th class="item-data">{{ 'asset.planing.licensePlate'|trans }}</th> {% endblock itemDataHeader %} {% block itemDataDetails %} - <td class="item-data">{{ item.entity.hasMobileRadio ? 'Oui' : '-' }}</td> - <td class="item-data" colspan="2">{{ item.entity.hasFirstAidKit ? 'Oui' : '-' }}</td> + <td class="item-data">{{ item.entity.hasMobileRadio ? 'common.yes' | trans : '-' }}</td> + <td class="item-data" colspan="2">{{ item.entity.hasFirstAidKit ? 'common.yes' | trans : '-' }}</td> <td class="item-data">{{ item.entity.contact }}</td> <td class="item-data" colspan="2">{{ item.entity.parkingLocation }}</td> <td class="item-data">{{ item.entity.seatingCapacity }}</td> diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml index a442fd7f..5c41d38c 100644 --- a/translations/messages.fr.yaml +++ b/translations/messages.fr.yaml @@ -124,3 +124,19 @@ user: skills: Compétences uniform: Uniforme welcome: Bienvenue, %name% +asset: + type: Type + name: Identifiant + hasMobileRadio: Présence d'un mobile radio ? + hasFirstAidKit: Présence d'un lot de secours ? + contact: Qui contacter ? + parkingLocation: Lieu de stationnement + seatingCapacity: Combien de places ? + licensePlate: Plaque d'immatriculation + comments: Commentaires + planing: + hasMobileRadio: Mobile radio ? + hasFirstAidKit: Kit de premiers soins ? + contact: Contact + seatingCapacity: Places + licensePlate: Immatriculation