Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
Translate flash messages
Browse files Browse the repository at this point in the history
  • Loading branch information
wbloszyk committed Jul 21, 2020
1 parent e370042 commit 087eb4c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
6 changes: 4 additions & 2 deletions src/BasketBundle/Controller/BasketController.php
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,8 @@ public function deliveryAddressStepAction(Request $request)

$this->get('sonata.customer.manager')->save($customer);

$this->get('session')->getFlashBag()->add('sonata_customer_success', 'address_add_success');
$message = $this->get('translator')->trans('address_add_success', [], 'SonataCustomerBundle');
$this->get('session')->getFlashBag()->add('sonata_customer_success', $message);
}

$basket->setCustomer($customer);
Expand Down Expand Up @@ -439,7 +440,8 @@ public function paymentAddressStepAction(Request $request)

$this->get('sonata.customer.manager')->save($customer);

$this->get('session')->getFlashBag()->add('sonata_customer_success', 'address_add_success');
$message = $this->get('translator')->trans('address_add_success', [], 'SonataCustomerBundle');
$this->get('session')->getFlashBag()->add('sonata_customer_success', $message);
}

$basket->setCustomer($customer);
Expand Down
6 changes: 4 additions & 2 deletions src/CustomerBundle/Controller/CustomerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ public function deleteAddressAction(Request $request, $id)

$this->getAddressManager()->delete($address);

$this->get('session')->getFlashBag()->add('sonata_customer_success', 'customer_address_delete');
$message = $this->get('translator')->trans('customer_address_delete', [], 'SonataCustomerBundle');
$this->get('session')->getFlashBag()->add('sonata_customer_success', $message);

return new RedirectResponse($this->generateUrl('sonata_customer_addresses'));
}
Expand Down Expand Up @@ -170,7 +171,8 @@ protected function updateAddress($id = null)

$this->getCustomerManager()->save($customer);

$this->get('session')->getFlashBag()->add('sonata_customer_success', $id ? 'address_edit_success' : 'address_add_success');
$message = $this->get('translator')->trans($id ? 'address_edit_success' : 'address_add_success', [], 'SonataCustomerBundle');
$this->get('session')->getFlashBag()->add('sonata_customer_success', $message);

$url = $this->get('session')->get('sonata_address_redirect', $this->generateUrl('sonata_customer_addresses'));

Expand Down
3 changes: 2 additions & 1 deletion src/OrderBundle/Controller/OrderCRUDController.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public function generateInvoiceAction()
$this->getInvoiceTransformer()->transformFromOrder($order, $invoice);
$this->getInvoiceManager()->save($invoice);

$this->addFlash('sonata_flash_success', $this->get('translator')->trans('oRDER_TO_INVOICE_generate_success', [], 'SonataOrderBundle'));
$message = $this->get('translator')->trans('oRDER_TO_INVOICE_generate_success', [], 'SonataOrderBundle');
$this->addFlash('sonata_flash_success', $message);
}

return $this->redirect($this->generateUrl('admin_sonata_invoice_invoice_edit', ['id' => $invoice->getId()]));
Expand Down
3 changes: 2 additions & 1 deletion src/ProductBundle/Controller/BaseProductController.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ public function variationToProductAction(Request $request, ProductInterface $pro
return new JsonResponse(['error' => $this->get('translator')->trans('variation_not_found', [], 'SonataProductBundle')]);
}

$this->get('session')->getFlashBag()->add('sonata_product_error', 'variation_not_found');
$message = $this->get('translator')->trans('variation_not_found', [], 'SonataProductBundle');
$this->get('session')->getFlashBag()->add('sonata_product_error', $message);

// Go to master product
$variation = $product;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,17 @@ public function createAction(?Request $request = null)

$manager->persist($variation);
} catch (\Exception $e) {
$this->addFlash('sonata_flash_error', 'flash_create_variation_error');
$message = $this->getTranslator()->trans('flash_create_variation_error', [], 'SonataProductBundle');
$this->addFlash('sonata_flash_error', $message);

return new RedirectResponse($this->admin->generateUrl('create'));
}
}

$manager->flush();

$this->addFlash('sonata_flash_success', $this->getTranslator()->trans('flash_create_variation_success', [], 'SonataProductBundle'));
$message = $this->getTranslator()->trans('flash_create_variation_success', [], 'SonataProductBundle');
$this->addFlash('sonata_flash_success', $message);

return new RedirectResponse($this->admin->generateUrl('list'));
}
Expand Down

0 comments on commit 087eb4c

Please sign in to comment.