Merge branch '1.1.x' of https://github.com/braune-digital/BrauneDigit…

…alTranslationBaseBundle

BrauneDigitalTranslationBaseBundle.php

@@ -2,8 +2,15 @@
 
 namespace BrauneDigital\TranslationBaseBundle;
 
+use BrauneDigital\TranslationBaseBundle\DependencyInjection\Compiler\RouterInjectionPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class BrauneDigitalTranslationBaseBundle extends Bundle
 {
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+        $container->addCompilerPass(new RouterInjectionPass());
+    }
 }

Command/ImportLanguagesCommand.php

@@ -2,16 +2,13 @@
 
 namespace BrauneDigital\TranslationBaseBundle\Command;
 
-use Likez\BaseBundle\Entity\OperatorMail;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Likez\BaseBundle\Entity\Mail;
-
 class ImportLanguagesCommand extends ContainerAwareCommand
 {
 	protected function configure()

DependencyInjection/BrauneDigitalTranslationBaseExtension.php

@@ -20,8 +20,20 @@ class BrauneDigitalTranslationBaseExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
+
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $bundles = $container->getParameter('kernel.bundles');
+
+
+        if($config['routing']) {
+            $loader->load('routing_services.yml');
+            $container->setParameter('braune_digital.translation_base.use_routing', true);
+        }
+
+        if($config['admin'] && isset($bundles['SonataAdminBundle'])) {
+            $loader->load('admin.yml');
+        }
     }
-}
+}

DependencyInjection/Compiler/RouterInjectionPass.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace BrauneDigital\TranslationBaseBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Class RouterInjectionPass
+ *
+ * @package BrauneDigital\TranslationBaseBundle\DependencyInjection\Compiler
+ */
+class RouterInjectionPass implements CompilerPassInterface
+{
+    /**
+     * @param ContainerBuilder $container
+     * Inject the service router as the normal router
+     */
+    public function process(ContainerBuilder $container) {
+        if($container->hasParameter('braune_digital.translation_base.use_routing') && $container->getParameter('braune_digital.translation_base.use_routing')) {
+            $container->setAlias('router', 'braune_digital.translation_base.routing.service_router');
+        }
+    }
+}

DependencyInjection/Configuration.php

@@ -2,6 +2,7 @@
 
 namespace BrauneDigital\TranslationBaseBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -18,9 +19,25 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('braunedigital_mail');
+        $rootNode = $treeBuilder->root('braune_digital_translation_base');
 
+        $this->addAdminSection($rootNode);
+        $this->addRoutingSection($rootNode);
 
         return $treeBuilder;
     }
+
+    /**
+     * @param $rootNode
+     */
+    protected function addAdminSection(ArrayNodeDefinition $rootNode) {
+        $rootNode->children()->booleanNode('admin')->defaultTrue();
+    }
+
+    /**
+     * @param $rootNode
+     */
+    protected function addRoutingSection(ArrayNodeDefinition $rootNode) {
+        $rootNode->children()->booleanNode('routing')->defaultFalse();
+    }
 }

Form/TranslationType.php

@@ -2,7 +2,6 @@
 
 namespace BrauneDigital\TranslationBaseBundle\Form;
 
-use Application\AppBundle\Services\LocaleOptions;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
@@ -44,11 +43,7 @@ public function __construct(RequestStack $requestStack, Container $container) {
 		$this->container = $container;
 
 		// Get current locale
-		if ($this->request->get('object_locale')) {
-			$this->currentLocale = array($this->request->get('object_locale'));
-		} else {
-			$this->currentLocale = array('en');
-		}
+		$this->currentLocale = $this->request->get('object_locale', $this->container->getParameter('locale'));
 	}
 
 	/**
@@ -72,10 +67,15 @@ public function buildTranslations(FormBuilderInterface $builder) {
 	}
 
 	public function getDisabled(FormBuilderInterface $builder) {
-		if (!$builder->getData()->getDefaultLanguage()) {
-			return false;
+		if(method_exists($builder->getData(), 'getDefaultLanguage')) {
+
+			if (!$builder->getData()->getDefaultLanguage()) {
+				return false;
+			}
+			return ($this->currentLocale == $builder->getData()->getDefaultLanguage()->getCode()) ? false : true;
+		} else {
+			return $this->currentLocale !=  $this->container->getParameter('locale');
 		}
-		return ($this->currentLocale[0] == $builder->getData()->getDefaultLanguage()->getCode()) ? false : true;
 	}
 
 	/**
@@ -90,6 +90,4 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 		$view->vars['currentTranslation'] = $this->container->get('doctrine')->getRepository('BrauneDigitalTranslationBaseBundle:Language')->findOneBy(array('code' => $this->request->get('object_locale')));
 
 	}
-
-
 }

Model/Translatable/TranslatableMethods.php

@@ -144,4 +144,39 @@ public function setNewTranslations($newTranslations)
 	{
 		$this->newTranslations = $newTranslations;
 	}
+
+	/**
+	 * @param $name
+	 * generic translation
+	 * @return mixed
+	 */
+	public function translateProperty($name) {
+		$functionName = 'get' . ucfirst($name);
+		$value = $this->translate()->$functionName();
+
+		if ($value) {
+			return $value;
+		} else {
+			return $this->translate($this->getDefaultLocale())->$functionName();
+		}
+	}
+
+	/**
+	 * @param $name
+	 * proxy getter for translation values
+	 * @return mixed
+	 */
+	public function __get($name) {
+		return $this->translateProperty($name);
+	}
+
+	/**
+	 * @param $name
+	 * proxy setter for translation values
+	 * @return mixed
+	 */
+	public function __set($name, $value) {
+		$functionName = 'set' . ucfirst($name);
+		$value = $this->translate()->$functionName($value);
+	}
 }

README.md

@@ -213,3 +213,4 @@ class EntityAdmin extends TranslationAdmin
 This Bundle also provides a basic Language Entity, which can be managed through SonataAdmin as well.
 ## Todo
 Add requirements with versions in `composer.json`.
+A caching mechanism is needed for the service Router. The Symfony2 router creates own instances and caches them. The service Router however is not able to do that, but maybe a RouteCollection cache would speed things up ;)

Resources/config/routing_services.yml

@@ -0,0 +1,34 @@
+parameters:
+    braune_digital.translation_base.routing.locales: "%locales%"
+    braune_digital.translation_base.routing.default_locale: "%locale%"
+
+services:
+    braune_digital.translation_base.routing.generator:
+        class: "BrauneDigital\\TranslationBaseBundle\\Routing\\LocalizedUrlGenerator"
+        arguments:
+            - "@logger"
+            - "%braune_digital.translation_base.routing.locales%"
+            - "%braune_digital.translation_base.routing.default_locale%"
+
+    braune_digital.translation_base.routing.matcher:
+        class: "BrauneDigital\\TranslationBaseBundle\\Routing\\LocalizedUrlMatcher"
+        arguments:
+            - "%braune_digital.translation_base.routing.locales%"
+            - "%braune_digital.translation_base.routing.default_locale%"
+
+    braune_digital.translation_base.routing.service_router:
+        class: "BrauneDigital\\TranslationBaseBundle\\Routing\\ServiceRouter"
+        tags:
+            - {name: "monolog.logger", channel: "router"}
+        arguments:
+            - "@service_container"
+            - "%router.resource%"
+            - "@router.request_context"
+            - "braune_digital.translation_base.routing.generator"
+            - "braune_digital.translation_base.routing.matcher"
+
+    braune_digital.translation_base.routing.loader.yaml:
+        class: "BrauneDigital\\TranslationBaseBundle\\Routing\\YamlLocalizedLoader"
+        arguments: ["@file_locator", "%braune_digital.translation_base.routing.locales%"]
+        tags:
+            - { name: routing.loader }

Resources/views/admin/translation_layout.html.twig

@@ -1,4 +1,4 @@
-{% extends "SonataAdminBundle:standard_layout.html.twig" %}
+{% extends "SonataAdminBundle::standard_layout.html.twig" %}
 
  {% block sonata_page_content_nav %}
      {% if _tab_menu is not empty or _actions is not empty %}