From 8d403a1d83fc7cf30c4ffb4f28481004f9b63fe1 Mon Sep 17 00:00:00 2001 From: Nicolaas / Sunny Side Up Date: Tue, 10 Jan 2023 10:16:09 +1300 Subject: [PATCH 1/3] PATCH: fixing jquery link to thirdparty/jquery-query/jquery.query.js --- code/Controllers/ContentController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 3fcb51f9..7e8b5c92 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -352,7 +352,7 @@ class ContentController extends Controller if (Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) { if ($this->dataRecord) { Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css'); - Requirements::javascript('silverstripe/admin: thirdparty/jquery/jquery.js'); + Requirements::javascript('silverstripe/admin: thirdparty/jquery-query/jquery.query.js'); Requirements::javascript('silverstripe/cms: client/dist/js/SilverStripeNavigator.js'); $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord); From 79acadc0bba1b84c1d4d9f85d8a0281e3c10fb43 Mon Sep 17 00:00:00 2001 From: Nicolaas / Sunny Side Up Date: Thu, 12 Jan 2023 07:05:25 +1300 Subject: [PATCH 2/3] PATCH: remove jQuery reference --- code/Controllers/ContentController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 7e8b5c92..bdfa42d7 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -352,7 +352,6 @@ class ContentController extends Controller if (Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) { if ($this->dataRecord) { Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css'); - Requirements::javascript('silverstripe/admin: thirdparty/jquery-query/jquery.query.js'); Requirements::javascript('silverstripe/cms: client/dist/js/SilverStripeNavigator.js'); $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord); From a51effa2acdcb3eed04949900ea987a0ee40076c Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 6 Nov 2023 16:27:45 +1300 Subject: [PATCH 3/3] TLN Update translations --- lang/fr.yml | 1 + lang/nl.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lang/fr.yml b/lang/fr.yml index 2ea79b38..f1c82396 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -267,6 +267,7 @@ fr: db_Sort: Tri db_Title: Titre db_URLSegment: 'Segment d''URL' + db_Version: Version has_one_Parent: 'Page parente' many_many_BackLinkTracking: 'Suivi des liens retour' many_many_ImageTracking: 'Suivi des images' diff --git a/lang/nl.yml b/lang/nl.yml index e48df456..d6a232c3 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -289,6 +289,9 @@ nl: one: '1 pagina link' other: '{count} pagina links' SINGULARNAME: 'Pagina link' + has_one_Parent: Bovenliggende + SilverStripe\CMS\Model\SiteTreeLinkTracking: + many_many_LinkTracking: 'Links volgen' SilverStripe\CMS\Model\VirtualPage: CHOOSE: 'Gekoppelde pagina' DESCRIPTION: 'Toont de inhoud van een andere pagina'