From 7ec687d9231d9fa4402584308fd9690bf6b6da7c Mon Sep 17 00:00:00 2001
From: Jonathan Stanley <shs@users.sourceforge.net>
Date: Fri, 13 Apr 2007 04:54:04 +0000
Subject: [PATCH] Not #9760

Missing helpline for inline attachments, only used for subsilver2 though, the UI in prosilver is different and makes that helpline redundant.


git-svn-id: file:///svn/phpbb/trunk@7343 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php                       | 1 -
 phpBB/language/en/posting.php                      | 2 ++
 phpBB/styles/subsilver2/template/posting_body.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ffd257ce28..1bf7d27d25 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -504,7 +504,6 @@ $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/language/en/posting.php b/phpBB/language/en/posting.php
index 05b8411a40..db3782aca2 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -40,6 +40,7 @@ $lang = array_merge($lang, array(
 	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
 	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',
 
+	'BBCODE_A_HELP'				=> 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]',
 	'BBCODE_B_HELP'				=> 'Bold text: [b]text[/b]',
 	'BBCODE_C_HELP'				=> 'Code display: [code]code[/code]',
 	'BBCODE_E_HELP'				=> 'List: Add list element',
@@ -168,6 +169,7 @@ $lang = array_merge($lang, array(
 	'SAVE_DATE'					=> 'Saved at',
 	'SAVE_DRAFT'				=> 'Save draft',
 	'SAVE_DRAFT_CONFIRM'		=> 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?',
+	'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.
 	'SMILIES'					=> 'Smilies',
 	'SMILIES_ARE_OFF'			=> 'Smilies are <em>OFF</em>',
 	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 483d857f28..492bd445a7 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -229,7 +229,7 @@
 <!-- IF S_INLINE_ATTACHMENT_OPTIONS -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td>
-		<td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select>&nbsp;<input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_form = document.forms[form_name].elements['attachments']; attach_inline(attach_form.value, attach_form.options[attach_form.selectedIndex].text);" />
+		<td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select>&nbsp;<input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_form = document.forms[form_name].elements['attachments']; attach_inline(attach_form.value, attach_form.options[attach_form.selectedIndex].text);" onmouseover="helpline('a')" onmouseout="helpline('tip')" />
 		</td>
 	</tr>
 <!-- ENDIF -->