mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-07 16:15:22 +02:00
Quidquid latine dictum sit, altum sonatur. :P git-svn-id: file:///svn/phpbb/trunk@7341 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
a05c522f31
commit
a8afdd1215
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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',
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user