aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-17 10:26:04 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-17 10:26:04 +0200
commit7f50c269417c97f642ae6a0459014b68b72b693b (patch)
tree3522557f5ba64f321063771a302c0947821ce111 /phpBB/language
parent2a0b38cac0765c6aed00b0162b4fa3c03cc38df0 (diff)
parent608cf00aea009c6877abb299a8ccfbb75e3d7487 (diff)
downloadforums-7f50c269417c97f642ae6a0459014b68b72b693b.tar
forums-7f50c269417c97f642ae6a0459014b68b72b693b.tar.gz
forums-7f50c269417c97f642ae6a0459014b68b72b693b.tar.bz2
forums-7f50c269417c97f642ae6a0459014b68b72b693b.tar.xz
forums-7f50c269417c97f642ae6a0459014b68b72b693b.zip
Merge pull request #5622 from 3D-I/ticket/15211
[ticket/15211] Fix Emoji characters in forum name
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/forums.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 7a7176369f..d92d3f8c9e 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -97,6 +97,7 @@ $lang = array_merge($lang, array(
'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.',
'FORUM_NAME' => 'Forum name',
'FORUM_NAME_EMPTY' => 'You must enter a name for this forum.',
+ 'FORUM_NAME_EMOJI' => 'The forum name you entered is invalid.<br>It contains the following unsupported characters:<br>%s',
'FORUM_PARENT' => 'Parent forum',
'FORUM_PASSWORD' => 'Forum password',
'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password',