tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX Syntax error and last of translation namespacing

This commit is contained in:
Robbie Averill 2017-08-11 11:39:58 +12:00
parent 0008ffaf01
commit 46c3c5b517
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.upgrade.yml
View File

@ -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
EditableFormFieldValidator: SilverStripe\UserForms\Model\EditableFormField\EditableFormFieldValidator
EditableFormField: SilverStripe\UserForms\Model\EditableFormField
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_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\UserDefinedForm_EmailRecipientCondition
UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient
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

4
code/Form/UserFormsGridFieldFilterHeader.php
View File

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

4
code/Model/EditableFormField.php
View File

@ -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'),
'And' => _t('UserDefinedForm.SENDIFAND', 'All conditions are true'),
'Or' => _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.SENDIFOR', 'Any conditions are true'),
'And' => _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.SENDIFAND', 'All conditions are true'),
]
),
GridField::create(

2
code/Model/EditableFormField/EditableFormStep.php
View File

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

2
code/Model/EditableFormField/EditableLiteralField.php
View File

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

2
code/Model/EditableFormField/EditableMultipleOptionField.php
View File

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