tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #998 from creative-commoners/pulls/5.6/default-translations

Browse Source 
FIX Use translation string that belongs to UserDefinedFormAdmin
This commit is contained in:
Robbie Averill 2020-08-19 09:19:31 -07:00 committed by GitHub
commit d82bb6b25e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Control/UserDefinedFormAdmin.php
View File

@ -4,7 +4,6 @@ namespace SilverStripe\UserForms\Control;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;
use SilverStripe\Assets\Folder; use SilverStripe\Assets\Folder;
use SilverStripe\CMS\Controllers\CMSMain;
use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Control\HTTPResponse_Exception;
@ -193,7 +192,7 @@ class UserDefinedFormAdmin extends LeftAndMain
FormAction::create('confirmfolder', _t(__CLASS__.'.FORM_ACTION_CONFIRM', 'Save and continue')) FormAction::create('confirmfolder', _t(__CLASS__.'.FORM_ACTION_CONFIRM', 'Save and continue'))
->setUseButtonTag(false) ->setUseButtonTag(false)
->addExtraClass('btn btn-primary'), ->addExtraClass('btn btn-primary'),
FormAction::create("cancel", _t(CMSMain::class . '.Cancel', "Cancel")) FormAction::create("cancel", _t(__CLASS__ . '.CANCEL', "Cancel"))
->addExtraClass('btn btn-secondary') ->addExtraClass('btn btn-secondary')
->setUseButtonTag(true) ->setUseButtonTag(true)
); );

1
lang/en.yml
View File

@ -25,6 +25,7 @@ en:
TEXTONCLEAR: 'Text on clear button:' TEXTONCLEAR: 'Text on clear button:'
TEXTONSUBMIT: 'Text on submit button:' TEXTONSUBMIT: 'Text on submit button:'
SilverStripe\UserForms\Control\UserDefinedFormAdmin: SilverStripe\UserForms\Control\UserDefinedFormAdmin:
CANCEL: 'Cancel'
CONFIRM_FOLDER_LABEL_A: 'Files that your users upload should be stored carefully to reduce the risk of exposing sensitive data. Ensure the folder you select can only be viewed by appropriate parties. Folder permissions can be managed within the Files area.' CONFIRM_FOLDER_LABEL_A: 'Files that your users upload should be stored carefully to reduce the risk of exposing sensitive data. Ensure the folder you select can only be viewed by appropriate parties. Folder permissions can be managed within the Files area.'
CONFIRM_FOLDER_LABEL_B: 'The folder selected will become the default for this form. This can be changed on an individual basis in the <i>File upload field.</i>' CONFIRM_FOLDER_LABEL_B: 'The folder selected will become the default for this form. This can be changed on an individual basis in the <i>File upload field.</i>'
FOLDER_OPTIONS_EXISTING: 'Use an existing folder' FOLDER_OPTIONS_EXISTING: 'Use an existing folder'