diff options
Diffstat (limited to 'Kernel/Output')
| -rw-r--r-- | Kernel/Output/HTML/DefaultRecipient.pm | 12 | ||||
| -rw-r--r-- | Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm index 3965d9a..80b12b2 100644 --- a/Kernel/Output/HTML/DefaultRecipient.pm +++ b/Kernel/Output/HTML/DefaultRecipient.pm @@ -73,14 +73,14 @@ sub Run { ); $RemoveTo = 1 if $DefaultRecipient{RemoveTo}; - if ( $DefaultRecipient{AddTo} ne '' ) { - push @ToAddresses, $DefaultRecipient{AddTo}; + if ( $DefaultRecipient{To} ne '' ) { + push @ToAddresses, $DefaultRecipient{To}; } - if ( $DefaultRecipient{AddCc} ne '' ) { - push @CcAddresses, $DefaultRecipient{AddCc}; + if ( $DefaultRecipient{Cc} ne '' ) { + push @CcAddresses, $DefaultRecipient{Cc}; } - if ( $DefaultRecipient{AddBcc} ne '' ) { - push @BccAddresses, $DefaultRecipient{AddBcc}; + if ( $DefaultRecipient{Bcc} ne '' ) { + push @BccAddresses, $DefaultRecipient{Bcc}; } } diff --git a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt index 84d4dbb..82f8db6 100644 --- a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt +++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt @@ -71,9 +71,9 @@ <tr> <th>[% Translate("Title") | html %]</th> <th>[% Translate("Remove 'To'") | html %]</th> - <th>[% Translate("New 'To'") | html %]</th> - <th>[% Translate("New 'Cc'") | html %]</th> - <th>[% Translate("New 'Bcc'") | html %]</th> + <th>[% Translate("To") | html %]</th> + <th>[% Translate("Cc") | html %]</th> + <th>[% Translate("Bcc") | html %]</th> <th>[% Translate("Comment") | html %]</th> <th>[% Translate("Changed") | html %]</th> <th>[% Translate("Created") | html %]</th> @@ -97,9 +97,9 @@ <a class="AsBlock" href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=Change;ID=[% Data.ID | uri %]">[% Data.Title | html %]</a> </td> <td>[% Translate(Data.RemoveToYesNo) | html %]</td> - <td>[% Data.AddTo | html %]</td> - <td>[% Data.AddCc | html %]</td> - <td>[% Data.AddBcc | html %]</td> + <td>[% Data.To | html %]</td> + <td>[% Data.Cc | html %]</td> + <td>[% Data.Bcc | html %]</td> <td title="[% Data.Comment | html %]">[% Data.Comment | truncate(26) | html %]</td> <td>[% Data.ChangeTime | Localize("TimeShort") %]</td> <td>[% Data.CreateTime | Localize("TimeShort") %]</td> @@ -161,21 +161,21 @@ </div> <div class="Clear"></div> - <label for="AddTo">[% Translate("New 'To'") | html %]:</label> + <label for="To">[% Translate("To") | html %]:</label> <div class="Field"> - <input type="text" name="AddTo" id="AddTo" value="[% Data.AddTo | html %]" class="W50pc" maxlength="200"/> + <input type="text" name="To" id="To" value="[% Data.To | html %]" class="W50pc" maxlength="200"/> </div> <div class="Clear"></div> - <label for="AddCc">[% Translate("New 'Cc'") | html %]:</label> + <label for="Cc">[% Translate("Cc") | html %]:</label> <div class="Field"> - <input type="text" name="AddCc" id="AddCc" value="[% Data.AddCc | html %]" class="W50pc" maxlength="200"/> + <input type="text" name="Cc" id="Cc" value="[% Data.Cc | html %]" class="W50pc" maxlength="200"/> </div> <div class="Clear"></div> - <label for="AddBcc">[% Translate("New 'Bcc'") | html %]:</label> + <label for="Bcc">[% Translate("Bcc") | html %]:</label> <div class="Field"> - <input type="text" name="AddBcc" id="AddBcc" value="[% Data.AddBcc | html %]" class="W50pc" maxlength="200"/> + <input type="text" name="Bcc" id="Bcc" value="[% Data.Bcc | html %]" class="W50pc" maxlength="200"/> </div> <div class="Clear"></div> |