tonyair/GridFieldBulkEditingTools
1
0
Fork 0
mirror of https://github.com/colymba/GridFieldBulkEditingTools.git synced 2024-10-22 11:05:57 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3' into 4.0

Browse Source
This commit is contained in:
Steve Boyd 2024-05-09 12:35:53 +12:00
commit f6b96e7f4b
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/ci.yml vendored Normal file
View File

@ -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

4
.tx/config
View File

@ -1,14 +1,14 @@
[main] [main]
host = https://www.transifex.com 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 file_filter = client/src/lang/<lang>.json
source_file = client/src/lang/en.json source_file = client/src/lang/en.json
source_lang = en source_lang = en
type = JSON type = JSON
minimum_perc = 0 minimum_perc = 0
[o:colymba:p:gridfieldbulkeditingtools:r:yml] [o:colymba:p:gridfieldbulkeditingtools:r:master]
file_filter = lang/<lang>.yml file_filter = lang/<lang>.yml
source_file = lang/en.yml source_file = lang/en.yml
source_lang = en source_lang = en

2
lang/sk.yml
View File

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

2
src/BulkManager/BulkManager.php
View File

@ -248,7 +248,7 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G
public function getColumnMetadata($gridField, $columnName) public function getColumnMetadata($gridField, $columnName)
{ {
if ($columnName == 'BulkSelect') { if ($columnName == 'BulkSelect') {
return array('title' => 'Select'); return array('title' => _t('GRIDFIELD_BULK_MANAGER.SELECT_LABEL', 'Select'));
} }
} }

2
src/BulkTools/HTTPBulkToolsResponse.php
View File

@ -196,7 +196,7 @@ class HTTPBulkToolsResponse extends HTTPResponse
*/ */
public function addSuccessRecords(SS_List $records) public function addSuccessRecords(SS_List $records)
{ {
array_push($this->successRecords, $records->toArray()); $this->successRecords = array_merge($this->successRecords, $records->toArray());
return $this; return $this;
} }