Skip to content

Commit 93810cb

Browse files
author
roadiz-ci
committed
feat: Removed too technical Roadiz settings in favor of Symfony configuration parameters
1 parent 7813c6d commit 93810cb

5 files changed

Lines changed: 8 additions & 36 deletions

File tree

‎config/services.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ services:
77
bind:
88
$backofficeMenuEntries: '%roadiz_rozier.backoffice_menu_configuration%'
99
$documentPlatforms: '%roadiz_core.medias.supported_platforms%'
10+
$customPublicScheme: '%roadiz_core.custom_public_scheme%'
11+
$customPreviewScheme: '%roadiz_core.custom_preview_scheme%'
1012
$nodeFormTypeClass: '%roadiz_rozier.node_form.class%'
1113
$addNodeFormTypeClass: '%roadiz_rozier.add_node_form.class%'
1214
$googleServerId: '%roadiz_core.medias.google_server_id%'

‎templates/nodes/actionsMenu.html.twig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
{% block node_public_urls %}
6565
{# Only add preview/see button for Reachable node-types #}
6666
{% if source and source.Reachable %}
67-
{% if bags.settings.get('custom_public_scheme') %}
67+
{% if custom_public_scheme %}
6868
{% set publicUrl = url(source, {
69-
'canonicalScheme': bags.settings.get('custom_public_scheme'),
69+
'canonicalScheme': custom_public_scheme,
7070
'_no_cache': 1
7171
}) %}
7272
{% else %}
@@ -83,15 +83,15 @@
8383
</a>
8484
{% endif %}
8585
{% if node.published or node.draft or node.pending %}
86-
{% if bags.settings.get('custom_preview_scheme') %}
86+
{% if custom_preview_scheme %}
8787
{% set previewUrl = url(source, {
88-
'canonicalScheme': bags.settings.get('custom_preview_scheme'),
88+
'canonicalScheme': custom_preview_scheme,
8989
'token': createPreviewJwt(),
9090
'_no_cache': 1
9191
}) %}
92-
{% elseif bags.settings.get('custom_public_scheme') %}
92+
{% elseif custom_public_scheme %}
9393
{% set previewUrl = url(source, {
94-
'canonicalScheme': bags.settings.get('custom_public_scheme'),
94+
'canonicalScheme': custom_public_scheme,
9595
'_preview': 1,
9696
'token': createPreviewJwt(),
9797
'_no_cache': 1

‎translations/rozier/messages.xlf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,6 @@
864864
<trans-unit xml:space="preserve" id="lastest.version.installed"><source>lastest.version.installed</source></trans-unit>
865865
<trans-unit xml:space="preserve" id="latest.node-sources.updates"><source>latest.node-sources.updates</source></trans-unit>
866866
<trans-unit xml:space="preserve" id="link.folders"><source>link.folders</source></trans-unit>
867-
<trans-unit xml:space="preserve" id="maps_default_location"><source>maps_default_location</source></trans-unit>
868867
<trans-unit xml:space="preserve" id="maps_style"><source>maps_style</source></trans-unit>
869868
<trans-unit xml:space="preserve" id="metadataCache"><source>metadataCache</source></trans-unit>
870869
<trans-unit xml:space="preserve" id="minute"><source>minute</source></trans-unit>
@@ -1242,7 +1241,6 @@
12421241

12431242

12441243
<trans-unit xml:space="preserve" id="google_tag_manager_id"><source>google_tag_manager_id</source><note>Google Tag Manager setting name.</note></trans-unit>
1245-
<trans-unit xml:space="preserve" id="leaflet_map_tile_url"><source>leaflet_map_tile_url</source><note>Leaflet Map tile URL setting name.</note></trans-unit>
12461244
<trans-unit xml:space="preserve" id="twitter_access_token"><source>twitter_access_token</source><note>Setting name.</note></trans-unit>
12471245
<trans-unit xml:space="preserve" id="twitter_access_token_secret"><source>twitter_access_token_secret</source><note>Setting name.</note></trans-unit>
12481246
<trans-unit xml:space="preserve" id="instagram_access_token"><source>instagram_access_token</source><note>Setting name.</note></trans-unit>

‎translations/settings/messages.en.xlf‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111,26 +111,6 @@
111111
<target state="final">Restrict your Open ID / OAuth2 scopes. Write scopes separated with spaces. If you leave it empty, OpenID connection will try to request all available scopes from Discovery document.</target>
112112
<note>Setting description</note>
113113
</trans-unit>
114-
<trans-unit xml:space="preserve" id="custom_preview_scheme" approved="yes">
115-
<source>custom_preview_scheme</source>
116-
<target state="final">Custom preview scheme</target>
117-
<note>Setting name</note>
118-
</trans-unit>
119-
<trans-unit xml:space="preserve" id="custom_preview_scheme.help" approved="yes">
120-
<source>custom_preview_scheme.help</source>
121-
<target state="final">Replace "?_preview=1" query string to preview website content with a dedicated domain name. It can be useful when using *headless* Roadiz version.</target>
122-
<note>Setting description</note>
123-
</trans-unit>
124-
<trans-unit xml:space="preserve" id="custom_public_scheme" approved="yes">
125-
<source>custom_public_scheme</source>
126-
<target state="final">Custom public scheme</target>
127-
<note>Setting name</note>
128-
</trans-unit>
129-
<trans-unit xml:space="preserve" id="custom_public_scheme.help" approved="yes">
130-
<source>custom_public_scheme.help</source>
131-
<target state="final">Replace your public website URL with a dedicated domain name. It can be useful when using *headless* Roadiz version.</target>
132-
<note>Setting description</note>
133-
</trans-unit>
134114
<trans-unit xml:space="preserve" id="use_typed_node_names" approved="yes">
135115
<source>use_typed_node_names</source>
136116
<target state="final">Use typed node names</target>

‎translations/settings/messages.xlf‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
33
<file original="" source-language="en-US" datatype="plaintext">
44
<body>
5-
<trans-unit xml:space="preserve" id="leaflet_map_tile_url.description">
6-
<source>Default maps tiles layout when using *Leaflet*.</source>
7-
<target></target>
8-
</trans-unit>
95
<trans-unit xml:space="preserve" id="login_image.description">
106
<source>Replace random *Splashbase* login images with your own.</source>
117
<target></target>
@@ -14,10 +10,6 @@
1410
<source>Switch maintenance mode. Only login page will be available for public requests.</source>
1511
<target></target>
1612
</trans-unit>
17-
<trans-unit xml:space="preserve" id="maps_default_location.description">
18-
<source>Default maps marker location.</source>
19-
<target></target>
20-
</trans-unit>
2113
<trans-unit xml:space="preserve" id="maps_style.description">
2214
<source>Default maps tiles layout when using *Google Maps*.</source>
2315
<target></target>

0 commit comments

Comments
 (0)