From fd02763c6eb95044e4dd06526f1e148833e1fac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9stor=20de=20Dios=20Fern=C3=A1ndez?=
 <nestordedios@outlook.es>
Date: Tue, 4 Aug 2020 09:38:51 +0200
Subject: [PATCH 1/2] Move concatenated 'website' string to translation file

---
 templates/_base/layout.html.twig | 2 +-
 translations/messages.en.xlf     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/_base/layout.html.twig b/templates/_base/layout.html.twig
index c1c43a539..a42cc87a8 100644
--- a/templates/_base/layout.html.twig
+++ b/templates/_base/layout.html.twig
@@ -28,7 +28,7 @@
         {# Setting the labels and their localisations that are used in the sidebar-menu. #}
         {% set labels = {
             'about.bolt_documentation': 'about.bolt_documentation'|trans,
-            'action.view_site': 'action.view'|trans ~ ' website',
+            'action.view_site': 'action.view'|trans,
             'action.create_new': 'action.create_new'|trans,
             'general.greeting': 'general.greeting'|trans({'%name%': user_display_name}),
             'action.logout': 'action.logout'|trans,
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index dcb0e82d8..38ff38cc4 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -1122,7 +1122,7 @@
     <unit id="TtmWqX3" name="action.view">
       <segment>
         <source>action.view</source>
-        <target>View</target>
+        <target>View website</target>
       </segment>
     </unit>
     <unit id="I2ykiIZ" name="caption.folders">

From 2f8019ae36d9b0cdd270fec51742227506af419d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9stor=20de=20Dios=20Fern=C3=A1ndez?=
 <nestordedios@outlook.es>
Date: Tue, 4 Aug 2020 10:09:44 +0200
Subject: [PATCH 2/2] Run make csfix

---
 src/Entity/Field.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Entity/Field.php b/src/Entity/Field.php
index 4e4c11d9b..6c9baaf67 100644
--- a/src/Entity/Field.php
+++ b/src/Entity/Field.php
@@ -93,6 +93,7 @@ public function __call(string $key = '', array $arguments = [])
             // If value is field, return getTwigValue so that {{ value }}
             // is parsed as html, rather than __toString() which is escaped
             $value = $value[$key];
+
             return $value instanceof self ? $value->getTwigValue() : $value;
         }