Merge branch '6.2' into 6

symbiote · Aug 7, 2024 · db09634 · db09634
2 parents 071c289 + 90314a3
commit db09634
Show file tree

Hide file tree

Showing 180 changed files with 26 additions and 1,583 deletions.
diff --git a/.github/workflows/tag-patch-release.yml b/.github/workflows/tag-patch-release.yml
@@ -0,0 +1,26 @@
+name: Tag patch release
+
+on:
+ # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
+ workflow_dispatch:
+ inputs:
+ latest_local_sha:
+ description: The latest local sha
+ required: true
+ type: string
+
+permissions: {}
+
+jobs:
+ tagpatchrelease:
+ name: Tag patch release
+ # Only run cron on the symbiote account
+ if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
+ runs-on: ubuntu-latest
+ permissions:
+ contents: write
+ steps:
+ - name: Tag release
+ uses: silverstripe/gha-tag-release@v2
+ with:
+ latest_local_sha: ${{ inputs.latest_local_sha }}
diff --git a/client/lang/af.js b/client/lang/af.js
diff --git a/client/lang/ast.js b/client/lang/ast.js
diff --git a/client/lang/az.js b/client/lang/az.js
diff --git a/client/lang/bg.js b/client/lang/bg.js
diff --git a/client/lang/bs.js b/client/lang/bs.js
diff --git a/client/lang/ca.js b/client/lang/ca.js
diff --git a/client/lang/cs.js b/client/lang/cs.js
diff --git a/client/lang/cs_CZ.js b/client/lang/cs_CZ.js
diff --git a/client/lang/da.js b/client/lang/da.js
diff --git a/client/lang/de.js b/client/lang/de.js
@@ -7,9 +7,6 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
 } else {
  ss.i18n.addDictionary('de', {
  "Workflow.DeleteQuestion": "Sind Sie sicher, dass sie dies endgültig löschen wollen?",
- "Workflow.EMBARGOMESSAGEDATE": "Saved drafts of this page will auto publish on <a>%s</a>",
- "Workflow.EMBARGOMESSAGEDATETIME": "Saved drafts of this page will auto publish on <a>%s at %s</a>",
- "Workflow.EMBARGOMESSAGETIME": "Saved drafts of this page will auto publish today at <a>%s</a>",
  "Workflow.ProcessError": "Arbeitsablauf konnte nicht verarbeitet werden"
 });
 }
diff --git a/client/lang/el.js b/client/lang/el.js
diff --git a/client/lang/en_GB.js b/client/lang/en_GB.js
diff --git a/client/lang/es_AR.js b/client/lang/es_AR.js
diff --git a/client/lang/es_MX.js b/client/lang/es_MX.js
diff --git a/client/lang/et_EE.js b/client/lang/et_EE.js
diff --git a/client/lang/fa.js b/client/lang/fa.js
diff --git a/client/lang/fa_IR.js b/client/lang/fa_IR.js
diff --git a/client/lang/fi.js b/client/lang/fi.js
diff --git a/client/lang/fi_FI.js b/client/lang/fi_FI.js
diff --git a/client/lang/fo.js b/client/lang/fo.js
diff --git a/client/lang/fr.js b/client/lang/fr.js