Merge branch '5.2'

.travis.yml

@@ -13,7 +13,7 @@ matrix:
     - php: 7.1
       env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.2
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
 
 before_script:
   # Init PHP
@@ -24,6 +24,7 @@ before_script:
   # Install composer dependencies
   - composer validate
   - composer require --no-update silverstripe/recipe-cms:$RECIPE_VERSION
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:

client/lang/src/ar.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "إضافة خيار",
     "UserForms.ADDING_RULE": "إضافة قاعدة",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "ستتم إزالة جميع الطلبات المقدمة بشكل دائم. المتابعة؟",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "خطأ في إنشاء الحقل",
     "UserForms.ERROR_CREATING_OPTION": "خطأ في إنشاء الخيار",
     "UserForms.HIDE_OPTIONS": "إخفاء الخيارات",

client/lang/src/ar_SA.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/bg_BG.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/da_DK.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/de_DE.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Füge Option hinzu",
     "UserForms.ADDING_RULE": "Füge Regel hinzu",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Alle Einsendungen werden dauerhaft gelöscht. Wirklich fortfahren?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Fehler beim erstellen des Feldes",
     "UserForms.ERROR_CREATING_OPTION": "Fehler beim erstellen der Option",
     "UserForms.HIDE_OPTIONS": "Optionen verbergen",

client/lang/src/en_GB.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/en_US.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/eo.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Aldonas agordon",
     "UserForms.ADDING_RULE": "Aldonas regulon",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Ĉiuj sendaĵoj malaperos porĉiame. Ĉu daŭrigu?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Bonvolu korekti la jenajn erarojn kaj reprovi:",
     "UserForms.ERROR_CREATING_FIELD": "Eraris kreante kampon",
     "UserForms.ERROR_CREATING_OPTION": "Eraris kreante agordon",
     "UserForms.HIDE_OPTIONS": "Kaŝi agordojn",

client/lang/src/es_ES.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Agregar opción",
     "UserForms.ADDING_RULE": "Agregar regla",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Se eliminarán todos los envíos. ¿Continuar?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error al crear campo",
     "UserForms.ERROR_CREATING_OPTION": "Error al crear opción",
     "UserForms.HIDE_OPTIONS": "Ocultar opciones",

client/lang/src/es_MX.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/et_EE.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/fi_FI.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Lisätään valinta",
     "UserForms.ADDING_RULE": "Lisätään sääntö",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Kaikki lähetetyt viestit poistetaan pysyvästi. Jatketaanko?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Virhe luotaessa kenttää",
     "UserForms.ERROR_CREATING_OPTION": "Virhe luotaessa valintaa",
     "UserForms.HIDE_OPTIONS": "Piilota valinnat",

client/lang/src/fr_FR.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/hr_HR.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/id.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Menambahkan Pilihan",
     "UserForms.ADDING_RULE": "Menambahkan Aturan",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Semua pengiriman akan dihapus secara permanen. Lanjutkan?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Sembunyikan Pilihan",

client/lang/src/it.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "In aggiunta di opzione",
     "UserForms.ADDING_RULE": "In aggiunta di una regola",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Tutti gli invii saranno permanentemente rimossi. Continuare?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Errore durante la creazione del campo",
     "UserForms.ERROR_CREATING_OPTION": "Errore durante la creazione dell'opzione",
     "UserForms.HIDE_OPTIONS": "Nascondi opzioni",

client/lang/src/ja.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/mi.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Tāpiri kōwhiringa ana",
     "UserForms.ADDING_RULE": "Tāpiri ture ana",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Ka muku pūmautia ngā tukunga katoa. Me haere tonu?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Hapa hanga āpure",
     "UserForms.ERROR_CREATING_OPTION": "Hapa hanga kōwhiringa",
     "UserForms.HIDE_OPTIONS": "Hunaia ngā kōwhiringa",

client/lang/src/ms_MY.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/nb_NO.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Legger til alternativ",
     "UserForms.ADDING_RULE": "Legger til regel",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Alle innsendinger vil bli permanent fjernet. Vil du forsette?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "En feil skjedde ved opprettelse felt",
     "UserForms.ERROR_CREATING_OPTION": "En feil skjedde ved opprettelse av alternativ",
     "UserForms.HIDE_OPTIONS": "Skjul alternativer",

client/lang/src/nl_NL.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Nieuwe optie toevoegen",
     "UserForms.ADDING_RULE": "Regel toevoegen",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Alle inzendingen zullen permanent worden verwijderd. Doorgaan?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Fout bij het maken optie",
     "UserForms.ERROR_CREATING_OPTION": "Fout bij het maken optie",
     "UserForms.HIDE_OPTIONS": "Verberg opties",

client/lang/src/pl_PL.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/pt_PT.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/ru_RU.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/sk.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Pridávanie voľby/možnosti",
     "UserForms.ADDING_RULE": "Pravidlo priadné",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Všetky podané formuláre budú permanentne odstránené. Pokračovať?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Nastala chyba pri vytváraní poľa",
     "UserForms.ERROR_CREATING_OPTION": "Nastala chyba pri vytváraní voľby/možnosti",
     "UserForms.HIDE_OPTIONS": "Skryť možnosti",

client/lang/src/sr_RS.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/sv.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Lägger till alternativ",
     "UserForms.ADDING_RULE": "Lägger till regel",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "Alla inskickade svar kommer att tas bort permanent. Vill du fortsätta?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Fel när fält skapades",
     "UserForms.ERROR_CREATING_OPTION": "Fel när alternativ skapades",
     "UserForms.HIDE_OPTIONS": "Göm alternativ",

client/lang/src/tr_TR.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "Adding option",
     "UserForms.ADDING_RULE": "Adding rule",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "All submissions will be permanently removed. Continue?",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "Error creating field",
     "UserForms.ERROR_CREATING_OPTION": "Error creating option",
     "UserForms.HIDE_OPTIONS": "Hide options",

client/lang/src/zh.js

@@ -6,6 +6,7 @@
     "UserForms.ADDING_OPTION": "正在添加选项",
     "UserForms.ADDING_RULE": "正在添加规则",
     "UserForms.CONFIRM_DELETE_ALL_SUBMISSIONS": "所有提交将被永久删除。要继续吗？",
+    "UserForms.ERROR_CONTAINER_HEADER": "Please correct the following errors and try again:",
     "UserForms.ERROR_CREATING_FIELD": "创建字段时发生错误",
     "UserForms.ERROR_CREATING_OPTION": "创建选项时发生错误",
     "UserForms.HIDE_OPTIONS": "隐藏选项",

code/Model/EditableFormField.php

@@ -327,9 +327,9 @@ class EditableFormField extends DataObject
         parent::requireDefaultRecords();
 
         // make sure to migrate the class across (prior to v5.x)
-        DB::query("UPDATE EditableFormField SET ParentClass = 'Page' WHERE ParentClass IS NULL");
+        DB::query("UPDATE \"EditableFormField\" SET \"ParentClass\" = 'Page' WHERE \"ParentClass\" IS NULL");
-        DB::query("UPDATE EditableFormField_Live SET ParentClass = 'Page' WHERE ParentClass IS NULL");
+        DB::query("UPDATE \"EditableFormField_Live\" SET \"ParentClass\" = 'Page' WHERE \"ParentClass\" IS NULL");
-        DB::query("UPDATE EditableFormField_Versions SET ParentClass = 'Page' WHERE ParentClass IS NULL");
+        DB::query("UPDATE \"EditableFormField_Versions\" SET \"ParentClass\" = 'Page' WHERE \"ParentClass\" IS NULL");
     }
 
     /**

code/Model/Recipient/EmailRecipient.php

@@ -113,7 +113,7 @@ class EmailRecipient extends DataObject
         parent::requireDefaultRecords();
 
         // make sure to migrate the class across (prior to v5.x)
-        DB::query("UPDATE UserDefinedForm_EmailRecipient SET FormClass = 'Page' WHERE FormClass IS NULL");
+        DB::query("UPDATE \"UserDefinedForm_EmailRecipient\" SET \"FormClass\" = 'Page' WHERE \"FormClass\" IS NULL");
     }
 
     public function summaryFields()

code/Model/Submission/SubmittedForm.php

@@ -2,17 +2,18 @@
 
 namespace SilverStripe\UserForms\Model\Submission;
 
+use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldButtonRow;
 use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
 use SilverStripe\Forms\GridField\GridFieldExportButton;
 use SilverStripe\Forms\GridField\GridFieldPrintButton;
+use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
 use SilverStripe\Forms\ReadonlyField;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\Security\Member;
-use SilverStripe\UserForms\Model\UserDefinedForm;
-use SilverStripe\UserForms\Model\Submission\SubmittedFormField;
 
 class SubmittedForm extends DataObject
 {
@@ -41,7 +42,7 @@ class SubmittedForm extends DataObject
         parent::requireDefaultRecords();
 
         // make sure to migrate the class across (prior to v5.x)
-        DB::query("UPDATE SubmittedForm SET ParentClass = 'Page' WHERE ParentClass IS NULL");
+        DB::query("UPDATE \"SubmittedForm\" SET \"ParentClass\" = 'Page' WHERE \"ParentClass\" IS NULL");
     }
 
     /**
@@ -75,7 +76,7 @@ class SubmittedForm extends DataObject
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function (FieldList $fields) {
             $fields->removeByName('Values');
 
             //check to ensure there is a Member to extract an Email from else null value
@@ -88,11 +89,8 @@ class SubmittedForm extends DataObject
             //replace scaffolded field with readonly submitter
             $fields->replaceField(
                 'SubmittedByID',
-                ReadonlyField::create(
+                ReadonlyField::create('Submitter', _t(__CLASS__ . '.SUBMITTER', 'Submitter'), $submitter)
-                    'Submitter',
+                    ->addExtraClass('form-field--no-divider')
-                    'Submitter',
-                    $submitter
-                )
             );
 
             $values = GridField::create(
@@ -106,10 +104,11 @@ class SubmittedForm extends DataObject
                 'ExportValue' => 'Value'
             );
 
-            $config = new GridFieldConfig();
+            $config = GridFieldConfig::create();
             $config->addComponent(new GridFieldDataColumns());
-            $config->addComponent(new GridFieldExportButton('after', $exportColumns));
+            $config->addComponent(new GridFieldButtonRow('after'));
-            $config->addComponent(new GridFieldPrintButton());
+            $config->addComponent(new GridFieldExportButton('buttons-after-left', $exportColumns));
+            $config->addComponent(new GridFieldPrintButton('buttons-after-left'));
             $values->setConfig($config);
 
             $fields->addFieldToTab('Root.Main', $values);

lang/en.yml

@@ -3,6 +3,8 @@ en:
     SELECTUPLOADFOLDER: 'Select upload folder'
   SilverStripe\CMS\Model\SiteTree:
     TABMAIN: Main
+  SilverStripe\Forms\Form:
+    FIELDISREQUIRED: '{name} is required.'
   SilverStripe\UserForms:
     ADDEMAILRECIPIENT: 'Add Email Recipient'
     CLEARBUTTON: Clear
@@ -36,8 +38,6 @@ en:
     FROM: From
     TILL: Till
     WHEREVALUEIS: 'where value is..'
-    RESET: Reset
-    FILTER: Filter
   SilverStripe\UserForms\Model\EditableCustomRule:
     PLURALNAME: 'Editable Custom Rules'
     PLURALS:
@@ -238,6 +238,7 @@ en:
       one: 'A Submitted Form'
       other: '{count} Submitted Forms'
     SINGULARNAME: 'Submitted Form'
+    SUBMITTER: Submitter
   SilverStripe\UserForms\Model\Submission\SubmittedFormField:
     PLURALNAME: 'Submitted Form Fields'
     PLURALS:

lang/eo.yml

@@ -1,31 +1,6 @@
 eo:
-  CustomRule:
-    BLANK: Vaka
-    DELETE: Forigi
-    GREATERTHAN: 'Valoro pli ol'
-    GREATERTHANEQUAL: 'Valoro pli ol aŭ egala al'
-    HIDETHISFIELD: 'Kaŝi ĉi tiun kampon'
-    IS: Estas
-    LESSTHAN: 'Valoro malpli ol'
-    LESSTHANEQUAL: 'Valoro malpli ol aŭ egala al'
-    NOTBLANK: 'Ne vaka'
-    NOTVALUE: 'Ne valoro'
-    SHOWTHISFIELD: 'Vidigi ĉi tiun kampon'
-    VALUE: Valoro
-    WHEN: Kiam
   EditableUploadField:
     SELECTUPLOADFOLDER: 'Elekti alŝutan dosierujon'
-  FieldEditor:
-    ADD: Aldoni
-    SELECTAFIELD: 'Elekti kampon'
-  SilverStripe\CMS\Model\SiteTree:
-    PLURALNAME: Paĝoj
-    SINGULARNAME: Paĝo
-  SilverStripe\Forms\Form:
-    FIELDISREQUIRED: '{name} estas nepra'
-  SilverStripe\Forms\GridField\GridField:
-    Filter: Filtrilo
-    ResetFilter: Restartigi
   SilverStripe\UserForms\Extension\UserFormFieldEditorExtension:
     ADD_FIELD: 'Aldoni kampon'
     ADD_FIELD_GROUP: 'Aldoni kampogrupon'
@@ -46,65 +21,34 @@ eo:
     PLURALNAME: 'Redakteblaj propraj reguloj'
     SINGULARNAME: 'Redaktebla propra regulo'
   SilverStripe\UserForms\Model\EditableFormField:
-    ADD: Enmeti
-    ADDLabel: 'Aldoni eblon'
-    ADDRULE: 'Aldoni regulon'
-    BLANK: Vaka
     CHECKEDBYDEFAULT: 'Ĉu kontrolita apriore?'
     CUSTOMERROR: 'Propra mesaĝo pri eraro'
     CUSTOMOPTIONS: Ebloj
     CUSTOMRULES: 'Propraj reguloj'
     DEFAULT: 'Apriora valoro'
     DEFAULTTOTODAY: 'Ĉu apriorie hodiaŭ?'
-    DELETE: Forigi
     DISPLAYIF: 'Baskuligi videblecon kiam'
     DISPLAY_RULES_DISABLED: 'Vidigaj reguloj ne estas enŝaltitaj por bezonataj kampoj. Por reaktivigi ĝin, bonvolu malmarki "Ĉu ĉi tiu kampo estas bezonata?" sub "Validigo".'
-    DRAG: 'Ŝovi por rearanĝi kampojn'
-    ENTERQUESTION: 'Enigi demandon'
-    EXTRACLASSA: 'Ekstra stilado/aranĝado'
-    EXTRACLASSB: 'Ekstra css-klaso - apartigi opojn per spaceto'
     EXTRACLASS_MULTIPLE: 'Disigi ĉiun CSS-klason per unu spaceto'
     EXTRACLASS_SELECT: 'Elekti el la listo de eblaj stiloj'
     EXTRACLASS_TITLE: 'Ekstra stilado/aranĝado'
     EXTRACLASS_Title: 'Ekstraj CSS-klasoj'
-    FIELDCONFIGURATION: 'Agordi kampon'
-    FIELDONDEFAULT: 'Kampo al apriora'
-    GREATERTHAN: 'Valoro pli ol'
-    GREATERTHANEQUAL: 'Valoro pli ol aŭ egala al'
     GROUP: Grupo
-    HIDE: Kaŝi
-    HIDETHISFIELD: 'Kaŝi ĉi tiun kampon'
     INITIALVISIBILITY: 'Komenca videbleco'
-    IS: Estas
-    LESSTHAN: 'Valoro malpli ol'
-    LESSTHANEQUAL: 'Valoro malpli ol aŭ egala al'
-    LOCKED: 'Ne eblas ŝanĝi ĉi tiujn kampojn'
-    MAXVALUE: 'Maks valoro'
     MERGEFIELDNAME: 'Kunfandi kapon'
-    MINVALUE: 'Min valoro'
     NAME: Nomo
-    'NO': Ne
+    'NO': 'Ne'
-    NOTBLANK: 'Ne vaka'
-    NOTVALUE: 'Ne valoro'
-    OPTIONS: Ebloj
     PLACEHOLDER: Lokokupilo
     PLURALNAME: 'Redakteblaj formularaj kampoj'
     REQUIRED: 'Ĉu ĉi tiu kampo estas nepra?'
     REQUIRED_DESCRIPTION: 'Bonvolu noti ke kondiĉaj kampoj ne povas esti nepraj'
     RIGHTTITLE: 'Dekstra titolo'
-    SHOW: Vidigi
     SHOWINSUMMARY: 'Vidigi en resuma kadrokampo'
-    SHOWONLOAD: 'Komenca videbleco antaŭ ol trakti ĉi tiujn regulojn'
-    SHOWONLOAD_TITLE: 'Vidigi ŝargante'
-    SHOWOPTIONS: 'Vidigi eblojn'
-    SHOWTHISFIELD: 'Vidigi ĉi tiun kampon'
     SINGULARNAME: 'Redaktebla formulara kampo'
     TITLE: Titolo
     TYPE: Tipo
     VALIDATION: Validigo
-    VALUE: Valoro
+    'YES': 'Jes'
-    WHEN: Kiam
-    'YES': Jes
   SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox:
     PLURALNAME: Markobutonoj
     SINGULARNAME: 'Markobutona kampo'
@@ -139,16 +83,16 @@ eo:
     PLURALNAME: Titoloj
     SINGULARNAME: Titolo
   SilverStripe\UserForms\Model\EditableFormField\EditableFormStep:
-    PLURALNAME: Paĝosaltoj
+    PLURALNAME: 'Paĝosaltoj'
-    SINGULARNAME: Paĝosalto
+    SINGULARNAME: 'Paĝosalto'
     STEP_TITLE: 'Paĝo {paĝo}'
     TITLE_FIRST: 'Unua paĝo'
   SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField:
     CONTENT: HTML
     HIDEFROMREPORT: 'Ĉu kaŝi de raportoj?'
     HIDELABEL: 'Ĉu kaŝi etikedon ''Titolo'' en fasado?'
-    PLURALNAME: HTML-blokoj
+    PLURALNAME: 'HTML-blokoj'
-    SINGULARNAME: HTML-bloko
+    SINGULARNAME: 'HTML-bloko'
   SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField:
     PLURALNAME: 'Kampoj por membrolisto'
     SINGULARNAME: 'Kampo por membrolisto'
@@ -165,20 +109,16 @@ eo:
     RANGE_TO: al
     SINGULARNAME: 'Numera kampo'
   SilverStripe\UserForms\Model\EditableFormField\EditableOption:
-    DELETE: 'Forigi ĉi tiun eblon'
-    DRAG: 'Ŝovi por rearanĝi ordon de agordoj'
-    LOCKED: 'Ne eblas ŝanĝi ĉi tiujn kampojn'
     PLURALNAME: 'Redakteblaj ebloj'
     SINGULARNAME: 'Redaktebla eblo'
   SilverStripe\UserForms\Model\EditableFormField\EditableRadioField:
     PLURALNAME: 'Radiobutonaj grupoj'
     SINGULARNAME: 'Radiobutona grupo'
   SilverStripe\UserForms\Model\EditableFormField\EditableTextField:
-    AUTOCOMPLETE: 'Aŭtomate kompletigi'
+    AUTOCOMPLETE: Aŭtomate kompletigi
     AUTOCOMPLETE_DESCRIPTION: 'Subtenataj TTT-legiloj provos aŭtomate plenigi ĉi tiun kampon per uzantinformo, uzu ĝin por agordi la enan valoron'
     NUMBERROWS: 'Nombro da vicoj'
     NUMBERROWS_DESCRIPTION: 'Kampoj kun pli ol unu vico generiĝos kiel tekstareo'
-    PLACEHOLDER: Lokokupilo
     PLURALNAME: 'Tekstaj kampoj'
     RANGE_TO: al
     SINGULARNAME: 'Teksta kampo'
@@ -187,16 +127,9 @@ eo:
     REQUIRED_ERROR: 'Formularaj kampoj ne povas esti nepraj kaj havi kondiĉajn vidigoregulojn.'
   SilverStripe\UserForms\Model\Recipient\EmailRecipient:
     CUSTOMRULESTAB: 'Propraj reguloj'
-    EMAILADDRESSINVALID: '"EmailAddress" ne estas valida'
     EMAILCONTENTTAB: 'Retpoŝta enhavo'
     EMAILDETAILSTAB: 'Retpoŝtaj detaloj'
-    EMAILFROMINVALID: '"Retpoŝto de" ne estas valida'
+    EMAILFROMREQUIRED: '"Retpoŝto de" estas bezonata'
-    EMAILREPLYTOINVALID: '"Retpoŝta respondo al" ne estas valida'
-    PLURALNAME: 'Retpoŝtaj ricevontoj de propra formularo'
-    SINGULARNAME: 'Retpoŝta ricevonto de propra formularo'
-  SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition:
-    PLURALNAME: 'Kondiĉoj por uzantoj ricevontaj propran formularon'
-    SINGULARNAME: 'Kondiĉo por uzantoj ricevontaj propran formularon'
   SilverStripe\UserForms\Model\Submission\SubmittedFileField:
     DOWNLOADFILE: 'Elŝuti dosieron'
     PLURALNAME: 'Kampoj de sendita dosiero'
@@ -208,40 +141,26 @@ eo:
     PLURALNAME: 'Kampoj de sendita formularo'
     SINGULARNAME: 'Kampo de sendita formularo'
   SilverStripe\UserForms\Model\UserDefinedForm:
-    ADDEMAILRECIPIENT: 'Aldoni retpoŝtan ricevonton'
     CLEARBUTTON: Vakigi
-    CONFIGURATION: Agordaro
     DESCRIPTION: 'Aldonas adapteblan formularon'
-    DISABLEAUTHENICATEDFINISHACTION: 'Malŝalti aŭtentigon de kompletiga ago'
-    DISABLECSRFSECURITYTOKEN: 'Malŝalti CSRF-ĵetonon'
-    DISPLAYERRORMESSAGESATTOP: 'Ĉu vidigi prierarajn mesaĝojn super la formularo?'
     EMAILADDRESS: Retpoŝto
     EMAILBODY: Korpo
     EMAILBODYHTML: Korpo
     EMAILFROM: De
-    EMAILRECIPIENTS: 'Retpoŝtaj ricevontoj'
     EMAILSUBJECT: 'Temo de retpoŝto'
     EMAILTEMPLATE: 'Retpoŝta ŝablono'
-    ENABLELIVEVALIDATION: 'Enŝalti samtempan validigon'
+    EMAIL_RECIPIENT_UNSAVED_FORM: 'Konservinte ĉi tiun rikordon vi povos elekti el validaj formularaj kampoj.'
     EmailFromContent: 'La de-adreso estas kie vi povas agordi de kie venas la retpoŝto. Ĉe plejmultaj serviloj tio devus esti retpoŝta adreso ĉe la sama domajno kiel via retejo. Ekzemple, ĉe viareto.com, la de-adreso eble devus esti iuloko@viareto.com. Tamen vi povas agordi la de-adreson al iu ajn adreso.'
-    FIELDS: Kampoj
-    FORM: Formularo
     FROMADDRESS: 'Sendi retpoŝton de'
     FileUploadWarning: 'Dosieroj alŝutitaj per ĉi tiu kampo eble estos alireblaj se la ĝusta URL estas sciata.'
     HIDEFORMDATA: 'Ĉu kaŝi formularajn datumojn de retpoŝto?'
-    NORECIPIENTS: 'Averto: Vi ne agordis ricevantojn. Eble mankos sendoj de formularoj.'
-    ONCOMPLETELABEL: 'Vidigi je kompletigo'
     ORSELECTAFIELDTOUSEASFROM: '.. aŭ elekti kampon uzotan kiel respondi-al-adreson'
     ORSELECTAFIELDTOUSEASTO: '.. aŭ elekti kampon uzotan kiel la al-adreson'
-    PLURALNAME: 'Bazaj paĝoj'
     PREVIEW_EMAIL: 'Antaŭvidi retpoŝton'
     PREVIEW_EMAIL_DESCRIPTION: 'Notu: nekonservitaj ŝanĝoj ne vidiĝos en la antaŭvido.'
     PREVIEW_EMAIL_UNAVAILABLE: 'Konservinte la ricevonton vi povos antaŭvidi la retpoŝton.'
-    RECIPIENTS: Ricevontoj
     REPLYADDRESS: 'Retpoŝto al kiu respondi'
     REPLYADDRESS_DESCRIPTION: 'La retpoŝta adreso al kiu la ricevonto povos ''respondi''.'
-    RulesDescription: 'Retpoŝtoj sendiĝos al la ricevonto nur se la propraj reguloj estas plenumitaj. Se neniu regulo estas agordita, tiu ricevonto ricevos atentigon por ĉiu sendo.'
-    SAVESUBMISSIONS: 'Malŝalti konservi sendaĵojn al servilo'
     SELECTAFIELDTOSETSUBJECT: '.. aŭ elekti kampon uzotan kiel la temon'
     SENDEMAILTO: 'Sendi retpoŝton al'
     SENDEMAILTO_DESCRIPTION: 'Vi povas enigi plurajn retadresojn kiel komodisigitan liston.'
@@ -249,12 +168,8 @@ eo:
     SENDIFAND: 'Ĉiuj kondiĉoj estas veraj'
     SENDIFOR: 'Ajnaj kondiĉoj estas veraj'
     SENDPLAIN: 'Ĉu sendi retpoŝton kiel platan tekston? (HTML estu forigita)'
-    SHOWCLEARFORM: 'Vidigi butonon vakigi formularon'
     SINGULARNAME: 'Formularo agordita de uzanto'
-    SUBMISSIONS: Sendoj
     SUBMITBUTTON: Sendi
-    TEXTONCLEAR: 'Teksto sur vakiga butono'
-    TEXTONSUBMIT: 'Teksto sur senda butono:'
     TYPEREPLY: 'Tajpi respondan adreson'
     TYPESUBJECT: 'Tajpi temon'
     TYPETO: 'Tajpi al-adreson'