diff --git a/composer.json b/composer.json index f1871ad1..6c67a564 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "symfony/orm-pack": "^1.0", "symfony/profiler-pack": "^1.0", "symfony/security-bundle": "^4.0", + "symfony/translation": "^4.0", "symfony/twig-bundle": "^4.0", "symfony/validator": "^4.0", "symfony/yaml": "^4.0" diff --git a/composer.lock b/composer.lock index 0529081c..54f7abba 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "60a481bcfc7c5465c831c26c20d2d7f6", + "content-hash": "ef9a215401e1fec51336e1d6a9df52d9", "packages": [ { "name": "catalyst/auth-bundle", @@ -4517,6 +4517,82 @@ "homepage": "https://symfony.com", "time": "2019-05-27T08:16:38+00:00" }, + { + "name": "symfony/translation", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "4e3e39cc485304f807622bdc64938e4633396406" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/4e3e39cc485304f807622bdc64938e4633396406", + "reference": "4e3e39cc485304f807622bdc64938e4633396406", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^1.1.2" + }, + "conflict": { + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" + }, + "provide": { + "symfony/translation-implementation": "1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/service-contracts": "^1.1.2", + "symfony/var-dumper": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "psr/log-implementation": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "https://symfony.com", + "time": "2019-07-18T10:34:59+00:00" + }, { "name": "symfony/translation-contracts", "version": "v1.1.2", diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml new file mode 100644 index 00000000..05a2b3d8 --- /dev/null +++ b/config/packages/translation.yaml @@ -0,0 +1,6 @@ +framework: + default_locale: en + translator: + default_path: '%kernel.project_dir%/translations' + fallbacks: + - en diff --git a/public/moogle-assets/74fdd1d049be99432a128ee40e93bff7.png b/public/moogle-assets/74fdd1d049be99432a128ee40e93bff7.png new file mode 100755 index 00000000..80d66ad8 Binary files /dev/null and b/public/moogle-assets/74fdd1d049be99432a128ee40e93bff7.png differ diff --git a/public/moogle-assets/moogle_face_icon.ico b/public/moogle-assets/moogle_face_icon.ico new file mode 100755 index 00000000..104dfbbb Binary files /dev/null and b/public/moogle-assets/moogle_face_icon.ico differ diff --git a/public/moogle-assets/moogleicon.ico b/public/moogle-assets/moogleicon.ico new file mode 100755 index 00000000..35d24ed3 Binary files /dev/null and b/public/moogle-assets/moogleicon.ico differ diff --git a/public/moogle-assets/stuffed_animal_moogle.ico b/public/moogle-assets/stuffed_animal_moogle.ico new file mode 100755 index 00000000..87451007 Binary files /dev/null and b/public/moogle-assets/stuffed_animal_moogle.ico differ diff --git a/public/moogle-assets/yellow_moogle.ico b/public/moogle-assets/yellow_moogle.ico new file mode 100755 index 00000000..f39b5433 Binary files /dev/null and b/public/moogle-assets/yellow_moogle.ico differ diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 8e1afedd..8e9c7d46 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -42,6 +42,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Contracts\Translation\TranslatorInterface; use Catalyst\MenuBundle\Annotation\Menu; @@ -1918,7 +1919,7 @@ class JobOrderController extends Controller } - public function pdfForm(Request $req, $id) + public function pdfForm(Request $req, $id, TranslatorInterface $translator) { $this->denyAccessUnlessGranted('jo_pdf.list', null, 'No access.'); @@ -1934,10 +1935,14 @@ class JobOrderController extends Controller // set output filename $filename = 'job-order-' . $obj->getID() . '.pdf'; + // translate the title and the logo for the pdf + $translated_title = $translator->trans('jo_title_pdf'); + $translated_logo = $translator->trans('image_jo_pdf'); + // generate the pdf $pdf = new FPDF('P', 'mm', 'letter'); $pdf->AddPage(); - $pdf->SetTitle('Motolite Res-Q Job Order #' . $obj->getID()); + $pdf->setTitle($translated_title . ' #' . $obj->getID()); $pdf->SetFillColor(211, 211, 211); // style defaults @@ -1957,7 +1962,7 @@ class JobOrderController extends Controller $val_width = 60; // insert the logo - $image_path = $this->get('kernel')->getProjectDir() . '/public/assets/images/logo-resq.png'; + $image_path = $this->get('kernel')->getProjectDir() . $translated_logo; $pdf->Image($image_path, $col1_x, 10); // insert JO number diff --git a/symfony.lock b/symfony.lock index dbf607a5..81b878d9 100644 --- a/symfony.lock +++ b/symfony.lock @@ -293,6 +293,19 @@ "symfony/thanks": { "version": "v1.1.0" }, + "symfony/translation": { + "version": "3.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "3.3", + "ref": "2ad9d2545bce8ca1a863e50e92141f0b9d87ffcd" + }, + "files": [ + "config/packages/translation.yaml", + "translations/.gitignore" + ] + }, "symfony/translation-contracts": { "version": "v1.1.2" }, diff --git a/templates/base.html.twig b/templates/base.html.twig index d1875e70..3ef5e050 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -5,7 +5,7 @@ - {% block title %}Motolite Res-Q{% endblock %} + {% block title %}{% trans %}block_title{% endtrans %}{% endblock %} @@ -29,8 +29,8 @@ - - + + @@ -52,7 +52,7 @@
@@ -676,7 +676,7 @@
- {{ "now"|date("Y") }} © Motolite Res-Q + {{ "now"|date("Y") }} © {% trans %}copyright{% endtrans %}
diff --git a/templates/battery-size/form.html.twig b/templates/battery-size/form.html.twig index b89d5fd2..1af1f342 100644 --- a/templates/battery-size/form.html.twig +++ b/templates/battery-size/form.html.twig @@ -46,7 +46,7 @@
@@ -55,7 +55,7 @@
@@ -64,7 +64,7 @@
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig index 8f3ffd32..58d35568 100644 --- a/templates/customer/form.html.twig +++ b/templates/customer/form.html.twig @@ -375,7 +375,7 @@ diff --git a/templates/login.html.twig b/templates/login.html.twig index a9b8343e..a8455dc5 100644 --- a/templates/login.html.twig +++ b/templates/login.html.twig @@ -4,7 +4,7 @@ - Motolite Res-Q | Login + {% trans %}title_login{% endtrans %} @@ -24,7 +24,7 @@ - + @@ -36,13 +36,13 @@