Merge pull request #1678 from bolt/fix/harcoded-action-label

Merge move concatenated 'website' string to translation file into master
bolt · Aug 4, 2020 · e31e713 · e31e713
2 parents 80f4bc6 + 2f8019a
commit e31e713
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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;
         }
 

diff --git 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
@@ -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">