diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-17 22:31:35 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-17 22:31:35 -0400 |
| commit | 0a260f80af6f94047a26d9db16a5d2c6407c3958 (patch) | |
| tree | 684015e715014169312318f1e712de3b5d9e5217 | |
| parent | 51cd1129bede65656a94080a8d6042190a0b8e63 (diff) | |
| parent | bd4408875784294987c806bf123a121a84ab8363 (diff) | |
| download | forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar.gz forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar.bz2 forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar.xz forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.zip | |
Merge PR #918 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index d8bcd374fe..934ff566cc 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -749,7 +749,8 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $return_box_lang = ($action === 'post' || $action === 'edit') ? 'PM_OUTBOX' : 'PM_INBOX'; - $message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>'); + $save_message = ($action === 'edit') ? $user->lang['MESSAGE_EDITED'] : $user->lang['MESSAGE_STORED']; + $message = $save_message . '<br /><br />' . $user->lang('VIEW_PRIVATE_MESSAGE', '<a href="' . $return_message_url . '">', '</a>'); $last_click_type = 'CLICK_RETURN_FOLDER'; if ($folder_url) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 648de587aa..705b07b170 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -268,6 +268,7 @@ $lang = array_merge($lang, array( 'MESSAGE_BY_AUTHOR' => 'by', 'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_DELETED' => 'Message successfully deleted.', + 'MESSAGE_EDITED' => 'Message successfully edited.', 'MESSAGE_HISTORY' => 'Message history', 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message was deleted by its author.', 'MESSAGE_SENT_ON' => 'on', |