Skip to content

Commit

Permalink
Merge branch '3.6' into 3
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Feb 27, 2024
2 parents 6273453 + c84d8af commit d34c92d
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
14 changes: 14 additions & 0 deletions client/lang/sk.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// This file was generated by silverstripe/tx-translator from client/lang/src/sk.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('sk', {
"GridFieldExtensions.ADD_CLASS": "Pridať: <i>{classname}</i>",
"GridFieldExtensions.CONFIRMDEL": "Naozaj to chcete odstrániť?",
"GridFieldExtensions.OPEN_SEARCH_FILTER": "Otvorte vyhľadávanie a filter",
"GridFieldExtensions.SAVE_PUBLISH": "Uložiť a zverejniť"
});
}
6 changes: 6 additions & 0 deletions client/lang/src/sk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"GridFieldExtensions.ADD_CLASS": "Pridať: <i>{classname}</i>",
"GridFieldExtensions.CONFIRMDEL": "Naozaj to chcete odstrániť?",
"GridFieldExtensions.OPEN_SEARCH_FILTER": "Otvorte vyhľadávanie a filter",
"GridFieldExtensions.SAVE_PUBLISH": "Uložiť a zverejniť"
}
12 changes: 11 additions & 1 deletion lang/sk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@ sk:
GridFieldExtensions:
ADD: Pridať
ADDEXISTING: 'Pridať existujúci'
BACK: Späť
CURRENT: (aktuálny)
NOITEMS: 'Nie sú k dispozícii žiadne položky.'
Next: Ďalší
PREVIOUS: Predchádzajúci
RESULTS: Výsledky
SEARCH: Hľadať
SELECTTYPETOCREATE: '(Prosím, vyberte typ)'
SELECTTYPETOCREATE: '(Vyberte typ na vytvorenie)'
Symbiote\GridFieldExtensions\Extensions\GridFieldDetailFormItemRequestExtension:
NEW: 'Pridať nový záznam'
Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:
SHOW: Zobraziť
5 changes: 4 additions & 1 deletion src/GridFieldOrderableRows.php
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,10 @@ public function handleReorder($grid, $request)
$this->httpError(400);
}

Controller::curr()->getResponse()->addHeader('X-Status', rawurlencode('Records reordered.'));
Controller::curr()->getResponse()->addHeader(
'X-Status',
rawurlencode(_t(__CLASS__ . '.REORDERED', 'Records reordered.'))
);
return $grid->FieldHolder();
}

Expand Down

0 comments on commit d34c92d

Please sign in to comment.