diff --git a/resources/ts/back/Components/GoToFrontView.tsx b/resources/ts/back/Components/GoToFrontView.tsx index 407a16c0..b247f0da 100644 --- a/resources/ts/back/Components/GoToFrontView.tsx +++ b/resources/ts/back/Components/GoToFrontView.tsx @@ -24,6 +24,9 @@ interface GoToFrontViewProps { /** Set visually in column */ isColumn?: boolean, + + /** Add locale to the url */ + addLocale?: boolean, } export default function GoToFrontView({ @@ -32,6 +35,7 @@ export default function GoToFrontView({ additionalGroupPath = null, isAvailable = false, isColumn = false, + addLocale = true, }: GoToFrontViewProps) { const { locale, url } = usePage().props.appEnv as AppEnv; @@ -41,8 +45,10 @@ export default function GoToFrontView({ }, }); + const cleanUrl = url.endsWith("/") ? url.slice(0, -1) : url; + const definitivePath = [ - url + (locale === "fr" ? '' : '/' + locale), + cleanUrl + (addLocale ? (locale === "fr" ? '' : '/' + locale) : ''), additionalGroupPath, pathField, ] diff --git a/resources/ts/back/Components/Inputs/Wysiwyg/Plugins/Link/LinkButton.tsx b/resources/ts/back/Components/Inputs/Wysiwyg/Plugins/Link/LinkButton.tsx index 1740d3e5..534bf8ef 100644 --- a/resources/ts/back/Components/Inputs/Wysiwyg/Plugins/Link/LinkButton.tsx +++ b/resources/ts/back/Components/Inputs/Wysiwyg/Plugins/Link/LinkButton.tsx @@ -496,9 +496,14 @@ export default function LinkButton({ editor, tooltip } : LinkProps) { {selectedEntryUrl ? ( ) : ( {useTrans('back.wysiwyg_plugins.link.link')}