Skip to content

Merge move concatenated 'website' string to translation file into master #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
I-Valchev merged 2 commits into from
Aug 4, 2020
Merged

Merge move concatenated 'website' string to translation file into master #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd02763
Move concatenated 'website' string to translation file
nestordedios Aug 4, 2020
2f8019a
Run make csfix
nestordedios Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Entity/Field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion templates/_base/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down