mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-19 07:00:14 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2020-08-25 21:05:00 +02:00
commit bdf2e6f709
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/docs/coding-guidelines.html
View File

@ -2386,7 +2386,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
You have <code>[1/21/31] slon</code>, <code>[2/3/4] slona</code>, <code>[0/5/6] slonova</code> and <code>[7/8/9/11] ...</code> and some more difficult rules.
</p>
<p>The <a href="https://area51.phpbb.com/docs/dev/32x/language/plurals.html">plural system</a> takes care of this and can be used as follows:</p>
<p>The <a href="https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html">plural system</a> takes care of this and can be used as follows:</p>
<p>The PHP code will basically look like this:</p>

2
phpBB/includes/functions_compatibility.php
View File

@ -455,7 +455,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
*

2
phpBB/language/en/common.php
View File

@ -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,