From 117fb34efcafa1cd138107fe1f1ec89636d81e51 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 29 May 2011 15:21:03 +0000 Subject: [PATCH] Some language love --- languages/Language.php | 35 +++++++++++++++++++++++++++ languages/classes/LanguageMy.php | 5 ++++ languages/classes/LanguagePl.php | 10 ++++++++ languages/classes/LanguageRo.php | 6 +++++ languages/classes/LanguageSe.php | 6 +++++ languages/classes/LanguageSh.php | 6 +++++ languages/classes/LanguageSk.php | 6 +++++ languages/classes/LanguageSl.php | 6 +++++ languages/classes/LanguageSma.php | 6 +++++ languages/classes/LanguageSr.php | 6 +++++ languages/classes/LanguageSr_ec.php | 6 +++++ languages/classes/LanguageSr_el.php | 6 +++++ languages/classes/LanguageUk.php | 5 ++++ languages/classes/LanguageYue.php | 7 ++++++ languages/classes/LanguageZh_hans.php | 8 ++++++ 15 files changed, 124 insertions(+) diff --git a/languages/Language.php b/languages/Language.php index b64bf0063d..6b0ba13c07 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1875,6 +1875,9 @@ class Language { return $this->iconv( $this->fallback8bitEncoding(), 'utf-8', $s ); } + /** + * @return array + */ function fallback8bitEncoding() { return self::$dataCache->getItem( $this->mCode, 'fallback8bitEncoding' ); } @@ -2124,6 +2127,9 @@ class Language { return $this->isRTL() ? "\xE2\x80\x8F" : "\xE2\x80\x8E"; } + /** + * @return array + */ function capitalizeAllNouns() { return self::$dataCache->getItem( $this->mCode, 'capitalizeAllNouns' ); } @@ -2146,6 +2152,9 @@ class Language { return self::$dataCache->getItem( $this->mCode, 'linkPrefixExtension' ); } + /** + * @return array + */ function getMagicWords() { return self::$dataCache->getItem( $this->mCode, 'magicWords' ); } @@ -2802,6 +2811,10 @@ class Language { return htmlspecialchars( $this->convert( $text, $isTitle ) ); } + /** + * @param $key string + * @return string + */ function convertCategoryKey( $key ) { return $this->mConverter->convertCategoryKey( $key ); } @@ -2816,14 +2829,23 @@ class Language { return $this->mConverter->getVariants(); } + /** + * @return string + */ function getPreferredVariant() { return $this->mConverter->getPreferredVariant(); } + /** + * @return string + */ function getDefaultVariant() { return $this->mConverter->getDefaultVariant(); } + /** + * @return string + */ function getURLVariant() { return $this->mConverter->getURLVariant(); } @@ -2898,6 +2920,9 @@ class Language { return self::$dataCache->getItem( $this->mCode, 'linkTrail' ); } + /** + * @return Language + */ function getLangObj() { return $this; } @@ -2948,11 +2973,19 @@ class Language { return str_replace( '_', '-', strtolower( $m[1] ) ); } + /** + * @param $code string + * @return string + */ static function getMessagesFileName( $code ) { global $IP; return self::getFileName( "$IP/languages/messages/Messages", $code, '.php' ); } + /** + * @param $code string + * @return string + */ static function getClassFileName( $code ) { global $IP; return self::getFileName( "$IP/languages/classes/Language", $code, '.php' ); @@ -2960,6 +2993,8 @@ class Language { /** * Get the fallback for a given language + * + * @return false|string */ static function getFallbackFor( $code ) { if ( $code === 'en' ) { diff --git a/languages/classes/LanguageMy.php b/languages/classes/LanguageMy.php index 4fa5b05eaa..b12e458517 100644 --- a/languages/classes/LanguageMy.php +++ b/languages/classes/LanguageMy.php @@ -7,6 +7,11 @@ * @author Niklas Laxström, 2008 */ class LanguageMy extends Language { + + /** + * @param $_ string + * @return string + */ function commafy( $_ ) { /* NO-op. Cannot use * $separatorTransformTable = array( ',' => '' ) diff --git a/languages/classes/LanguagePl.php b/languages/classes/LanguagePl.php index 40477f42f7..59c8d5c2be 100644 --- a/languages/classes/LanguagePl.php +++ b/languages/classes/LanguagePl.php @@ -5,6 +5,12 @@ * @ingroup Language */ class LanguagePl extends Language { + + /** + * @param $count string + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } $forms = $this->preConvertPlural( $forms, 3 ); @@ -22,6 +28,10 @@ class LanguagePl extends Language { } } + /** + * @param $_ string + * @return string + */ function commafy( $_ ) { if ( !preg_match( '/^\-?\d{1,4}(\.\d+)?$/', $_ ) ) { return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); diff --git a/languages/classes/LanguageRo.php b/languages/classes/LanguageRo.php index 89edce11b7..9cfd8b572f 100644 --- a/languages/classes/LanguageRo.php +++ b/languages/classes/LanguageRo.php @@ -5,6 +5,12 @@ * @ingroup Language */ class LanguageRo extends Language { + + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { // Plural rules per // http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ro diff --git a/languages/classes/LanguageSe.php b/languages/classes/LanguageSe.php index 3011bc7f7b..a66957f03d 100644 --- a/languages/classes/LanguageSe.php +++ b/languages/classes/LanguageSe.php @@ -5,6 +5,12 @@ * @ingroup Language */ class LanguageSe extends Language { + + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } diff --git a/languages/classes/LanguageSh.php b/languages/classes/LanguageSh.php index a45258f9fe..139ad0b67b 100644 --- a/languages/classes/LanguageSh.php +++ b/languages/classes/LanguageSh.php @@ -5,6 +5,12 @@ * @ingroup Language */ class LanguageSh extends Language { + + /** + * @param $count string + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } diff --git a/languages/classes/LanguageSk.php b/languages/classes/LanguageSk.php index ea74d1baed..eac25f4f5e 100644 --- a/languages/classes/LanguageSk.php +++ b/languages/classes/LanguageSk.php @@ -5,6 +5,12 @@ * @ingroup Language */ class LanguageSk extends Language { + + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } $forms = $this->preConvertPlural( $forms, 3 ); diff --git a/languages/classes/LanguageSl.php b/languages/classes/LanguageSl.php index 09138ea5c9..66477bb331 100644 --- a/languages/classes/LanguageSl.php +++ b/languages/classes/LanguageSl.php @@ -26,6 +26,12 @@ class LanguageSl extends Language { return $word; # this will return the original value for 'imenovalnik' (nominativ) and all undefined case values } + /** + * @param $count int + * @param $forms array + * + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } $forms = $this->preConvertPlural( $forms, 5 ); diff --git a/languages/classes/LanguageSma.php b/languages/classes/LanguageSma.php index a04c77da2c..fa6d32a7f2 100644 --- a/languages/classes/LanguageSma.php +++ b/languages/classes/LanguageSma.php @@ -5,6 +5,12 @@ * @ingroup Language */ class LanguageSma extends Language { + + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php index e61f579d5e..a75b6a1861 100644 --- a/languages/classes/LanguageSr.php +++ b/languages/classes/LanguageSr.php @@ -197,6 +197,12 @@ class LanguageSr extends LanguageSr_ec { $wgHooks['ArticleSaveComplete'][] = $this->mConverter; } + /** + * @param $count int + * @param $forms array + * + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; diff --git a/languages/classes/LanguageSr_ec.php b/languages/classes/LanguageSr_ec.php index ed447e5e71..572a5f3b92 100644 --- a/languages/classes/LanguageSr_ec.php +++ b/languages/classes/LanguageSr_ec.php @@ -6,6 +6,12 @@ * @ingroup Language */ class LanguageSr_ec extends Language { + + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } $forms = $this->preConvertPlural( $forms, 3 ); diff --git a/languages/classes/LanguageSr_el.php b/languages/classes/LanguageSr_el.php index d43772af8a..3a1f6a6d66 100644 --- a/languages/classes/LanguageSr_el.php +++ b/languages/classes/LanguageSr_el.php @@ -6,6 +6,12 @@ * @ingroup Language */ class LanguageSr_el extends Language { + + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } $forms = $this->preConvertPlural( $forms, 3 ); diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php index c1b1e56353..06dfb57d35 100644 --- a/languages/classes/LanguageUk.php +++ b/languages/classes/LanguageUk.php @@ -56,6 +56,11 @@ class LanguageUk extends Language { return $word; } + /** + * @param $count int + * @param $forms array + * @return string + */ function convertPlural( $count, $forms ) { if ( !count( $forms ) ) { return ''; } diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php index 537ffc1944..5492529ed8 100644 --- a/languages/classes/LanguageYue.php +++ b/languages/classes/LanguageYue.php @@ -5,6 +5,10 @@ * @ingroup Language */ class LanguageYue extends Language { + + /** + * @return bool + */ function hasWordBreaks() { return false; } @@ -13,6 +17,9 @@ class LanguageYue extends Language { * Eventually this should be a word segmentation; * for now just treat each character as a word. * @todo FIXME: Only do this for Han characters... + * + * @param $string string + * @return string */ function segmentByWord( $string ) { $reg = "/([\\xc0-\\xff][\\x80-\\xbf]*)/"; diff --git a/languages/classes/LanguageZh_hans.php b/languages/classes/LanguageZh_hans.php index 2fcb7de2ef..671a16e7cc 100644 --- a/languages/classes/LanguageZh_hans.php +++ b/languages/classes/LanguageZh_hans.php @@ -6,6 +6,10 @@ * @ingroup Language */ class LanguageZh_hans extends Language { + + /** + * @return bool + */ function hasWordBreaks() { return false; } @@ -14,6 +18,10 @@ class LanguageZh_hans extends Language { * Eventually this should be a word segmentation; * for now just treat each character as a word. * @todo FIXME: Only do this for Han characters... + * + * @param $string string + * + * @return string */ function segmentByWord( $string ) { $reg = "/([\\xc0-\\xff][\\x80-\\xbf]*)/"; -- 2.20.1