From 4dfd12d5b2b007b220789712cb6d50a04a3efeee Mon Sep 17 00:00:00 2001 From: Crizzo Date: Thu, 7 Sep 2017 15:05:53 +0200 Subject: [PATCH 1/2] [ticket/15350] Changes outdated wiki-link to new docs/ PHPBB3-15350 --- phpBB/docs/coding-guidelines.html | 2 +- phpBB/includes/functions_compatibility.php | 2 +- phpBB/language/en/common.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 9b5c668880..d90f4d4d32 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2387,7 +2387,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2)) You have [1/21/31] slon, [2/3/4] slona, [0/5/6] slonova and [7/8/9/11] ... and some more difficult rules.

-

The plural system takes care of this and can be used as follows:

+

The plural system takes care of this and can be used as follows:

The PHP code will basically look like this:

diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 4b085a6050..4fe7e71117 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -488,7 +488,7 @@ function phpbb_realpath($path) * Determine which plural form we should use. * For some languages this is not as simple as for English. * - * @param $rule int ID of the plural rule we want to use, see http://wiki.phpbb.com/Plural_Rules#Plural_Rules + * @param $rule int ID of the plural rule we want to use, see https://area51.phpbb.com/docs/dev/32x/language/plurals.html * @param $number int|float The number we want to get the plural case for. Float numbers are floored. * @return int The plural-case we need to use for the number plural-rule combination * diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 709b7d9731..af9f8fe187 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -48,7 +48,7 @@ $lang = array_merge($lang, array( 'USER_LANG' => 'en-gb', // You can define different rules for the determination of plural forms here. - // See http://wiki.phpbb.com/Plural_Rules for more information + // See https://area51.phpbb.com/docs/dev/32x/language/plurals.html for more information // or ask the translation manager for help. 'PLURAL_RULE' => 1, From 563fc6ed6c1a50a04deaa2e1064fe36cc9910c6d Mon Sep 17 00:00:00 2001 From: Jim Mossing Holsteyn Date: Fri, 8 Sep 2017 11:44:05 +0200 Subject: [PATCH 2/2] [ticket/15352] Descriptions are not using in categories PHPBB3-15352 --- phpBB/language/en/acp/forums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.',