From 34d415a6b38f7e10d4a3cfabab72f06796e492b3 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Tue, 25 Aug 2020 11:50:58 +0200 Subject: [PATCH] [ticket/16588] Updates link to plural rules from 3.2.x to 3.3.x PHPBB3-16588 --- 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 b2f6780e03..218d65afeb 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 9f3116ac2d..73f8edbe52 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 https://area51.phpbb.com/docs/dev/32x/language/plurals.html + * @param $rule int ID of the plural rule we want to use, see https://area51.phpbb.com/docs/dev/3.3.x/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 44c37c26fb..f834ba694c 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 https://area51.phpbb.com/docs/dev/32x/language/plurals.html for more information + // See https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html for more information // or ask the translation manager for help. 'PLURAL_RULE' => 1,