From 563fc6ed6c1a50a04deaa2e1064fe36cc9910c6d Mon Sep 17 00:00:00 2001 From: Jim Mossing Holsteyn Date: Fri, 8 Sep 2017 11:44:05 +0200 Subject: [ticket/15352] Descriptions are not using in categories PHPBB3-15352 --- phpBB/language/en/acp/forums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/acp/forums.php') diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 541d05c255..7a7176369f 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -87,7 +87,7 @@ $lang = array_merge($lang, array( 'FORUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.', 'FORUM_DELETED' => 'Forum successfully deleted.', 'FORUM_DESC' => 'Description', - 'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is.', + 'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is. If the selected forum type is a category the description is not used.', 'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.', 'FORUM_IMAGE' => 'Forum image', 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.', -- cgit v1.2.1 From aad8ffff5180c120f0aa49beadc06ca637f15cbb Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 11 Jun 2019 05:41:12 +0200 Subject: [ticket/15211] Fix Emoji characters in forum name PHPBB3-15211 --- phpBB/language/en/acp/forums.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en/acp/forums.php') diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 7a7176369f..341b722c5b 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.
The value contains the following unsupported characters:
%s', 'FORUM_PARENT' => 'Parent forum', 'FORUM_PASSWORD' => 'Forum password', 'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password', -- cgit v1.2.1 From 608cf00aea009c6877abb299a8ccfbb75e3d7487 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 12 Jun 2019 15:04:38 +0200 Subject: [ticket/15211] Wording PHPBB3-15211 --- phpBB/language/en/acp/forums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/acp/forums.php') diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 341b722c5b..d92d3f8c9e 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -97,7 +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.
The value contains the following unsupported characters:
%s', + 'FORUM_NAME_EMOJI' => 'The forum name you entered is invalid.
It contains the following unsupported characters:
%s', 'FORUM_PARENT' => 'Parent forum', 'FORUM_PASSWORD' => 'Forum password', 'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password', -- cgit v1.2.1