diff options
| author | Jonathan Stanley <shs@users.sourceforge.net> | 2007-04-13 04:13:50 +0000 |
|---|---|---|
| committer | Jonathan Stanley <shs@users.sourceforge.net> | 2007-04-13 04:13:50 +0000 |
| commit | a8afdd121525d7adfe37e09f535472557ff36e2f (patch) | |
| tree | 04e02e29eba942b8ae6370b565d00a4ae065611a /phpBB | |
| parent | a05c522f313ab5e1acc81569e9fa54022907e845 (diff) | |
| download | forums-a8afdd121525d7adfe37e09f535472557ff36e2f.tar forums-a8afdd121525d7adfe37e09f535472557ff36e2f.tar.gz forums-a8afdd121525d7adfe37e09f535472557ff36e2f.tar.bz2 forums-a8afdd121525d7adfe37e09f535472557ff36e2f.tar.xz forums-a8afdd121525d7adfe37e09f535472557ff36e2f.zip | |
#9736
Quidquid latine dictum sit, altum sonatur. :P
git-svn-id: file:///svn/phpbb/trunk@7341 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d20002dd96..594b1c4346 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3299,7 +3299,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append $strip_reply = false; $stripped = false; - if ($allow_reply && strpos($string, 'Re: ') === 0) + if ($allow_reply && strpos($string, $user->lang['SUBJECT_CONCERNING_PREFIX']) === 0) { $strip_reply = true; $string = substr($string, 4); @@ -3318,7 +3318,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append if ($strip_reply) { - $string = 'Re: ' . $string; + $string = $user->lang['SUBJECT_CONCERNING_PREFIX'] . $string; } if ($append != '' && $stripped) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 6c9bfdbdb3..ef37a59bff 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -674,7 +674,7 @@ function compose_pm($id, $mode, $action) if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh) { - $message_subject = ((!preg_match('/^Re:/', $message_subject)) ? 'Re: ' : '') . censor_text($message_subject); + $message_subject = ((strpos($message_subject, $user->lang['SUBJECT_CONCERNING_PREFIX']) !== 0) ? $user->lang['SUBJECT_CONCERNING_PREFIX'] : '') . censor_text($message_subject); } if ($action == 'forward' && !$preview && !$refresh && !$submit) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1bf7d27d25..ffd257ce28 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -504,6 +504,7 @@ $lang = array_merge($lang, array( 'SUBFORUM' => 'Subforum', 'SUBFORUMS' => 'Subforums', 'SUBJECT' => 'Subject', + 'SUBJECT_CONCERNING_PREFIX' => 'Re: ', // This is Latin or "concerning" or "about", most Latin influenced languages (id est: those with Latin script) can use this "as is". Localise phrase and punctuation if required. 'SUBMIT' => 'Submit', 'TERMS_USE' => 'Terms of use', diff --git a/phpBB/posting.php b/phpBB/posting.php index d1b6946d6d..3441e91076 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1063,7 +1063,7 @@ if ($mode == 'quote' && !$submit && !$preview && !$refresh) if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh) { - $post_data['post_subject'] = ((strpos($post_data['post_subject'], 'Re: ') !== 0) ? 'Re: ' : '') . censor_text($post_data['post_subject']); + $post_data['post_subject'] = ((strpos($post_data['post_subject'], $user->lang['SUBJECT_CONCERNING_PREFIX']) !== 0) ? $user->lang['SUBJECT_CONCERNING_PREFIX'] : '') . censor_text($post_data['post_subject']); } $attachment_data = $message_parser->attachment_data; |