| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -3128,7 +3128,7 @@ |
| 3129 | 3129 | /** |
| 3130 | 3130 | * Create a new result object from a result resource and a Database object |
| 3131 | 3131 | * |
| 3132 | | - * @param Database $database |
| | 3132 | + * @param DatabaseBase $database |
| 3133 | 3133 | * @param resource $result |
| 3134 | 3134 | */ |
| 3135 | 3135 | function __construct( $database, $result ) { |
| Index: trunk/phase3/languages/LanguageConverter.php |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | /** |
| 54 | 54 | * Constructor |
| 55 | 55 | * |
| 56 | | - * @param $langobj The Language Object |
| | 56 | + * @param $langobj Language The Language Object |
| 57 | 57 | * @param $maincode String: the main language code of this language |
| 58 | 58 | * @param $variants Array: the supported variants of this language |
| 59 | 59 | * @param $variantfallbacks Array: the fallback language of each variant |
| Index: trunk/phase3/languages/classes/LanguageKk.php |
| — | — | @@ -18,6 +18,8 @@ |
| 19 | 19 | */ |
| 20 | 20 | class KkConverter extends LanguageConverter { |
| 21 | 21 | |
| | 22 | + protected $mCyrl2Latn, $mLatn2Cyrl, $mCyLa2Arab; |
| | 23 | + |
| 22 | 24 | function __construct( $langobj, $maincode, |
| 23 | 25 | $variants = array(), |
| 24 | 26 | $variantfallbacks = array(), |
| — | — | @@ -200,6 +202,7 @@ |
| 201 | 203 | return parent::parseManualRule( $rule, $flags ); |
| 202 | 204 | } |
| 203 | 205 | |
| | 206 | + $carray = array(); |
| 204 | 207 | // otherwise ignore all formatting |
| 205 | 208 | foreach ( $this->mVariants as $v ) { |
| 206 | 209 | $carray[$v] = $rule; |
| Index: trunk/phase3/languages/classes/LanguageSr.php |
| — | — | @@ -68,6 +68,7 @@ |
| 69 | 69 | return parent::parseManualRule( $rule, $flags ); |
| 70 | 70 | } |
| 71 | 71 | |
| | 72 | + $carray = array(); |
| 72 | 73 | // otherwise ignore all formatting |
| 73 | 74 | foreach ( $this->mVariants as $v ) { |
| 74 | 75 | $carray[$v] = $rule; |
| — | — | @@ -176,10 +177,14 @@ |
| 177 | 178 | } |
| 178 | 179 | |
| 179 | 180 | function convertPlural( $count, $forms ) { |
| 180 | | - if ( !count( $forms ) ) { return ''; } |
| | 181 | + if ( !count( $forms ) ) { |
| | 182 | + return ''; |
| | 183 | + } |
| 181 | 184 | |
| 182 | 185 | // if no number with word, then use $form[0] for singular and $form[1] for plural or zero |
| 183 | | - if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1]; |
| | 186 | + if ( count( $forms ) === 2 ) { |
| | 187 | + return $count == 1 ? $forms[0] : $forms[1]; |
| | 188 | + } |
| 184 | 189 | |
| 185 | 190 | // FIXME: CLDR defines 4 plural forms. Form with decimals missing. |
| 186 | 191 | // See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru |