Merge branch '3' into 4.0

silverstripe · May 9, 2024 · f6b96e7 · f6b96e7
2 parents dfd07f7 + ea7946a
commit f6b96e7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,11 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  ci:
+    name: CI
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
diff --git a/.tx/config b/.tx/config
@@ -1,14 +1,14 @@
 [main]
 host = https://www.transifex.com
 
-[o:colymba:p:gridfieldbulkeditingtools:r:js]
+[o:colymba:p:gridfieldbulkeditingtools:r:en.json]
 file_filter  = client/src/lang/<lang>.json
 source_file  = client/src/lang/en.json
 source_lang  = en
 type         = JSON
 minimum_perc = 0
 
-[o:colymba:p:gridfieldbulkeditingtools:r:yml]
+[o:colymba:p:gridfieldbulkeditingtools:r:master]
 file_filter  = lang/<lang>.yml
 source_file  = lang/en.yml
 source_lang  = en

diff --git a/lang/sk.yml b/lang/sk.yml
@@ -9,7 +9,7 @@ sk:
     ACTION_BTN_LABEL: Vykonaj
     ARCHIVE_SELECT_LABEL: Archivovať
     COMPONENT_TITLE: 'Uprav jednu alebo viac položiek súčasne.'
-    DELETE_SELECT_LABEL: Odstrániť
+    DELETE_SELECT_LABEL: Zmazať
     EDIT_SELECT_LABEL: Upraviť
     PUBLISH_SELECT_LABEL: Zverejniť
     SELECT_ALL_LABEL: 'Označiť všetky'

diff --git a/src/BulkManager/BulkManager.php b/src/BulkManager/BulkManager.php
@@ -248,7 +248,7 @@ public function getColumnAttributes($gridField, $record, $columnName)
     public function getColumnMetadata($gridField, $columnName)
     {
         if ($columnName == 'BulkSelect') {
-            return array('title' => 'Select');
+            return array('title' => _t('GRIDFIELD_BULK_MANAGER.SELECT_LABEL', 'Select'));
         }
     }
 

diff --git a/src/BulkTools/HTTPBulkToolsResponse.php b/src/BulkTools/HTTPBulkToolsResponse.php
@@ -196,7 +196,7 @@ public function addSuccessRecord($record)
      */
     public function addSuccessRecords(SS_List $records)
     {
-        array_push($this->successRecords, $records->toArray());
+        $this->successRecords = array_merge($this->successRecords, $records->toArray());
         return $this;
     }