https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113064
Revision: 113064
Author: reedy
Date: 2012-03-05 19:17:55 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
Add to documentation
Add a couple of braces
Update code calling Language related deprecated code
Modified Paths:
--------------
trunk/phase3/languages/Language.php
trunk/phase3/languages/LanguageConverter.php
trunk/phase3/languages/classes/LanguageKu.php
trunk/phase3/languages/classes/LanguagePl.php
trunk/phase3/languages/classes/LanguageSr.php
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2012-03-05 19:14:36 UTC (rev 113063)
+++ trunk/phase3/languages/Language.php 2012-03-05 19:17:55 UTC (rev 113064)
@@ -158,6 +158,7 @@
/**
* Create a language object for a given language code
* @param $code String
+ * @throws MWException
* @return Language
*/
protected static function newFromCode( $code ) {
@@ -559,7 +560,7 @@
if ( $usemsg && wfMessage( $msg )->exists() ) {
return $this->getMessageFromDB( $msg );
}
- $name = self::getLanguageName( $code );
+ $name = self::fetchLanguageName( $code );
if ( $name ) {
return $name; # if it's defined as a language name,
show that
} else {
@@ -2538,6 +2539,7 @@
* @param $file string
* @param $string string
*
+ * @throws MWException
* @return string
*/
function transformUsingPairFile( $file, $string ) {
@@ -3576,6 +3578,7 @@
* @param $prefix string Prepend this to the filename
* @param $code string Language code
* @param $suffix string Append this to the filename
+ * @throws MWException
* @return string $prefix . $mangledCode . $suffix
*/
public static function getFileName( $prefix = 'Language', $code,
$suffix = '.php' ) {
Modified: trunk/phase3/languages/LanguageConverter.php
===================================================================
--- trunk/phase3/languages/LanguageConverter.php 2012-03-05 19:14:36 UTC
(rev 113063)
+++ trunk/phase3/languages/LanguageConverter.php 2012-03-05 19:17:55 UTC
(rev 113064)
@@ -72,7 +72,7 @@
$this->mMainLanguageCode = $maincode;
$this->mVariants = array_diff( $variants, $wgDisabledVariants );
$this->mVariantFallbacks = $variantfallbacks;
- $this->mVariantNames = Language::getLanguageNames();
+ $this->mVariantNames = Language::fetchLanguageNames();
$this->mCacheKey = wfMemcKey( 'conversiontables', $maincode );
$defaultflags = array(
// 'S' show converted text
@@ -626,6 +626,7 @@
* @param $startPos int
* @param $depth Integer: depth of recursion
*
+ * @throws MWException
* @return String: converted text
*/
protected function recursiveConvertRule( $text, $variant, &$startPos,
$depth = 0 ) {
@@ -796,6 +797,7 @@
* This method must be implemented in derived class.
*
* @private
+ * @throws MWException
*/
function loadDefaultTables() {
$name = get_class( $this );
Modified: trunk/phase3/languages/classes/LanguageKu.php
===================================================================
--- trunk/phase3/languages/classes/LanguageKu.php 2012-03-05 19:14:36 UTC
(rev 113063)
+++ trunk/phase3/languages/classes/LanguageKu.php 2012-03-05 19:17:55 UTC
(rev 113064)
@@ -196,6 +196,7 @@
* @param $text string
* @param $toVariant bool
*
+ * @throws MWException
* @return string
*/
function translate( $text, $toVariant ) {
Modified: trunk/phase3/languages/classes/LanguagePl.php
===================================================================
--- trunk/phase3/languages/classes/LanguagePl.php 2012-03-05 19:14:36 UTC
(rev 113063)
+++ trunk/phase3/languages/classes/LanguagePl.php 2012-03-05 19:17:55 UTC
(rev 113064)
@@ -15,14 +15,16 @@
if ( !count( $forms ) ) { return ''; }
$forms = $this->preConvertPlural( $forms, 3 );
$count = abs( $count );
- if ( $count == 1 )
- return $forms[0]; // singular
+ if ( $count == 1 ) {
+ return $forms[0]; // singular
+ }
switch ( $count % 10 ) {
case 2:
case 3:
case 4:
- if ( $count / 10 % 10 != 1 )
+ if ( $count / 10 % 10 != 1 ) {
return $forms[1]; // plural
+ }
default:
return $forms[2]; // plural genitive
}
Modified: trunk/phase3/languages/classes/LanguageSr.php
===================================================================
--- trunk/phase3/languages/classes/LanguageSr.php 2012-03-05 19:14:36 UTC
(rev 113063)
+++ trunk/phase3/languages/classes/LanguageSr.php 2012-03-05 19:17:55 UTC
(rev 113064)
@@ -147,6 +147,7 @@
* @param $text string
* @param $toVariant string
*
+ * @throws MWException
* @return string
*/
function translate( $text, $toVariant ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
