Merge branch '4.0' into 4

.github/workflows/ci.yml

@@ -4,13 +4,8 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Sunday at 12:10pm UTC
-  schedule:
-    - cron: '10 12 * * 0'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the symbiote account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:10 PM UTC, only on Sunday and Monday
+  schedule:
+    - cron: '10 12 * * 0,1'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

.tx/config

@@ -0,0 +1,15 @@
+[main]
+host = https://www.transifex.com
+
+[o:silverstripe:p:silverstripe-gridfieldextensions:r:master]
+file_filter = lang/<lang>.yml
+source_file = lang/en.yml
+source_lang = en
+type        = YML
+
+[o:silverstripe:p:silverstripe-gridfieldextensions:r:master-js]
+file_filter = client/lang/src/<lang>.json
+source_file = client/lang/src/en.json
+source_lang = en
+type        = KEYVALUEJSON
+

client/lang/en.js

@@ -0,0 +1,14 @@
+// This file was generated by silverstripe/tx-translator from client/lang/src/en.json.
+// See https://github.com/silverstripe/silverstripe-tx-translator for details
+if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
+  if (typeof(console) !== 'undefined') { // eslint-disable-line no-console
+    console.error('Class ss.i18n not defined');  // eslint-disable-line no-console
+  }
+} else {
+  ss.i18n.addDictionary('en', {
+    "GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
+    "GridFieldExtensions.ADD_CLASS": "Add: <i>{classname}</i>",
+    "GridFieldExtensions.OPEN_SEARCH_FILTER": "Open search and filter",
+    "GridFieldExtensions.SAVE_PUBLISH": "Save & publish"
+});
+}

client/lang/src/en.json

@@ -0,0 +1,6 @@
+{
+    "GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
+    "GridFieldExtensions.ADD_CLASS": "Add: <i>{classname}</i>",
+    "GridFieldExtensions.OPEN_SEARCH_FILTER": "Open search and filter",
+    "GridFieldExtensions.SAVE_PUBLISH": "Save & publish"
+}

composer.json

@@ -35,7 +35,8 @@
         ],
         "expose": [
             "css",
-            "javascript"
+            "javascript",
+            "client/lang"
         ]
     },
     "replace": {

javascript/GridFieldExtensions.js

@@ -243,7 +243,11 @@
 				const classes = this.data('classes');
 				const liHtml = Object.keys(classes).map(className => {
 					const link = hrefTemplate.replace('{class}', className);
-					return `<li><a href="${link}">Add: <i>${classes[className]}</i></a></li>`;
+					const linkText = ss.i18n.inject(
+						ss.i18n._t('GridFieldExtensions.ADD_CLASS', 'Add: <i>{classname}</i>'),
+						{classname: classes[className]}
+					);
+					return `<li><a href="${link}">${linkText}</a></li>`;
 				});
 
 				const listElement = $(`<ul class="grid-field-inline-new--multi-class-list">${liHtml.join('')}</ul>`);
@@ -336,7 +340,8 @@
                 content = '<span class="non-sortable"></span>';
                 self.addClass('show-filter').find('.grid-field__filter-header').show();
               } else {
-                content = '<button type="button" title="Open search and filter" name="showFilter" class="btn btn-secondary font-icon-search btn--no-text btn--icon-large grid-field__filter-open"></button>';
+                const contentTitle = ss.i18n._t('GridFieldExtensions.OPEN_SEARCH_FILTER', 'Open search and filter');
+                content = `<button type="button" title="${contentTitle}" name="showFilter" class="btn btn-secondary font-icon-search btn--no-text btn--icon-large grid-field__filter-open"></button>`;
                 self.removeClass('show-filter').find('.grid-field__filter-header').hide();
               }
 
@@ -364,7 +369,7 @@
               publish.removeClass('font-icon-tick');
               publish.addClass('btn-primary');
               publish.addClass('font-icon-rocket');
-              publish.find('.btn__title').html('Save & publish');
+              publish.find('.btn__title').html(ss.i18n._t('GridFieldExtensions.SAVE_PUBLISH', 'Save & publish'));
             }
           },
           error: function (e) {

lang/de_DE.yml

@@ -1,9 +1,9 @@
 de_DE:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Kein Ergebnis'
-    RESULTS: 'Ergebnisse'
+    RESULTS: Ergebnisse
   GridFieldExtensions:
-    ADD: 'Hinzufügen'
+    ADD: Hinzufügen
     ADDEXISTING: 'Bestehenden Eintrag hinzufügen'
-    SEARCH: 'Suche'
+    SEARCH: Suche
     SELECTTYPETOCREATE: '(Bitte Typ auswählen)'

lang/en.yml

@@ -10,5 +10,7 @@ en:
     RESULTS: Results
     SEARCH: Search
     SELECTTYPETOCREATE: '(Select type to create)'
+  Symbiote\GridFieldExtensions\Extensions\GridFieldDetailFormItemRequestExtension:
+    NEW: 'Add new record'
   Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:
     SHOW: Show

lang/es_ES.yml

@@ -1,9 +1,9 @@
 es_ES:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'No hay items.'
-    RESULTS: 'Resultados'
+    RESULTS: Resultados
   GridFieldExtensions:
-    ADD: 'Agregar'
+    ADD: Agregar
     ADDEXISTING: 'Agregar existente'
-    SEARCH: 'Buscar'
+    SEARCH: Buscar
     SELECTTYPETOCREATE: '(Seleccionar tipo para crear)'

lang/et_EE.yml

@@ -1,7 +1,7 @@
 et_EE:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Kirjed puuduvad.'
-    RESULTS: 'Tulemused'
+    RESULTS: Tulemused
   GridFieldExtensions:
     ADD: Lisa
     ADDEXISTING: 'Lisa olemasolev'

lang/fi_FI.yml

@@ -1,9 +1,9 @@
 fi_FI:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Ei kohteita'
-    RESULTS: 'Tulokset'
+    RESULTS: Tulokset
   GridFieldExtensions:
-    ADD: 'Lisää'
+    ADD: Lisää
     ADDEXISTING: 'Lisää olemassa oleva'
-    SEARCH: 'Etsi'
+    SEARCH: Etsi
     SELECTTYPETOCREATE: 'Valitse lisättävä tyyppi'

lang/it_IT.yml

@@ -1,9 +1,9 @@
 it_IT:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Nessun elemento.'
-    RESULTS: 'Risultati'
+    RESULTS: Risultati
   GridFieldExtensions:
-    ADD: 'Aggiungi'
+    ADD: Aggiungi
     ADDEXISTING: 'Aggiungi esistente'
-    SEARCH: 'Cerca'
+    SEARCH: Cerca
     SELECTTYPETOCREATE: '(Seleziona tipo per creare)'

lang/nl_NL.yml

@@ -1,9 +1,9 @@
 nl_NL:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Geen resultaten gevonden.'
-    RESULTS: 'Resultaten'
+    RESULTS: Resultaten
   GridFieldExtensions:
-    ADD: 'Toevoegen'
+    ADD: Toevoegen
     ADDEXISTING: 'Bestaande toevoegen'
-    SEARCH: 'Zoeken'
+    SEARCH: Zoeken
     SELECTTYPETOCREATE: '(Selecteer type om te creeën)'

lang/ru_RU.yml

@@ -1,9 +1,9 @@
 ru_RU:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Нет элементов.'
-    RESULTS: 'Результаты'
+    RESULTS: Результаты
   GridFieldExtensions:
-    ADD: 'Добавить'
+    ADD: Добавить
     ADDEXISTING: 'Добавить существующий'
-    SEARCH: 'Поиск'
+    SEARCH: Поиск
     SELECTTYPETOCREATE: '(Выберите тип для создания)'

lang/sk.yml

@@ -1,9 +1,9 @@
 sk:
   GridFieldAddExistingSearchHandler.ss:
     NOITEMS: 'Nie sú tu žiadne položky.'
-    RESULTS: 'Výsledky'
+    RESULTS: Výsledky
   GridFieldExtensions:
     ADD: Pridať
-    ADDEXISTING: Pridať existujúci
+    ADDEXISTING: 'Pridať existujúci'
     SEARCH: Hľadať
     SELECTTYPETOCREATE: '(Prosím, vyberte typ)'