Merge branch '5' into 6

# Conflicts: # src/Forms/FormField.php # src/ORM/FieldType/DBEnum.php # src/ORM/Filterable.php # src/ORM/Limitable.php # src/ORM/Sortable.php # src/View/SSTemplateParseException.php # src/View/SSTemplateParser.peg # src/View/SSTemplateParser.php # src/View/SSViewer.php # src/View/SSViewer_BasicIteratorSupport.php # src/View/SSViewer_DataPresenter.php # src/View/SSViewer_FromString.php # src/View/SSViewer_Scope.php # src/View/TemplateIteratorProvider.php # src/View/TemplateParser.php
silverstripe · Nov 14, 2024 · eb8907f · eb8907f
2 parents e289ea7 + 3896ae7
commit eb8907f
Show file tree

Hide file tree

Showing 68 changed files with 366 additions and 58 deletions.
diff --git a/lang/af.yml b/lang/af.yml
@@ -64,6 +64,8 @@ af:
     Save: Stoor
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Verander
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Soek
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: van
     Page: Bladsy

diff --git a/lang/ar.yml b/lang/ar.yml
@@ -79,6 +79,8 @@ ar:
     Saved: 'المحفوظ {اسم} {رابط}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: تحرير
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: بحث
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: من
     Page: صفحة

diff --git a/lang/az.yml b/lang/az.yml
@@ -31,6 +31,8 @@ az:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Delete: 'Dərc olunmuş saytdan sil'
     Save: 'Yadda saxla'
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Axtar
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Səhifə
   SilverStripe\Forms\MoneyField:

diff --git a/lang/bg.yml b/lang/bg.yml
@@ -94,6 +94,8 @@ bg:
     Save: Запис
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Редактиране
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Търси
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: от
     Page: Страница

diff --git a/lang/bs.yml b/lang/bs.yml
@@ -33,6 +33,8 @@ bs:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Create: Kreiraj
     Save: Snimi
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Pretraga
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Stranica
   SilverStripe\ORM\FieldType\DBBoolean:

diff --git a/lang/ca.yml b/lang/ca.yml
@@ -30,6 +30,8 @@ ca:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Delete: Suprimeix
     Save: Desa
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Cerca
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Pàgina
   SilverStripe\ORM\DataObject:

diff --git a/lang/cs.yml b/lang/cs.yml
@@ -86,6 +86,8 @@ cs:
     Saved: 'Uloženo {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Editovat
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Hledat
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: z
     Page: Stránka

diff --git a/lang/da.yml b/lang/da.yml
@@ -88,6 +88,8 @@ da:
     Save: Gem
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Rediger
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Søg
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/de.yml b/lang/de.yml
@@ -133,6 +133,7 @@ de:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Suche "{name}"'
     SearchFormFaliure: 'Das Suchformular konnte nicht erzeugt werden'
+    Search_Default: Suche
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Sie können sich nicht selber von dieser Gruppe entfernen, Sie würden Admin-Rechte verlieren.'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/de_DE.yml b/lang/de_DE.yml
@@ -49,6 +49,7 @@ de_DE:
     EDIT: Bearbeiten
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Suche "{name}"'
+    Search_Default: Suche
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Seite
     View: Anzeigen

diff --git a/lang/en.yml b/lang/en.yml
@@ -132,6 +132,7 @@ en:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Search "{name}"'
     SearchFormFaliure: 'No search form could be generated'
+    Search_Default: Search
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Cannot remove yourself from this group, you will lose admin rights'
   SilverStripe\Forms\GridField\GridFieldPaginator:
@@ -199,6 +200,25 @@ en:
     YEARS_SHORT_PLURALS:
       one: '{count} year'
       other: '{count} years'
+  SilverStripe\ORM\FieldType\DBDatetime:
+    nDays:
+      one: 'one day'
+      other: '{count} days'
+    nHours:
+      one: 'one hour'
+      other: '{count} hours'
+    nMinutes:
+      one: 'one minute'
+      other: '{count} minutes'
+    nMonths:
+      one: 'one month'
+      other: '{count} months'
+    nSeconds:
+      one: 'one second'
+      other: '{count} seconds'
+    nYears:
+      one: 'one year'
+      other: '{count} years'
   SilverStripe\ORM\FieldType\DBEnum:
     ANY: Any
   SilverStripe\ORM\FieldType\DBForeignKey:

diff --git a/lang/eo.yml b/lang/eo.yml
@@ -134,6 +134,7 @@ eo:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Serĉi por {name}'
     SearchFormFaliure: 'Ne eblis generi serĉan formularon'
+    Search_Default: Serĉi
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/es.yml b/lang/es.yml
@@ -87,6 +87,8 @@ es:
     Saved: 'Guardado {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Editar
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Buscar
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: de
     Page: Página

diff --git a/lang/es_AR.yml b/lang/es_AR.yml
@@ -32,6 +32,8 @@ es_AR:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Delete: Eliminar
     Save: Guardar
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Buscar
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Página
   SilverStripe\Forms\MoneyField:

diff --git a/lang/es_MX.yml b/lang/es_MX.yml
@@ -62,6 +62,8 @@ es_MX:
     Save: Guardar
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Editar
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Buscar
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Página
     View: Ver

diff --git a/lang/et_EE.yml b/lang/et_EE.yml
@@ -72,6 +72,8 @@ et_EE:
     Saved: 'Salvestatud {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Redigeeri
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Otsi
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: /
     Page: Leht

diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
@@ -85,6 +85,8 @@ fa_IR:
     Saved: 'ذخیره‌شده {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: ویرایش
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: جستجو
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: از
     Page: صفحه

diff --git a/lang/fi.yml b/lang/fi.yml
@@ -100,6 +100,7 @@ fi:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Hae "{name}"'
     SearchFormFaliure: 'Hakulomaketta ei voitu luoda'
+    Search_Default: Haku
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml
@@ -115,6 +115,7 @@ fi_FI:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Hae "{name}"'
     SearchFormFaliure: 'Hakulomaketta ei voitu luoda'
+    Search_Default: Haku
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Et voi siirtää itseäsi pois tästä ryhmästä: menettäisit pääkäyttäjän oikeudet'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/fo.yml b/lang/fo.yml
@@ -27,6 +27,8 @@ fo:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Delete: Strika
     Save: Goym
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Leita
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Síða
   SilverStripe\ORM\DataObject:

diff --git a/lang/fr.yml b/lang/fr.yml
@@ -101,6 +101,8 @@ fr:
     SAVETOASTMESSAGE: 'Sauvegardé {type} "{title}" avec succès.'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Éditer
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Rechercher
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: "Impossible de retirer votre propre profil de ce groupe, vous perdriez vos droits d'administration"
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/he_IL.yml b/lang/he_IL.yml
@@ -25,6 +25,8 @@ he_IL:
     Create: יצירה
     Delete: מחק
     Save: שמור
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: חיפוש
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: מתוך
     Page: עמוד

diff --git a/lang/hr.yml b/lang/hr.yml
@@ -58,6 +58,8 @@ hr:
     Saved: 'Spremljeno {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Uredi
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Traži
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: od
     Page: Stranica

diff --git a/lang/hu.yml b/lang/hu.yml
@@ -27,6 +27,8 @@ hu:
     Save: Mentés
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Szerkeszt
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Keresés
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Oldal
   SilverStripe\Forms\UrlField:

diff --git a/lang/id.yml b/lang/id.yml
@@ -76,6 +76,8 @@ id:
     Deleted: '{type} {name} dihapus'
     Save: Simpan
     Saved: 'Simpan {name} {link}'
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Cari
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: dari
     Page: Laman

diff --git a/lang/id_ID.yml b/lang/id_ID.yml
@@ -74,6 +74,8 @@ id_ID:
     Deleted: '{type} {name} dihapus'
     Save: Simpan
     Saved: 'Simpan {name} {link}'
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Cari
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: dari
     Page: Laman

diff --git a/lang/is.yml b/lang/is.yml
@@ -36,6 +36,8 @@ is:
     Save: Vista
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Breyta
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Leita
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Síða
   SilverStripe\Forms\MoneyField:

diff --git a/lang/it.yml b/lang/it.yml
@@ -117,6 +117,7 @@ it:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Cerca "{name}"'
     SearchFormFaliure: 'Nessun modulo di ricerca può essere generato'
+    Search_Default: Cerca
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Non è possibile rimuovere te stesso da questo gruppo, perderesti i diritti di admin'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/ja.yml b/lang/ja.yml
@@ -74,6 +74,8 @@ ja:
     Saved: '保存 {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: 編集
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: 検索
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: の
     Page: ページ

diff --git a/lang/ja_JP.yml b/lang/ja_JP.yml
@@ -53,6 +53,8 @@ ja_JP:
     Delete: 削除
     DeletePermissionsFailure: 削除権限がありません
     Save: 保存
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: 検索
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: ページ
   SilverStripe\Forms\MoneyField:

diff --git a/lang/lt.yml b/lang/lt.yml
@@ -81,6 +81,8 @@ lt:
     Saved: 'Išsaugota {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Redaguoti
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Ieškoti
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: iš
     Page: Puslapis

diff --git a/lang/lv.yml b/lang/lv.yml
@@ -32,6 +32,8 @@ lv:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Delete: 'Dzēst no publicētās vietnes'
     Save: Saglabāt
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Meklēt
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Lapa
   SilverStripe\Forms\MoneyField:

diff --git a/lang/mi.yml b/lang/mi.yml
@@ -76,6 +76,8 @@ mi:
     Saved: 'I tiakina te {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Whakatika
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Rapu
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: o
     Page: Whārangi

diff --git a/lang/nb.yml b/lang/nb.yml
@@ -74,6 +74,8 @@ nb:
     Saved: 'Lagret {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Rediger
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Søk
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: av
     Page: Side

diff --git a/lang/nl.yml b/lang/nl.yml
@@ -115,6 +115,7 @@ nl:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Zoek naar "{name}"'
     SearchFormFaliure: 'Er kon geen zoekformulier worden aangemaakt'
+    Search_Default: Zoek
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Je kan jezelf niet verwijderen van deze groep, omdat je dan geen admin-rechten meer hebt.'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/pl.yml b/lang/pl.yml
@@ -118,6 +118,7 @@ pl:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Wyszukaj "{name}"'
     SearchFormFaliure: 'Nie można wygenerować formularza wyszukiwania'
+    Search_Default: Szukaj
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Nie możesz usunąć siebie z tej grupy, stracone zostałby prawa administratora'
   SilverStripe\Forms\GridField\GridFieldPaginator:

diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
@@ -23,6 +23,8 @@ pl_PL:
     Save: Zapisz
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Edytuj
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Szukaj
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Strona
   SilverStripe\Forms\UrlField:

diff --git a/lang/pt.yml b/lang/pt.yml
@@ -47,6 +47,8 @@ pt:
     Delete: Apagar
     DeletePermissionsFailure: 'Não tem permissões para apagar'
     Save: Guardar
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Procurar
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: de
     Page: Página

diff --git a/lang/pt_BR.yml b/lang/pt_BR.yml
@@ -34,6 +34,8 @@ pt_BR:
   SilverStripe\Forms\GridField\GridFieldDetailForm:
     Delete: Excluir
     Save: Salvar
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Buscar
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Página
   SilverStripe\ORM\DataObject:

diff --git a/lang/ro.yml b/lang/ro.yml
@@ -37,6 +37,8 @@ ro:
     Save: Salvează
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Editare
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Căutare
   SilverStripe\Forms\GridField\GridFieldPaginator:
     Page: Pagină
   SilverStripe\Forms\UrlField:

diff --git a/lang/ru.yml b/lang/ru.yml
@@ -94,6 +94,8 @@ ru:
     Saved: 'Сохранено: {name} {link}'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Редактировать
+  SilverStripe\Forms\GridField\GridFieldFilterHeader:
+    Search_Default: Поиск
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: из
     Page: Страница

diff --git a/lang/sk.yml b/lang/sk.yml
@@ -129,6 +129,7 @@ sk:
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
     Search: 'Hľadať "{name}"'
     SearchFormFaliure: 'Nepodarilo sa vygenerovať žiadny vyhľadávací formulár'
+    Search_Default: Hľadať
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Z tejto skupiny sa nemôžete odstrániť, stratíte práva správcu'
   SilverStripe\Forms\GridField\GridFieldPaginator: