aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-20 10:51:58 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-20 10:51:58 +0200
commitb855f5fc6a9cc761c8144ef3d21b8212871f6733 (patch)
tree8fb72a060fdbd5f69a56bb148dbb853164b983b9 /phpBB/language
parentccb8fd18e2e20d3f843c713e7c23aeba2227148c (diff)
parent5ee7f20f4ee110c2ae0b122e9efbd4fabf669581 (diff)
downloadforums-b855f5fc6a9cc761c8144ef3d21b8212871f6733.tar
forums-b855f5fc6a9cc761c8144ef3d21b8212871f6733.tar.gz
forums-b855f5fc6a9cc761c8144ef3d21b8212871f6733.tar.bz2
forums-b855f5fc6a9cc761c8144ef3d21b8212871f6733.tar.xz
forums-b855f5fc6a9cc761c8144ef3d21b8212871f6733.zip
Merge pull request #2566 from marc1706/ticket/11711
[ticket/11711] Inform user of unsupported characters while posting * marc1706/ticket/11711: [ticket/11711] Improve coding and comments of character check [ticket/11711] Reduce size of tests and also test topic titles [ticket/11711] Improve checks for unsupported characters and check subject [ticket/11711] Inform user of unsupported characters while posting
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/posting.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 20377287fd..e8a8643cfd 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -256,6 +256,8 @@ $lang = array_merge($lang, array(
'UNAUTHORISED_BBCODE' => 'You cannot use certain BBCodes: %s.',
'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
+ 'UNSUPPORTED_CHARACTERS_MESSAGE' => 'Your message contains the following unsupported characters:<br />%s',
+ 'UNSUPPORTED_CHARACTERS_SUBJECT' => 'Your subject contains the following unsupported characters:<br />%s',
'UPDATE_COMMENT' => 'Update comment',
'URL_INVALID' => 'The URL you specified is invalid.',
'URL_NOT_FOUND' => 'The file specified could not be found.',