FIX Syntax error and last of translation namespacing

.upgrade.yml

@@ -11,7 +11,6 @@ mappings:
   UserFormsFieldList: SilverStripe\UserForms\FormField\UserFormsFieldList
   UserFormsGroupField: SilverStripe\UserForms\FormField\UserFormsGroupField
   UserFormsStepField: SilverStripe\UserForms\FormField\UserFormsStepField
-  UserformsTreeDropdownField: SilverStripe\UserForms\FormField\UserformsTreeDropdownField
   EditableCustomRule: SilverStripe\UserForms\Model\EditableCustomRule
   UserDefinedForm: SilverStripe\UserForms\Model\UserDefinedForm
   UserDefinedFormController: SilverStripe\UserForms\Model\UserDefinedFormController
@@ -19,14 +18,14 @@ mappings:
   EditableCheckboxGroupField: SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField
   EditableCountryDropdownField: SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField
   EditableDateField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField
-  EditableDateField_FormField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField_FormField
+  EditableDateField_FormField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField\FormField
   EditableDropdown: SilverStripe\UserForms\Model\EditableFormField\EditableDropdown
   EditableEmailField: SilverStripe\UserForms\Model\EditableFormField\EditableEmailField
   EditableFieldGroup: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup
   EditableFieldGroupEnd: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd
   EditableFileField: SilverStripe\UserForms\Model\EditableFormField\EditableFileField
-  EditableFormField: SilverStripe\UserForms\Model\EditableFormField\EditableFormField
+  EditableFormField: SilverStripe\UserForms\Model\EditableFormField
-  EditableFormFieldValidator: SilverStripe\UserForms\Model\EditableFormField\EditableFormFieldValidator
+  EditableFormFieldValidator: SilverStripe\UserForms\Model\EditableFormField\Validator
   EditableFormHeading: SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading
   EditableFormStep: SilverStripe\UserForms\Model\EditableFormField\EditableFormStep
   EditableLiteralField: SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField
@@ -36,8 +35,8 @@ mappings:
   EditableOption: SilverStripe\UserForms\Model\EditableFormField\EditableOption
   EditableRadioField: SilverStripe\UserForms\Model\EditableFormField\EditableRadioField
   EditableTextField: SilverStripe\UserForms\Model\EditableFormField\EditableTextField
-  UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\UserDefinedForm_EmailRecipient
+  UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient
-  UserDefinedForm_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\UserDefinedForm_EmailRecipientCondition
+  UserDefinedForm_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition
   UserFormRecipientEmail: SilverStripe\UserForms\Model\Recipient\UserFormRecipientEmail
   UserFormRecipientItemRequest: SilverStripe\UserForms\Model\Recipient\UserFormRecipientItemRequest
   SubmittedFileField: SilverStripe\UserForms\Model\Submission\SubmittedFileField

code/Form/UserFormsGridFieldFilterHeader.php

@@ -104,11 +104,11 @@ class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader
         $fields->push($actions = FieldGroup::create(
             GridField_FormAction::create($gridField, 'filter', false, 'filter', null)
                 ->addExtraClass('ss-gridfield-button-filter')
-                ->setAttribute('title', _t('GridField.Filter', "Filter"))
+                ->setAttribute('title', _t('SilverStripe\\Forms\\GridField\\GridField.Filter', "Filter"))
                 ->setAttribute('id', 'action_filter_' . $gridField->getModelClass() . '_' . $columnField),
             GridField_FormAction::create($gridField, 'reset', false, 'reset', null)
                 ->addExtraClass('ss-gridfield-button-close')
-                ->setAttribute('title', _t('GridField.ResetFilter', "Reset"))
+                ->setAttribute('title', _t('SilverStripe\\Forms\\GridField\\GridField.ResetFilter', "Reset"))
                 ->setAttribute('id', 'action_reset_' . $gridField->getModelClass() . '_' . $columnField)
             )
         );

code/Model/EditableFormField.php

@@ -375,8 +375,8 @@ class EditableFormField extends DataObject
             DropdownField::create('DisplayRulesConjunction',
                 _t(__CLASS__.'.DISPLAYIF', 'Toggle visibility when'),
                 [
-                    'Or'  => _t('UserDefinedForm.SENDIFOR', 'Any conditions are true'),
+                    'Or'  => _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.SENDIFOR', 'Any conditions are true'),
-                    'And' => _t('UserDefinedForm.SENDIFAND', 'All conditions are true'),
+                    'And' => _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.SENDIFAND', 'All conditions are true'),
                 ]
             ),
             GridField::create(

code/Model/EditableFormField/EditableFormStep.php

@@ -79,7 +79,7 @@ class EditableFormStep extends EditableFormField
             ?: '';
 
         return _t(
-            'EditableFormStep.STEP_TITLE',
+            __CLASS__.'.STEP_TITLE',
             'Page {page}',
             ['page' => $title]
         );

code/Model/EditableFormField/EditableLiteralField.php

@@ -74,7 +74,7 @@ class EditableLiteralField extends EditableFormField
     protected function sanitiseContent($content)
     {
         // Check if sanitisation is enabled
-        if (!HTMLEditorField::config()->get('sanitise_server_side') {
+        if (!HTMLEditorField::config()->get('sanitise_server_side')) {
             return $content;
         }
 

code/Model/EditableFormField/EditableMultipleOptionField.php

@@ -89,7 +89,7 @@ class EditableMultipleOptionField extends EditableFormField
 
             $optionsGrid = GridField::create(
                 'Options',
-                _t('EditableFormField.CUSTOMOPTIONS', 'Options'),
+                _t('SilverStripe\\UserForms\\Model\\EditableFormField.CUSTOMOPTIONS', 'Options'),
                 $this->Options(),
                 $optionsConfig
             );