From 7283a283d4e0692e746dcb1f29f4ef3603aa26f2 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sat, 21 Oct 2017 09:47:20 -0700 Subject: [PATCH 1/6] Adding PHP translation --- .../0.4/config/packages/dev/php_translation.yaml | 3 +++ .../0.4/config/packages/php_translation.yaml | 14 ++++++++++++++ .../0.4/config/routes/dev/php_translation.yaml | 6 ++++++ .../0.4/config/routes/php_translation.yaml | 3 +++ php-translation/symfony-bundle/0.4/manifest.json | 5 +++++ 5 files changed, 31 insertions(+) create mode 100644 php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml create mode 100644 php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml create mode 100644 php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml create mode 100644 php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml create mode 100644 php-translation/symfony-bundle/0.4/manifest.json diff --git a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml new file mode 100644 index 00000000..17d71c8a --- /dev/null +++ b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml @@ -0,0 +1,3 @@ +translation: + symfony_profiler: # must be placed in config_dev.yml + enabled: true diff --git a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml new file mode 100644 index 00000000..f30549dd --- /dev/null +++ b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml @@ -0,0 +1,14 @@ +translation: + locales: ["en", "sv", "fr"] + webui: + enabled: true + edit_in_place: + enabled: false + config_name: app + activator: php_translation.edit_in_place.activator + configs: + app: + dirs: ["%kernel.project_dir%/templates", "%kernel.root_dir%/src"] + output_dir: "%kernel.project_dir%/Resources/translations" + excluded_names: ["*TestCase.php", "*Test.php"] + excluded_dirs: [cache, data, logs] \ No newline at end of file diff --git a/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml new file mode 100644 index 00000000..fb63222f --- /dev/null +++ b/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml @@ -0,0 +1,6 @@ +_translation_webui: + resource: "@TranslationBundle/Resources/config/routing_webui.yml" + prefix: /admin + +_translation_profiler: + resource: '@TranslationBundle/Resources/config/routing_symfony_profiler.yml' \ No newline at end of file diff --git a/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml new file mode 100644 index 00000000..59529659 --- /dev/null +++ b/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml @@ -0,0 +1,3 @@ +_translation_edit_in_place: + resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml' + prefix: /admin \ No newline at end of file diff --git a/php-translation/symfony-bundle/0.4/manifest.json b/php-translation/symfony-bundle/0.4/manifest.json new file mode 100644 index 00000000..e164c6e6 --- /dev/null +++ b/php-translation/symfony-bundle/0.4/manifest.json @@ -0,0 +1,5 @@ +{ + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From ccb5872a855ef8103e84e857f6608ae7f6cd1ed4 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sat, 21 Oct 2017 09:48:56 -0700 Subject: [PATCH 2/6] Updated paths --- .../config/packages/dev/php_translation.yaml | 4 +-- .../0.4/config/packages/php_translation.yaml | 26 +++++++++---------- .../config/routes/dev/php_translation.yaml | 6 ++--- .../0.4/config/routes/php_translation.yaml | 4 +-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml index 17d71c8a..76db9371 100644 --- a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml @@ -1,3 +1,3 @@ translation: - symfony_profiler: # must be placed in config_dev.yml - enabled: true + symfony_profiler: # must be placed in config_dev.yml + enabled: true diff --git a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml index f30549dd..688ee54c 100644 --- a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml @@ -1,14 +1,14 @@ translation: - locales: ["en", "sv", "fr"] - webui: - enabled: true - edit_in_place: - enabled: false - config_name: app - activator: php_translation.edit_in_place.activator - configs: - app: - dirs: ["%kernel.project_dir%/templates", "%kernel.root_dir%/src"] - output_dir: "%kernel.project_dir%/Resources/translations" - excluded_names: ["*TestCase.php", "*Test.php"] - excluded_dirs: [cache, data, logs] \ No newline at end of file + locales: ["en", "sv", "fr"] + webui: + enabled: true + edit_in_place: + enabled: false + config_name: app + activator: php_translation.edit_in_place.activator + configs: + app: + dirs: ["%kernel.project_dir%/templates", "%kernel.root_dir%/src"] + output_dir: "%kernel.project_dir%/app/Resources/translations" + excluded_names: ["*TestCase.php", "*Test.php"] + excluded_dirs: [cache, data, logs] diff --git a/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml index fb63222f..cde43b84 100644 --- a/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/routes/dev/php_translation.yaml @@ -1,6 +1,6 @@ _translation_webui: - resource: "@TranslationBundle/Resources/config/routing_webui.yml" - prefix: /admin + resource: "@TranslationBundle/Resources/config/routing_webui.yml" + prefix: /admin _translation_profiler: - resource: '@TranslationBundle/Resources/config/routing_symfony_profiler.yml' \ No newline at end of file + resource: '@TranslationBundle/Resources/config/routing_symfony_profiler.yml' diff --git a/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml index 59529659..142c4496 100644 --- a/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/routes/php_translation.yaml @@ -1,3 +1,3 @@ _translation_edit_in_place: - resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml' - prefix: /admin \ No newline at end of file + resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml' + prefix: /admin From f10a0c69847b5a2334ebf66e849df97fc415f9e0 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sat, 21 Oct 2017 09:58:05 -0700 Subject: [PATCH 3/6] Register the bundle --- php-translation/symfony-bundle/0.4/manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/php-translation/symfony-bundle/0.4/manifest.json b/php-translation/symfony-bundle/0.4/manifest.json index e164c6e6..e7a617c6 100644 --- a/php-translation/symfony-bundle/0.4/manifest.json +++ b/php-translation/symfony-bundle/0.4/manifest.json @@ -1,4 +1,7 @@ { + "bundles": { + "Translation\\Bundle\\TranslationBundle": ["all"] + }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" } From 9f7e92fc06f82d50e9e755afec49d2cd44c873e6 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Tue, 14 Nov 2017 10:47:33 +0100 Subject: [PATCH 4/6] Updates according to feedback --- .../symfony-bundle/0.4/config/packages/php_translation.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml index 688ee54c..a82f3c7c 100644 --- a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml @@ -1,14 +1,13 @@ translation: - locales: ["en", "sv", "fr"] + locales: ["en"] webui: enabled: true edit_in_place: enabled: false config_name: app - activator: php_translation.edit_in_place.activator configs: app: dirs: ["%kernel.project_dir%/templates", "%kernel.root_dir%/src"] - output_dir: "%kernel.project_dir%/app/Resources/translations" + output_dir: "%kernel.project_dir%/translations" excluded_names: ["*TestCase.php", "*Test.php"] excluded_dirs: [cache, data, logs] From e89892acab0bbdfcb1ee32a57969910cd8b66605 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Tue, 14 Nov 2017 11:13:58 +0100 Subject: [PATCH 5/6] Moved config to dev --- .../0.4/config/packages/dev/php_translation.yaml | 4 +++- .../symfony-bundle/0.4/config/packages/php_translation.yaml | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml index 76db9371..6797a9aa 100644 --- a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml @@ -1,3 +1,5 @@ translation: - symfony_profiler: # must be placed in config_dev.yml + symfony_profiler: enabled: true + webui: + enabled: true \ No newline at end of file diff --git a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml index a82f3c7c..01aef083 100644 --- a/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/packages/php_translation.yaml @@ -1,7 +1,5 @@ translation: locales: ["en"] - webui: - enabled: true edit_in_place: enabled: false config_name: app From 2ab7409c4ecab9adfbd3ead121c4620ffc1e4e02 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Tue, 14 Nov 2017 11:14:39 +0100 Subject: [PATCH 6/6] Added new line --- .../symfony-bundle/0.4/config/packages/dev/php_translation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml index 6797a9aa..53398fbc 100644 --- a/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml +++ b/php-translation/symfony-bundle/0.4/config/packages/dev/php_translation.yaml @@ -2,4 +2,4 @@ translation: symfony_profiler: enabled: true webui: - enabled: true \ No newline at end of file + enabled: true