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

MINOR: updated lang file

Browse Source
This commit is contained in:
Will Rossiter 2009-07-26 23:23:45 +00:00
parent f3cc04a3d0
commit b2d77150f3
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/UserDefinedForm.php
View File

@ -453,7 +453,7 @@ JS
} }
$emailData = array( $emailData = array(
"Sender" => Member::currentUser(), "Sender" => Member::currentUser(),
"Fields" => $submittedFields, "Fields" => $submittedFields
); );
// email users on submit. All have their own custom options. // email users on submit. All have their own custom options.
@ -470,6 +470,7 @@ JS
} }
foreach($this->EmailRecipients() as $recipient) { foreach($this->EmailRecipients() as $recipient) {
$email->populateTemplate($recipient);
$email->populateTemplate($emailData); $email->populateTemplate($emailData);
$email->setFrom($recipient->EmailFrom); $email->setFrom($recipient->EmailFrom);
$email->setBody($recipient->EmailBody); $email->setBody($recipient->EmailBody);
@ -559,7 +560,8 @@ class UserDefinedForm_EmailRecipient extends DataObject {
'EmailSubject' => 'Varchar(200)', 'EmailSubject' => 'Varchar(200)',
'EmailFrom' => 'Varchar(200)', 'EmailFrom' => 'Varchar(200)',
'EmailBody' => 'Text', 'EmailBody' => 'Text',
'SendPlain' => 'Boolean' 'SendPlain' => 'Boolean',
'HideFormData' => 'Boolean'
); );
static $has_one = array( static $has_one = array(
@ -578,6 +580,7 @@ class UserDefinedForm_EmailRecipient extends DataObject {
new TextField('EmailSubject', _t('UserDefinedForm.EMAILSUBJECT', 'Email Subject')), new TextField('EmailSubject', _t('UserDefinedForm.EMAILSUBJECT', 'Email Subject')),
new TextField('EmailFrom', _t('UserDefinedForm.FROMADDRESS','Send Email From')), new TextField('EmailFrom', _t('UserDefinedForm.FROMADDRESS','Send Email From')),
new TextField('EmailAddress', _t('UserDefinedForm.SENDEMAILTO','Send Email To')), new TextField('EmailAddress', _t('UserDefinedForm.SENDEMAILTO','Send Email To')),
new CheckboxField('HideFormData', _t('UserDefinedForm.HIDEFORMDATA', 'Hide Form Data from Email')),
new CheckboxField('SendPlain', _t('UserDefinedForm.SENDPLAIN', 'Send Email as Plain Text (HTML will be stripped)')), new CheckboxField('SendPlain', _t('UserDefinedForm.SENDPLAIN', 'Send Email as Plain Text (HTML will be stripped)')),
new TextareaField('EmailBody', 'Body') new TextareaField('EmailBody', 'Body')
); );

8
lang/en_US.php
View File

@ -227,16 +227,19 @@ $lang['en_US']['UserDefinedForm']['AEMAILRECIPIENT'] = 'A Email Recipient';
$lang['en_US']['UserDefinedForm']['EMAILRECIPIENTS'] = 'Email Recipients'; $lang['en_US']['UserDefinedForm']['EMAILRECIPIENTS'] = 'Email Recipients';
$lang['en_US']['UserDefinedForm']['EMAILSUBJECT'] = 'Email Subject'; $lang['en_US']['UserDefinedForm']['EMAILSUBJECT'] = 'Email Subject';
$lang['en_US']['UserDefinedForm']['FORM'] = 'Form'; $lang['en_US']['UserDefinedForm']['FORM'] = 'Form';
$lang['en_US']['UserDefinedForm']['FROMADDRESS'] = 'From Address'; $lang['en_US']['UserDefinedForm']['FROMADDRESS'] = 'Send Email From';
$lang['en_US']['UserDefinedForm']['HIDEFORMDATA'] = 'Hide Form Data from Email';
$lang['en_US']['UserDefinedForm']['ONCOMPLETE'] = 'On complete'; $lang['en_US']['UserDefinedForm']['ONCOMPLETE'] = 'On complete';
$lang['en_US']['UserDefinedForm']['ONCOMPLETELABEL'] = 'Show on completion'; $lang['en_US']['UserDefinedForm']['ONCOMPLETELABEL'] = 'Show on completion';
$lang['en_US']['UserDefinedForm']['ORSELECTAFIELDTOUSEASFROM'] = '.. or Select a Form Field to use as the From Address';
$lang['en_US']['UserDefinedForm']['ORSELECTAFIELDTOUSEASTO'] = '.. or Select a Field to use as the To Address';
$lang['en_US']['UserDefinedForm']['PLURALNAME'] = array( $lang['en_US']['UserDefinedForm']['PLURALNAME'] = array(
'User Defined Forms', 'User Defined Forms',
50, 50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface' 'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
); );
$lang['en_US']['UserDefinedForm']['RECEIVED'] = 'Received Submissions'; $lang['en_US']['UserDefinedForm']['RECEIVED'] = 'Received Submissions';
$lang['en_US']['UserDefinedForm']['SENDEMAILINSTEAD'] = 'Send Email Instead From'; $lang['en_US']['UserDefinedForm']['SAVESUBMISSIONS'] = 'Disable Saving Submissions to Server';
$lang['en_US']['UserDefinedForm']['SENDEMAILTO'] = 'Send Email To'; $lang['en_US']['UserDefinedForm']['SENDEMAILTO'] = 'Send Email To';
$lang['en_US']['UserDefinedForm']['SENDPLAIN'] = 'Send Email as Plain Text (HTML will be stripped)'; $lang['en_US']['UserDefinedForm']['SENDPLAIN'] = 'Send Email as Plain Text (HTML will be stripped)';
$lang['en_US']['UserDefinedForm']['SHOWCLEARFORM'] = 'Show Clear Form Button'; $lang['en_US']['UserDefinedForm']['SHOWCLEARFORM'] = 'Show Clear Form Button';
@ -248,6 +251,5 @@ $lang['en_US']['UserDefinedForm']['SINGULARNAME'] = array(
$lang['en_US']['UserDefinedForm']['SUBMISSIONS'] = 'Submissions'; $lang['en_US']['UserDefinedForm']['SUBMISSIONS'] = 'Submissions';
$lang['en_US']['UserDefinedForm']['SUBMITBUTTON'] = 'Submit'; $lang['en_US']['UserDefinedForm']['SUBMITBUTTON'] = 'Submit';
$lang['en_US']['UserDefinedForm']['TEXTONSUBMIT'] = 'Text on submit button:'; $lang['en_US']['UserDefinedForm']['TEXTONSUBMIT'] = 'Text on submit button:';
$lang['en_US']['UserDefinedForm']['USEDEFINEDVALUE'] = 'Use Defined Value';
?> ?>

3
templates/SubmittedFormReportField.ss
View File

@ -34,7 +34,6 @@
<% end_if %> <% end_if %>
</div> </div>
<% end_if %> <% end_if %>
<% else %>
<p><% _t('NOSUBMISSIONS', 'No Submissions') %></p>
<% end_if %> <% end_if %>
<p class="noSubmissions" <% if Submissions %>style="display: none"<% end_if %>"><% _t('NOSUBMISSIONS', 'No Submissions') %></p>
</div> </div>

15
templates/email/SubmittedFormEmail.ss
View File

@ -1,9 +1,12 @@
<h1>$Subject</h1> <h1>$Subject</h1>
$Body $Body
<dl> <% if HideFormData = 1 %>
<% control Fields %> <% else %>
<dt><strong><% if Title %>$Title<% else %>$Name<% end_if %></strong></dt> <dl>
<dd style="margin: 4px 0 14px 0">$Value.RAW</dd> <% control Fields %>
<% end_control %> <dt><strong><% if Title %>$Title<% else %>$Name<% end_if %></strong></dt>
</dl> <dd style="margin: 4px 0 14px 0">$Value.RAW</dd>
<% end_control %>
</dl>
<% end_if %>