Merge branch 'main' into fix/dish-pin-colour

Author: warm-coolguy

packages/plugins/Attributions/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## unpublished
+
+- Fix: There were incomplete changes regarding how to write current year and month references. They have been rolled back to `<YEAR>` and `<MONTH>` in both documentation and code.
+
 ## 1.2.0
 
 - Feature: Improved implementation to make plugin SPA-ready.

packages/plugins/Attributions/README.md

@@ -28,4 +28,4 @@ All parameters are optional. However, setting neither `layerAttributions` nor `s
 | fieldName | type   | description                                                                                                                                           |
 | --------- | ------ | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
 | id        | string | ID of service the attribution relates to. The text will only be shown when the layer is visible.                                                      |
-| title     | string | Attribution text or localization key. May contain HTML. The tags `{{YEAR}}` and `{{MONTH}}` are translated to the current year or month respectively. |
+| title     | string | Attribution text or localization key. May contain HTML. The tags `<YEAR>` and `<MONTH>` are translated to the current year or month respectively. |

packages/plugins/Attributions/src/utils/lib.ts

@@ -83,6 +83,6 @@ function getVisibleAttributions(
 export function formatAttributionText(text: string): string {
   const now = new Date()
   return text
-    .replaceAll('{{YEAR}}', now.getFullYear().toString())
-    .replaceAll('{{MONTH}}', `${now.getMonth() + 1}`.padStart(2, '0'))
+    .replaceAll('<YEAR>', now.getFullYear().toString())
+    .replaceAll('<MONTH>', `${now.getMonth() + 1}`.padStart(2, '0'))
 }