dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: Avoid selectDB() call in LoadMonitor new connections"
[lhc/web/wiklou.git]
/
languages
/
Language.php
diff --git
a/languages/Language.php
b/languages/Language.php
index
83dff65
..
c514cdc
100644
(file)
--- a/
languages/Language.php
+++ b/
languages/Language.php
@@
-203,16
+203,16
@@
class Language {
/**
* Create a language object for a given language code
* @param string $code
/**
* Create a language object for a given language code
* @param string $code
- * @param
$fallback boolean
Whether we're going through language fallback chain
+ * @param
bool $fallback
Whether we're going through language fallback chain
* @throws MWException
* @return Language
*/
protected static function newFromCode( $code, $fallback = false ) {
* @throws MWException
* @return Language
*/
protected static function newFromCode( $code, $fallback = false ) {
- if ( !
Language
::isValidCode( $code ) ) {
+ if ( !
self
::isValidCode( $code ) ) {
throw new MWException( "Invalid language code \"$code\"" );
}
throw new MWException( "Invalid language code \"$code\"" );
}
- if ( !
Language
::isValidBuiltInCode( $code ) ) {
+ if ( !
self
::isValidBuiltInCode( $code ) ) {
// It's not possible to customise this code with class files, so
// just return a Language object. This is to support uselang= hacks.
$lang = new Language;
// It's not possible to customise this code with class files, so
// just return a Language object. This is to support uselang= hacks.
$lang = new Language;
@@
-228,9
+228,9
@@
class Language {
}
// Keep trying the fallback list until we find an existing class
}
// Keep trying the fallback list until we find an existing class
- $fallbacks =
Language
::getFallbacksFor( $code );
+ $fallbacks =
self
::getFallbacksFor( $code );
foreach ( $fallbacks as $fallbackCode ) {
foreach ( $fallbacks as $fallbackCode ) {
- if ( !
Language
::isValidBuiltInCode( $fallbackCode ) ) {
+ if ( !
self
::isValidBuiltInCode( $fallbackCode ) ) {
throw new MWException( "Invalid fallback '$fallbackCode' in fallback sequence for '$code'" );
}
throw new MWException( "Invalid fallback '$fallbackCode' in fallback sequence for '$code'" );
}
@@
-829,7
+829,7
@@
class Language {
global $wgExtraLanguageNames, $wgUsePigLatinVariant;
// If passed an invalid language code to use, fallback to en
global $wgExtraLanguageNames, $wgUsePigLatinVariant;
// If passed an invalid language code to use, fallback to en
- if ( $inLanguage !== null && !
Language
::isValidCode( $inLanguage ) ) {
+ if ( $inLanguage !== null && !
self
::isValidCode( $inLanguage ) ) {
$inLanguage = 'en';
}
$inLanguage = 'en';
}
@@
-1092,7
+1092,7
@@
class Language {
* YYYYMMDDHHMMSS
* 01234567890123
* @param DateTimeZone $zone Timezone of $ts
* YYYYMMDDHHMMSS
* 01234567890123
* @param DateTimeZone $zone Timezone of $ts
- * @param
[out] int
$ttl The amount of time (in seconds) the output may be cached for.
+ * @param
int &
$ttl The amount of time (in seconds) the output may be cached for.
* Only makes sense if $ts is the current time.
* @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai?
*
* Only makes sense if $ts is the current time.
* @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai?
*
@@
-1192,7
+1192,7
@@
class Language {
case 'D':
$usedDay = true;
$s .= $this->getWeekdayAbbreviation(
case 'D':
$usedDay = true;
$s .= $this->getWeekdayAbbreviation(
-
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'w' ) + 1
+
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'w' ) + 1
);
break;
case 'j':
);
break;
case 'j':
@@
-1223,7
+1223,7
@@
class Language {
case 'l':
$usedDay = true;
$s .= $this->getWeekdayName(
case 'l':
$usedDay = true;
$s .= $this->getWeekdayName(
-
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'w' ) + 1
+
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'w' ) + 1
);
break;
case 'F':
);
break;
case 'F':
@@
-1404,36
+1404,36
@@
class Language {
case 'O':
case 'P':
case 'T':
case 'O':
case 'P':
case 'T':
- $s .=
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $s .=
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case 'w':
case 'N':
case 'z':
$usedDay = true;
break;
case 'w':
case 'N':
case 'z':
$usedDay = true;
- $num =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $num =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case 'W':
$usedWeek = true;
break;
case 'W':
$usedWeek = true;
- $num =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $num =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case 't':
$usedMonth = true;
break;
case 't':
$usedMonth = true;
- $num =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $num =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case 'L':
$usedIsLeapYear = true;
break;
case 'L':
$usedIsLeapYear = true;
- $num =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $num =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case 'o':
$usedISOYear = true;
break;
case 'o':
$usedISOYear = true;
- $num =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $num =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case 'U':
$usedSecond = true;
// fall through
case 'I':
case 'Z':
break;
case 'U':
$usedSecond = true;
// fall through
case 'I':
case 'Z':
- $num =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
+ $num =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, $code );
break;
case '\\':
# Backslash escaping
break;
case '\\':
# Backslash escaping
@@
-1467,7
+1467,7
@@
class Language {
$s .= $num;
$raw = false;
} elseif ( $roman ) {
$s .= $num;
$raw = false;
} elseif ( $roman ) {
- $s .=
Language
::romanNumeral( $num );
+ $s .=
self
::romanNumeral( $num );
$roman = false;
} elseif ( $hebrewNum ) {
$s .= self::hebrewNumeral( $num );
$roman = false;
} elseif ( $hebrewNum ) {
$s .= self::hebrewNumeral( $num );
@@
-1509,7
+1509,7
@@
class Language {
substr( $ts, 10, 2 ) * 60 - substr( $ts, 12, 2 );
if ( $usedWeek ) {
$possibleTtls[] =
substr( $ts, 10, 2 ) * 60 - substr( $ts, 12, 2 );
if ( $usedWeek ) {
$possibleTtls[] =
- ( 7 -
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'N' ) ) * 86400 +
+ ( 7 -
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'N' ) ) * 86400 +
$timeRemainingInDay;
} elseif ( $usedISOYear ) {
// December 28th falls on the last ISO week of the year, every year.
$timeRemainingInDay;
} elseif ( $usedISOYear ) {
// December 28th falls on the last ISO week of the year, every year.
@@
-1519,29
+1519,29
@@
class Language {
substr( $ts, 0, 4 ) . '1228',
$zone ?: new DateTimeZone( 'UTC' )
)->format( 'W' );
substr( $ts, 0, 4 ) . '1228',
$zone ?: new DateTimeZone( 'UTC' )
)->format( 'W' );
- $currentISOWeek =
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'W' );
+ $currentISOWeek =
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'W' );
$weeksRemaining = $lastWeekOfISOYear - $currentISOWeek;
$timeRemainingInWeek =
$weeksRemaining = $lastWeekOfISOYear - $currentISOWeek;
$timeRemainingInWeek =
- ( 7 -
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'N' ) ) * 86400
+ ( 7 -
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'N' ) ) * 86400
+ $timeRemainingInDay;
$possibleTtls[] = $weeksRemaining * 604800 + $timeRemainingInWeek;
}
if ( $usedMonth ) {
$possibleTtls[] =
+ $timeRemainingInDay;
$possibleTtls[] = $weeksRemaining * 604800 + $timeRemainingInWeek;
}
if ( $usedMonth ) {
$possibleTtls[] =
- (
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 't' ) -
+ (
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 't' ) -
substr( $ts, 6, 2 ) ) * 86400
+ $timeRemainingInDay;
} elseif ( $usedYear ) {
$possibleTtls[] =
substr( $ts, 6, 2 ) ) * 86400
+ $timeRemainingInDay;
} elseif ( $usedYear ) {
$possibleTtls[] =
- (
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'L' ) + 364 -
-
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'z' ) ) * 86400
+ (
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'L' ) + 364 -
+
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'z' ) ) * 86400
+ $timeRemainingInDay;
} elseif ( $usedIsLeapYear ) {
$year = substr( $ts, 0, 4 );
$timeRemainingInYear =
+ $timeRemainingInDay;
} elseif ( $usedIsLeapYear ) {
$year = substr( $ts, 0, 4 );
$timeRemainingInYear =
- (
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'L' ) + 364 -
-
Language
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'z' ) ) * 86400
+ (
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'L' ) + 364 -
+
self
::dateTimeObjFormat( $dateTimeObj, $ts, $zone, 'z' ) ) * 86400
+ $timeRemainingInDay;
$mod = $year % 4;
if ( $mod || ( !( $year % 100 ) && $year % 400 ) ) {
+ $timeRemainingInDay;
$mod = $year % 4;
if ( $mod || ( !( $year % 100 ) && $year % 400 ) ) {
@@
-1584,9
+1584,9
@@
class Language {
* @return int[]
*/
private static function tsToIranian( $ts ) {
* @return int[]
*/
private static function tsToIranian( $ts ) {
- $gy = substr( $ts, 0, 4 ) -1600;
- $gm = substr( $ts, 4, 2 ) -1;
- $gd = substr( $ts, 6, 2 ) -1;
+ $gy = substr( $ts, 0, 4 ) -
1600;
+ $gm = substr( $ts, 4, 2 ) -
1;
+ $gd = substr( $ts, 6, 2 ) -
1;
# Days passed from the beginning (including leap years)
$gDayNo = 365 * $gy
# Days passed from the beginning (including leap years)
$gDayNo = 365 * $gy
@@
-1666,7
+1666,7
@@
class Language {
(int)( ( 275 * $zm ) / 9 ) + $zd + 1729777;
}
(int)( ( 275 * $zm ) / 9 ) + $zd + 1729777;
}
- $zl = $zjd -1948440 + 10632;
+ $zl = $zjd -
1948440 + 10632;
$zn = (int)( ( $zl - 1 ) / 10631 );
$zl = $zl - 10631 * $zn + 354;
$zj = ( (int)( ( 10985 - $zl ) / 5316 ) ) * ( (int)( ( 50 * $zl ) / 17719 ) ) +
$zn = (int)( ( $zl - 1 ) / 10631 );
$zl = $zl - 10631 * $zn + 354;
$zj = ( (int)( ( 10985 - $zl ) / 5316 ) ) * ( (int)( ( 50 * $zl ) / 17719 ) ) +
@@
-3346,7
+3346,7
@@
class Language {
if ( $start < 0 ) {
$start = 0;
}
if ( $start < 0 ) {
$start = 0;
}
- $groupedNumber = substr( $number, $start, $end -$start ) . $groupedNumber;
+ $groupedNumber = substr( $number, $start, $end -
$start ) . $groupedNumber;
$end = $start;
if ( $numMatches > 1 ) {
// use the last pattern for the rest of the number
$end = $start;
if ( $numMatches > 1 ) {
// use the last pattern for the rest of the number
@@
-3956,7
+3956,7
@@
class Language {
* @return string Text, wrapped in LRE...PDF or RLE...PDF or nothing
*/
public function embedBidi( $text = '' ) {
* @return string Text, wrapped in LRE...PDF or RLE...PDF or nothing
*/
public function embedBidi( $text = '' ) {
- $dir =
Language
::strongDirFromContent( $text );
+ $dir =
self
::strongDirFromContent( $text );
if ( $dir === 'ltr' ) {
// Wrap in LEFT-TO-RIGHT EMBEDDING ... POP DIRECTIONAL FORMATTING
return self::$lre . $text . self::$pdf;
if ( $dir === 'ltr' ) {
// Wrap in LEFT-TO-RIGHT EMBEDDING ... POP DIRECTIONAL FORMATTING
return self::$lre . $text . self::$pdf;
@@
-4264,7
+4264,7
@@
class Language {
$this->mParentLanguage = null;
return null;
}
$this->mParentLanguage = null;
return null;
}
- $lang =
Language
::factory( $code );
+ $lang =
self
::factory( $code );
if ( !$lang->hasVariant( $this->getCode() ) ) {
$this->mParentLanguage = null;
return null;
if ( !$lang->hasVariant( $this->getCode() ) ) {
$this->mParentLanguage = null;
return null;
@@
-4279,7
+4279,7
@@
class Language {
*
* @since 1.28
* @param Language $lang
*
* @since 1.28
* @param Language $lang
- * @return bool
ean
+ * @return bool
*/
public function equals( Language $lang ) {
return $lang->getCode() === $this->mCode;
*/
public function equals( Language $lang ) {
return $lang->getCode() === $this->mCode;
@@
-4343,7
+4343,7
@@
class Language {
/**
* @param string $code
/**
* @param string $code
- * @param bool
ean
$fallback Whether we're going through language fallback chain
+ * @param bool $fallback Whether we're going through language fallback chain
* @return string Name of the language class
*/
public static function classFromCode( $code, $fallback = true ) {
* @return string Name of the language class
*/
public static function classFromCode( $code, $fallback = true ) {
@@
-4420,7
+4420,7
@@
class Language {
* @return array Non-empty array, ending in "en"
*/
public static function getFallbacksFor( $code ) {
* @return array Non-empty array, ending in "en"
*/
public static function getFallbacksFor( $code ) {
- if ( $code === 'en' || !
Language
::isValidBuiltInCode( $code ) ) {
+ if ( $code === 'en' || !
self
::isValidBuiltInCode( $code ) ) {
return [];
}
// For unknown languages, fallbackSequence returns an empty array,
return [];
}
// For unknown languages, fallbackSequence returns an empty array,
@@
-4537,7
+4537,7
@@
class Language {
public function formatExpiry( $expiry, $format = true, $infinity = 'infinity' ) {
static $dbInfinity;
if ( $dbInfinity === null ) {
public function formatExpiry( $expiry, $format = true, $infinity = 'infinity' ) {
static $dbInfinity;
if ( $dbInfinity === null ) {
- $dbInfinity = wfGetDB( DB_
SLAVE
)->getInfinity();
+ $dbInfinity = wfGetDB( DB_
REPLICA
)->getInfinity();
}
if ( $expiry == '' || $expiry === 'infinity' || $expiry == $dbInfinity ) {
}
if ( $expiry == '' || $expiry === 'infinity' || $expiry == $dbInfinity ) {
@@
-4821,7
+4821,7
@@
class Language {
*/
public function getCompiledPluralRules() {
$pluralRules = self::$dataCache->getItem( strtolower( $this->mCode ), 'compiledPluralRules' );
*/
public function getCompiledPluralRules() {
$pluralRules = self::$dataCache->getItem( strtolower( $this->mCode ), 'compiledPluralRules' );
- $fallbacks =
Language
::getFallbacksFor( $this->mCode );
+ $fallbacks =
self
::getFallbacksFor( $this->mCode );
if ( !$pluralRules ) {
foreach ( $fallbacks as $fallbackCode ) {
$pluralRules = self::$dataCache->getItem( strtolower( $fallbackCode ), 'compiledPluralRules' );
if ( !$pluralRules ) {
foreach ( $fallbacks as $fallbackCode ) {
$pluralRules = self::$dataCache->getItem( strtolower( $fallbackCode ), 'compiledPluralRules' );
@@
-4840,7
+4840,7
@@
class Language {
*/
public function getPluralRules() {
$pluralRules = self::$dataCache->getItem( strtolower( $this->mCode ), 'pluralRules' );
*/
public function getPluralRules() {
$pluralRules = self::$dataCache->getItem( strtolower( $this->mCode ), 'pluralRules' );
- $fallbacks =
Language
::getFallbacksFor( $this->mCode );
+ $fallbacks =
self
::getFallbacksFor( $this->mCode );
if ( !$pluralRules ) {
foreach ( $fallbacks as $fallbackCode ) {
$pluralRules = self::$dataCache->getItem( strtolower( $fallbackCode ), 'pluralRules' );
if ( !$pluralRules ) {
foreach ( $fallbacks as $fallbackCode ) {
$pluralRules = self::$dataCache->getItem( strtolower( $fallbackCode ), 'pluralRules' );
@@
-4859,7
+4859,7
@@
class Language {
*/
public function getPluralRuleTypes() {
$pluralRuleTypes = self::$dataCache->getItem( strtolower( $this->mCode ), 'pluralRuleTypes' );
*/
public function getPluralRuleTypes() {
$pluralRuleTypes = self::$dataCache->getItem( strtolower( $this->mCode ), 'pluralRuleTypes' );
- $fallbacks =
Language
::getFallbacksFor( $this->mCode );
+ $fallbacks =
self
::getFallbacksFor( $this->mCode );
if ( !$pluralRuleTypes ) {
foreach ( $fallbacks as $fallbackCode ) {
$pluralRuleTypes = self::$dataCache->getItem( strtolower( $fallbackCode ), 'pluralRuleTypes' );
if ( !$pluralRuleTypes ) {
foreach ( $fallbacks as $fallbackCode ) {
$pluralRuleTypes = self::$dataCache->getItem( strtolower( $fallbackCode ), 'pluralRuleTypes' );