From 74504525397ac083223fff751b1d9bb4da3a1575 Mon Sep 17 00:00:00 2001
From: Oleksandr Ivanchenko <oleksandr.ivanchenko@flixbus.de>
Date: Mon, 9 May 2016 16:12:15 +0200
Subject: [PATCH 1/2] Issue #2721665 by alexsergivan: Fixed entity browser for
 multilingual content

---
 src/Controllers/EntityBrowserController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Controllers/EntityBrowserController.php b/src/Controllers/EntityBrowserController.php
index a3f546b..0ae469c 100644
--- a/src/Controllers/EntityBrowserController.php
+++ b/src/Controllers/EntityBrowserController.php
@@ -29,6 +29,12 @@ class EntityBrowserController extends ControllerBase {
    *   containing the edit form.
    */
   public function entityBrowserEdit(EntityInterface $entity) {
+    // Load the right translation for referenced entity if it's exists
+    // or create new translation if it does not exists.
+    if ($entity->isTranslatable()) {
+      $language =  $this->languageManager()->getCurrentLanguage()->getId();
+      $entity = $entity->hasTranslation($language) ? $entity->getTranslation($language) : $entity->addTranslation($language, $entity->toArray());
+    }
     // Build the entity edit form.
     $form_object = $this->entityManager()->getFormObject($entity->getEntityTypeId(), 'edit');
     $form_object->setEntity($entity);

From f24a45cead52f1a0ef35f01cabd25a7ba2300156 Mon Sep 17 00:00:00 2001
From: alexsergivan <alexsergivan@gmail.com>
Date: Mon, 9 May 2016 16:21:37 +0200
Subject: [PATCH 2/2] Issue #2721665 by alexsergivan: deleted whitespace

---
 src/Controllers/EntityBrowserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controllers/EntityBrowserController.php b/src/Controllers/EntityBrowserController.php
index 0ae469c..46781aa 100644
--- a/src/Controllers/EntityBrowserController.php
+++ b/src/Controllers/EntityBrowserController.php
@@ -32,7 +32,7 @@ public function entityBrowserEdit(EntityInterface $entity) {
     // Load the right translation for referenced entity if it's exists
     // or create new translation if it does not exists.
     if ($entity->isTranslatable()) {
-      $language =  $this->languageManager()->getCurrentLanguage()->getId();
+      $language = $this->languageManager()->getCurrentLanguage()->getId();
       $entity = $entity->hasTranslation($language) ? $entity->getTranslation($language) : $entity->addTranslation($language, $entity->toArray());
     }
     // Build the entity edit form.