From: Ævar Arnfjörð Bjarmason Date: Sat, 9 Apr 2005 06:44:31 +0000 (+0000) Subject: * Misc cleanup X-Git-Tag: 1.5.0alpha1~329 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%22%20.%20%22?a=commitdiff_plain;h=3b96b28e370152cad2448083e763bdde996d5428;p=lhc%2Fweb%2Fwiklou.git * Misc cleanup --- diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php index ebb6336bed..f9e9e73bed 100644 --- a/languages/LanguageBe.php +++ b/languages/LanguageBe.php @@ -1,16 +1,15 @@ + * @bug 1638 + * @link http://be.wikipedia.org/wiki/Talk:LanguageBe.php + * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License */ -# Belarusian (Беларуская мова) -# File by Ævar Arnfjörð Bjarmason and translations by -# be:EugeneZelenko, be:Monk (and others) -# -# This file is dual-licensed under GFDL and GPL. -# -# See: http://bugzilla.wikimedia.org/show_bug.cgi?id=1638 -# http://be.wikipedia.org/wiki/Talk:LanguageBe.php require_once('LanguageUtf8.php'); diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php index 51bf715fdf..cfe1bda473 100644 --- a/languages/LanguageBg.php +++ b/languages/LanguageBg.php @@ -1,8 +1,10 @@ 'Медия', # -2 - NS_SPECIAL => 'Специални', # -1 - NS_MAIN => '', # 0 - NS_TALK => 'Беседа', # 1 - NS_USER => 'Потребител', # 2 - NS_USER_TALK => 'Потребител_беседа', # 3 - NS_PROJECT => $wgMetaNamespace, # 4 - NS_PROJECT_TALK => $wgMetaNamespace . '_беседа', # 5 - NS_IMAGE => 'Картинка', # 6 - NS_IMAGE_TALK => 'Картинка_беседа', # 7 - NS_MEDIAWIKI => 'МедияУики', # 8 - NS_MEDIAWIKI_TALK => 'МедияУики_беседа', # 9 - NS_TEMPLATE => 'Шаблон', # 10 - NS_TEMPLATE_TALK => 'Шаблон_беседа', # 11 - NS_HELP => 'Помощ', # 12 - NS_HELP_TALK => 'Помощ_беседа', # 13 - NS_CATEGORY => 'Категория', # 14 - NS_CATEGORY_TALK => 'Категория_беседа' # 15 + NS_MEDIA => 'Медия', + NS_SPECIAL => 'Специални', + NS_MAIN => '', + NS_TALK => 'Беседа', + NS_USER => 'Потребител', + NS_USER_TALK => 'Потребител_беседа', + NS_PROJECT => $wgMetaNamespace, + NS_PROJECT_TALK => $wgMetaNamespace . '_беседа', + NS_IMAGE => 'Картинка', + NS_IMAGE_TALK => 'Картинка_беседа', + NS_MEDIAWIKI => 'МедияУики', + NS_MEDIAWIKI_TALK => 'МедияУики_беседа', + NS_TEMPLATE => 'Шаблон', + NS_TEMPLATE_TALK => 'Шаблон_беседа', + NS_HELP => 'Помощ', + NS_HELP_TALK => 'Помощ_беседа', + NS_CATEGORY => 'Категория', + NS_CATEGORY_TALK => 'Категория_беседа' ) + $wgNamespaceNamesEn; /* private */ $wgQuickbarSettingsBg = array( - 'Без меню', 'Неподвижно вляво', 'Неподвижно вдясно', 'Плаващо вляво' + 'Без меню', 'Неподвижно вляво', 'Неподвижно вдясно', 'Плаващо вляво' ); /* private */ $wgSkinNamesBg = array( - 'standard' => 'Основен', - 'nostalgia' => 'Носталгия', - 'cologneblue' => 'Кьолнско синьо', - 'smarty' => 'Падингтън', - 'montparnasse' => 'Монпарнас', - 'davinci' => 'ДаВинчи', - 'mono' => 'Mono', - 'monobook' => 'MonoBook', - "myskin" => "MySkin" -); + 'standard' => 'Основен', + 'nostalgia' => 'Носталгия', + 'cologneblue' => 'Кьолнско синьо', + 'smarty' => 'Падингтън', + 'montparnasse' => 'Монпарнас', + 'davinci' => 'ДаВинчи', +) + $wgSkinNamesBg; -/* private */ $wgDateFormatsBg = array( -# 'Без предпочитание', -); - +/* private */ $wgDateFormatsBg = array(); /* private */ $wgBookstoreListBg = array( - 'books.bg' => "http://www.books.bg/ISBN/$1", - 'AddALL' => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN", - 'PriceSCAN' => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1", - 'Barnes & Noble' => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1", - 'Amazon.com' => "http://www.amazon.com/exec/obidos/ISBN=$1", -); - + 'books.bg' => "http://www.books.bg/ISBN/$1", +) + $wgBookstoreListEn; -# Note to translators: -# Please include the English words as synonyms. This allows people -# from other wikis to contribute more easily. -# - /* private */ $wgMagicWordsBg = array( # ID CASE SYNONYMS - MAG_REDIRECT => array( 0, '#redirect', '#пренасочване', '#виж' ), - MAG_NOTOC => array( 0, '__NOTOC__', '__БЕЗСЪДЪРЖАНИЕ__' ), - MAG_FORCETOC => array( 0, '__FORCETOC__', '__СЪДЪРЖАНИЕ__' ), - MAG_NOEDITSECTION => array( 0, '__NOEDITSECTION__', '__БЕЗ_РЕДАКТИРАНЕ_НА_РАЗДЕЛИ__' ), - MAG_START => array( 0, '__START__', '__НАЧАЛО__' ), - MAG_CURRENTMONTH => array( 1, 'CURRENTMONTH', 'ТЕКУЩМЕСЕЦ' ), - MAG_CURRENTMONTHNAME => array( 1, 'CURRENTMONTHNAME', 'ТЕКУЩМЕСЕЦИМЕ' ), - MAG_CURRENTDAY => array( 1, 'CURRENTDAY', 'ТЕКУЩДЕН' ), - MAG_CURRENTDAYNAME => array( 1, 'CURRENTDAYNAME', 'ТЕКУЩДЕНИМЕ' ), - MAG_CURRENTYEAR => array( 1, 'CURRENTYEAR', 'ТЕКУЩАГОДИНА' ), - MAG_CURRENTTIME => array( 1, 'CURRENTTIME', 'ТЕКУЩОВРЕМЕ' ), - MAG_NUMBEROFARTICLES => array( 1, 'NUMBEROFARTICLES', 'БРОЙСТАТИИ' ), - MAG_CURRENTMONTHNAMEGEN => array( 1, 'CURRENTMONTHNAMEGEN' ), - MAG_PAGENAME => array( 1, 'PAGENAME', 'СТРАНИЦА' ), - MAG_NAMESPACE => array( 1, 'NAMESPACE', 'ИМЕНПРОСТРАНСТВО' ), - MAG_MSG => array( 0, 'MSG:', 'СЪОБЩ:' ), - MAG_SUBST => array( 0, 'SUBST:', 'ЗАМЕСТ:' ), - MAG_MSGNW => array( 0, 'MSGNW:', 'СЪОБЩNW:' ), - MAG_END => array( 0, '__END__', '__КРАЙ__' ), - MAG_IMG_THUMBNAIL => array( 1, 'thumbnail', 'thumb', 'мини' ), - MAG_IMG_RIGHT => array( 1, 'right', 'вляво' ), - MAG_IMG_LEFT => array( 1, 'left', 'вдясно' ), - MAG_IMG_NONE => array( 1, 'none' ), - MAG_IMG_WIDTH => array( 1, "$1px", "$1пкс" ), - MAG_IMG_CENTER => array( 1, 'center', 'centre', 'център' ), - MAG_IMG_FRAMED => array( 1, 'framed', 'enframed', 'frame', 'рамка', 'врамка' ), - MAG_INT => array( 0, 'INT:' ), - MAG_SITENAME => array( 1, 'SITENAME', 'САЙТ' ), - MAG_NS => array( 0, 'NS:' ), - MAG_LOCALURL => array( 0, 'LOCALURL:' ), - MAG_LOCALURLE => array( 0, 'LOCALURLE:' ), - MAG_SERVER => array( 0, 'SERVER', 'СЪРВЪР' ) + MAG_REDIRECT => array( 0, '#redirect', '#пренасочване', '#виж' ), + MAG_NOTOC => array( 0, '__NOTOC__', '__БЕЗСЪДЪРЖАНИЕ__' ), + MAG_FORCETOC => array( 0, '__FORCETOC__', '__СЪДЪРЖАНИЕ__' ), + MAG_NOEDITSECTION => array( 0, '__NOEDITSECTION__', '__БЕЗ_РЕДАКТИРАНЕ_НА_РАЗДЕЛИ__' ), + MAG_START => array( 0, '__START__', '__НАЧАЛО__' ), + MAG_CURRENTMONTH => array( 1, 'CURRENTMONTH', 'ТЕКУЩМЕСЕЦ' ), + MAG_CURRENTMONTHNAME => array( 1, 'CURRENTMONTHNAME', 'ТЕКУЩМЕСЕЦИМЕ' ), + MAG_CURRENTDAY => array( 1, 'CURRENTDAY', 'ТЕКУЩДЕН' ), + MAG_CURRENTDAYNAME => array( 1, 'CURRENTDAYNAME', 'ТЕКУЩДЕНИМЕ' ), + MAG_CURRENTYEAR => array( 1, 'CURRENTYEAR', 'ТЕКУЩАГОДИНА' ), + MAG_CURRENTTIME => array( 1, 'CURRENTTIME', 'ТЕКУЩОВРЕМЕ' ), + MAG_NUMBEROFARTICLES => array( 1, 'NUMBEROFARTICLES', 'БРОЙСТАТИИ' ), + MAG_CURRENTMONTHNAMEGEN => array( 1, 'CURRENTMONTHNAMEGEN' ), + MAG_PAGENAME => array( 1, 'PAGENAME', 'СТРАНИЦА' ), + MAG_NAMESPACE => array( 1, 'NAMESPACE', 'ИМЕНПРОСТРАНСТВО' ), + MAG_MSG => array( 0, 'MSG:', 'СЪОБЩ:' ), + MAG_SUBST => array( 0, 'SUBST:', 'ЗАМЕСТ:' ), + MAG_MSGNW => array( 0, 'MSGNW:', 'СЪОБЩNW:' ), + MAG_END => array( 0, '__END__', '__КРАЙ__' ), + MAG_IMG_THUMBNAIL => array( 1, 'thumbnail', 'thumb', 'мини' ), + MAG_IMG_RIGHT => array( 1, 'right', 'вляво' ), + MAG_IMG_LEFT => array( 1, 'left', 'вдясно' ), + MAG_IMG_NONE => array( 1, 'none' ), + MAG_IMG_WIDTH => array( 1, "$1px", "$1пкс" ), + MAG_IMG_CENTER => array( 1, 'center', 'centre', 'център' ), + MAG_IMG_FRAMED => array( 1, 'framed', 'enframed', 'frame', 'рамка', 'врамка' ), + MAG_INT => array( 0, 'INT:' ), + MAG_SITENAME => array( 1, 'SITENAME', 'САЙТ' ), + MAG_NS => array( 0, 'NS:' ), + MAG_LOCALURL => array( 0, 'LOCALURL:' ), + MAG_LOCALURLE => array( 0, 'LOCALURLE:' ), + MAG_SERVER => array( 0, 'SERVER', 'СЪРВЪР' ) ); # All special pages have to be listed here: a description of "" @@ -111,59 +97,57 @@ # is the right thing for some of them (such as the "targeted" ones). # /* private */ $wgValidSpecialPagesBg = array( - 'Userlogin' => 'Влизане', - 'Userlogout' => 'Излизане', - 'Preferences' => 'Потребителски настройки', - 'Watchlist' => 'Наблюдавани страници', - 'Recentchanges' => 'Последни промени', - 'Upload' => 'Качване на картинки', - 'Imagelist' => 'Списък на картинките', - 'Listusers' => 'Регистрирани потребители', - 'Statistics' => 'Статистика', - 'Randompage' => 'Случайна статия', - - 'Lonelypages' => 'Статии сираци', - 'Unusedimages' => 'Картинки сираци', - 'Popularpages' => 'Известни статии', - 'Wantedpages' => 'Желани статии', - 'Shortpages' => 'Кратки статии', - 'Longpages' => 'Дълги статии', - 'Newpages' => 'Нови статии', - 'Ancientpages' => 'Стари статии', - 'Deadendpages' => 'Задънени статии', -# 'Intl' => 'Междуезикови препратки', - 'Allpages' => 'Всички статии по заглавие', - - 'Ipblocklist' => 'Блокирани потребители/IP-адреси', - 'Maintenance' => 'Страница за поддръжка', - 'Specialpages' => '', - 'Contributions' => '', - 'Emailuser' => '', - 'Whatlinkshere' => '', - 'Recentchangeslinked' => '', - 'Movepage' => '', - 'Blockme' => '', - 'Booksources' => 'Външни източници на книги', - 'Categories' => 'Категории страници', - 'Export' => 'Изнасяне като XML', - 'Version' => 'Версия на МедияУики', - 'Allmessages' => 'Всички системни съобщения', - 'Search' => '', + 'Userlogin' => 'Влизане', + 'Userlogout' => 'Излизане', + 'Preferences' => 'Потребителски настройки', + 'Watchlist' => 'Наблюдавани страници', + 'Recentchanges' => 'Последни промени', + 'Upload' => 'Качване на картинки', + 'Imagelist' => 'Списък на картинките', + 'Listusers' => 'Регистрирани потребители', + 'Statistics' => 'Статистика', + 'Randompage' => 'Случайна статия', + + 'Lonelypages' => 'Статии сираци', + 'Unusedimages' => 'Картинки сираци', + 'Popularpages' => 'Известни статии', + 'Wantedpages' => 'Желани статии', + 'Shortpages' => 'Кратки статии', + 'Longpages' => 'Дълги статии', + 'Newpages' => 'Нови статии', + 'Ancientpages' => 'Стари статии', + 'Deadendpages' => 'Задънени статии', + # 'Intl' => 'Междуезикови препратки', + 'Allpages' => 'Всички статии по заглавие', + + 'Ipblocklist' => 'Блокирани потребители/IP-адреси', + 'Maintenance' => 'Страница за поддръжка', + 'Specialpages' => '', + 'Contributions' => '', + 'Emailuser' => '', + 'Whatlinkshere' => '', + 'Recentchangeslinked' => '', + 'Movepage' => '', + 'Blockme' => '', + 'Booksources' => 'Външни източници на книги', + 'Categories' => 'Категории страници', + 'Export' => 'Изнасяне като XML', + 'Version' => 'Версия на МедияУики', + 'Allmessages' => 'Всички системни съобщения', + 'Search' => '', ); /* private */ $wgSysopSpecialPagesBg = array( - 'Blockip' => 'Блокиране на потребител/IP-адрес', - 'Asksql' => 'Справка към базата данни', - 'Undelete' => 'Възстановяване на изтрити страници', - 'Makesysop' => 'Превръщане на потребител в администратор', - 'Import' => 'Внасяне на страница с история', + 'Blockip' => 'Блокиране на потребител/IP-адрес', + 'Asksql' => 'Справка към базата данни', + 'Undelete' => 'Възстановяване на изтрити страници', + 'Makesysop' => 'Превръщане на потребител в администратор', + 'Import' => 'Внасяне на страница с история', ); /* private */ $wgDeveloperSpecialPagesBg = array( - 'Lockdb' => 'Забрана на достъп за писане към базата данни', - 'Unlockdb' => 'Разрешаване на достъп за писане към базата данни', - - + 'Lockdb' => 'Забрана на достъп за писане към базата данни', + 'Unlockdb' => 'Разрешаване на достъп за писане към базата данни', ); #------------------------------------------------------------------- @@ -1391,73 +1375,69 @@ require_once( 'LanguageUtf8.php' ); class LanguageBg extends LanguageUtf8 { - function getBookstoreList () { - global $wgBookstoreListBg ; - return $wgBookstoreListBg ; - } - - function getNamespaces() { - global $wgNamespaceNamesBg; - return $wgNamespaceNamesBg; - } - - function getNsText( $index ) { - global $wgNamespaceNamesBg; - return $wgNamespaceNamesBg[$index]; - } - - function getNsIndex( $text ) { - global $wgNamespaceNamesBg, $wgNamespaceNamesEn; - - foreach ( $wgNamespaceNamesBg as $i => $n ) { - if ( 0 == strcasecmp( $n, $text ) ) { return $i; } - } - # Existing links; fall back to support English names - foreach ( $wgNamespaceNamesEn as $i => $n ) { - if ( 0 == strcasecmp( $n, $text ) ) { return $i; } - } - return false; - } - - function getQuickbarSettings() { - global $wgQuickbarSettingsBg; - return $wgQuickbarSettingsBg; - } - - function getSkinNames() { - global $wgSkinNamesBg; - return $wgSkinNamesBg; - } - - function getDateFormats() { - global $wgDateFormatsBg; - return $wgDateFormatsBg; - } - - function getValidSpecialPages() - { - global $wgValidSpecialPagesBg; - return $wgValidSpecialPagesBg; - } - - function getSysopSpecialPages() - { - global $wgSysopSpecialPagesBg; - return $wgSysopSpecialPagesBg; - } - - function getDeveloperSpecialPages() - { - global $wgDeveloperSpecialPagesBg; - return $wgDeveloperSpecialPagesBg; - } + function getBookstoreList () { + global $wgBookstoreListBg ; + return $wgBookstoreListBg ; + } + + function getNamespaces() { + global $wgNamespaceNamesBg; + return $wgNamespaceNamesBg; + } + + function getNsText( $index ) { + global $wgNamespaceNamesBg; + return $wgNamespaceNamesBg[$index]; + } + + function getNsIndex( $text ) { + global $wgNamespaceNamesBg, $wgNamespaceNamesEn; + + foreach ( $wgNamespaceNamesBg as $i => $n ) { + if ( 0 == strcasecmp( $n, $text ) ) { return $i; } + } + return false; + } + + function getQuickbarSettings() { + global $wgQuickbarSettingsBg; + return $wgQuickbarSettingsBg; + } + + function getSkinNames() { + global $wgSkinNamesBg; + return $wgSkinNamesBg; + } + + function getDateFormats() { + global $wgDateFormatsBg; + return $wgDateFormatsBg; + } + + function getValidSpecialPages() + { + global $wgValidSpecialPagesBg; + return $wgValidSpecialPagesBg; + } + + function getSysopSpecialPages() + { + global $wgSysopSpecialPagesBg; + return $wgSysopSpecialPagesBg; + } + + function getDeveloperSpecialPages() + { + global $wgDeveloperSpecialPagesBg; + return $wgDeveloperSpecialPagesBg; + } function getMessage( $key ) { global $wgAllMessagesBg; if( isset( $wgAllMessagesBg[$key] ) ) { return $wgAllMessagesBg[$key]; } else { - return Language::getMessage( $key ); + return parent::getMessage( $key ); } } diff --git a/languages/LanguageBm.php b/languages/LanguageBm.php index 6b06632d86..958bf32d1f 100644 --- a/languages/LanguageBm.php +++ b/languages/LanguageBm.php @@ -1,17 +1,16 @@ diff --git a/languages/LanguageBo.php b/languages/LanguageBo.php index a3bfef7361..999c2a6b52 100644 --- a/languages/LanguageBo.php +++ b/languages/LanguageBo.php @@ -1,8 +1,10 @@ */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php index 38912356ef..1888e21071 100644 --- a/languages/LanguageDa.php +++ b/languages/LanguageDa.php @@ -1,15 +1,9 @@ "Nostalgi", 'cologneblue' => "Cologne-blÃ¥", 'smarty' => "Paddington", - 'montparnasse' => "Montparnasse", - 'davinci' => "DaVinci", - 'mono' => "Mono", - 'monobook' => "MonoBook", - "myskin" => "MySkin" -); +) + $wgSkinNamesEn; -/* private */ $wgDateFormatsDa = array( -# "Ingen foretrukken", -); +/* private */ $wgDateFormatsDa = array(); /* private */ $wgBookstoreListDa = array( "Bibliotek.dk" => "http://bibliotek.dk/vis.php?base=dfa&origin=kommando&field1=ccl&term1=is=$1&element=L&start=1&step=10", "Bogguide.dk" => "http://www.bogguide.dk/find_boeger_bog.asp?ISBN=$1", - "AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN", - "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1", - "Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1", - "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1" -); +) + $wgBookstoreLisEn; # All special pages have to be listed here: a description of "" diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php index 53e3ee696b..93fcd9bfa6 100644 --- a/languages/LanguageDe.php +++ b/languages/LanguageDe.php @@ -1,15 +1,10 @@ */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageEl.php b/languages/LanguageEl.php index 24736e9f93..1091f17b65 100644 --- a/languages/LanguageEl.php +++ b/languages/LanguageEl.php @@ -1,5 +1,6 @@ "Klasika", 'nostalgia' => "Nostalgio", 'cologneblue' => "Kolonja Bluo", - 'davinci' => "DaVinci", 'mono' => "Senkolora", 'monobook' => "Librejo", - 'myskin' => 'MySkin', 'chick' => 'Kokido', -); +) + $wgSkinNamesEn; @@ -982,7 +980,7 @@ Bonvolu permane kunigi ilin.", class LanguageEo extends LanguageUtf8 { function getDefaultUserOptions () { - $opt = Language::getDefaultUserOptions(); + $opt = parent::getDefaultUserOptions(); $opt["altencoding"] = 0; return $opt; } @@ -1018,8 +1016,6 @@ class LanguageEo extends LanguageUtf8 { return $wgSkinNamesEo; } - # Heredu userAdjust() - # La dato- kaj tempo-funkciojn oni povas precizigi laÅ­ lingvo function date( $ts, $adj = false ) { if ( $adj ) { $ts = $this->userAdjust( $ts ); } diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php index 56d08da52f..c306534d7a 100644 --- a/languages/LanguageEs.php +++ b/languages/LanguageEs.php @@ -1,15 +1,9 @@ "Categoría_Discusión", ) + $wgNamespaceNamesEn; -/* private */ $wgQuickbarSettingsEs = array( - - "None", "Fixed left", "Fixed right", "Floating left" -); /* private */ $wgQuickbarSettingsEs = array( "Ninguna", "Fija a la izquierda", "Fija a la derecha", "Flotante a la izquierda" ); /* private */ $wgSkinNamesEs = array( 'standard' => "Estándar", - 'nostalgia' => "Nostalgia", - 'cologneblue' => "Cologne Blue", - 'smarty' => "Paddington", - 'montparnasse' => "Montparnasse", - 'davinci' => "DaVinci", - 'mono' => "Mono", - 'monobook' => "MonoBook", - "myskin" => "MySkin" -); +) + $wgSkinNamesEn; -/* private */ $wgDateFormatsEs = array( -# "Sin preferencia", -); - -/* Please customize this with some Spanish-language bookshops - and/or reference sites that can look up by ISBN number */ -/* private */ $wgBookstoreListEs = array( - "AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN", - "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1", - "Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1", - "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1" -); +/* private */ $wgDateFormatsEs = array(); # All special pages have to be listed here: a description of "" @@ -1207,9 +1178,6 @@ class LanguageEs extends LanguageUtf8 { } - - # Inherit userAdjust() - function shortdate( $ts, $adj = false ) { if ( $adj ) { $ts = $this->userAdjust( $ts ); } @@ -1257,7 +1225,7 @@ class LanguageEs extends LanguageUtf8 { if( isset( $wgAllMessagesEs[$key] ) ) { return $wgAllMessagesEs[$key]; } else { - return Language::getMessage( $key ); + return parent::getMessage( $key ); } } } diff --git a/languages/LanguageFa.php b/languages/LanguageFa.php index 0cca04bd34..e96f2430bd 100644 --- a/languages/LanguageFa.php +++ b/languages/LanguageFa.php @@ -1,5 +1,6 @@ "૦", - "1" => "૧", - "2" => "૨", - "3" => "à«©", - "4" => "૪", - "5" => "à««", - "6" => "૬", - "7" => "à«­", - "8" => "à«®", - "9" => "૯" + '0' => '૦', + '1' => '૧', + '2' => '૨', + '3' => 'à«©', + '4' => '૪', + '5' => 'à««', + '6' => '૬', + '7' => 'à«­', + '8' => 'à«®', + '9' => '૯' ); function formatNum( $number ) { diff --git a/languages/LanguageKm.php b/languages/LanguageKm.php index 84aea43f5f..429a50174b 100644 --- a/languages/LanguageKm.php +++ b/languages/LanguageKm.php @@ -3,6 +3,8 @@ * * @package MediaWiki * @subpackage Language + * + * @author Ævar Arnfjörð Bjarmason */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageLa.php b/languages/LanguageLa.php index b05c9dcc21..513a9f668a 100644 --- a/languages/LanguageLa.php +++ b/languages/LanguageLa.php @@ -19,8 +19,6 @@ NS_MEDIAWIKI_TALK => 'Disputatio_MediaWiki', NS_TEMPLATE => 'Template', NS_TEMPLATE_TALK => 'Template_talk' - - ) + $wgNamespaceNamesEn; /* private */ $wgQuickbarSettingsLa = array( diff --git a/languages/LanguageLo.php b/languages/LanguageLo.php index fe1b266b0b..ff8b07b5d6 100644 --- a/languages/LanguageLo.php +++ b/languages/LanguageLo.php @@ -3,6 +3,8 @@ * * @package MediaWiki * @subpackage Language + * + * @author Ævar Arnfjörð Bjarmason */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageMl.php b/languages/LanguageMl.php index c41b4f5742..edf8df384f 100644 --- a/languages/LanguageMl.php +++ b/languages/LanguageMl.php @@ -3,6 +3,8 @@ * * @package MediaWiki * @subpackage Language + * + * @author Ævar Arnfjörð Bjarmason */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageNon.php b/languages/LanguageNon.php index e65607a780..069c7eb5ac 100644 --- a/languages/LanguageNon.php +++ b/languages/LanguageNon.php @@ -1,15 +1,14 @@ diff --git a/languages/LanguageOr.php b/languages/LanguageOr.php index 63afcf8ffc..b19db6ad67 100644 --- a/languages/LanguageOr.php +++ b/languages/LanguageOr.php @@ -3,6 +3,8 @@ * * @package MediaWiki * @subpackage Language + * + * @author Ævar Arnfjörð Bjarmason */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageTe.php b/languages/LanguageTe.php index 3358e0a540..b5de0d43b2 100644 --- a/languages/LanguageTe.php +++ b/languages/LanguageTe.php @@ -3,6 +3,8 @@ * * @package MediaWiki * @subpackage Language + * + * @author Ævar Arnfjörð Bjarmason */ require_once( 'LanguageUtf8.php' ); diff --git a/languages/LanguageTlh.php b/languages/LanguageTlh.php index 9d5115be52..f4ee191e1e 100644 --- a/languages/LanguageTlh.php +++ b/languages/LanguageTlh.php @@ -1,11 +1,10 @@ "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN", - "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1", - "Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1", - "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1" -); - # Read language names global $wgLanguageNames; require_once( "Names.php" ); @@ -192,11 +184,6 @@ $wgLanguageNamesTt =& $wgLanguageNames; class LanguageTt extends LanguageUtf8 { - function getBookstoreList () { - global $wgBookstoreListTt; - return $wgBookstoreListTt; - } - function getNamespaces() { global $wgNamespaceNamesTt; return $wgNamespaceNamesTt; @@ -275,30 +262,10 @@ class LanguageTt extends LanguageUtf8 { if( isset( $wgAllMessagesTt[$key] ) ) { return $wgAllMessagesTt[$key]; } else { - return Language::getMessage( $key ); + return parent::getMessage( $key ); } } - # Inherit iconv() - - # Inherit ucfirst() - - # Inherit lcfirst() - - # Inherit checkTitleEncoding() - - # Inherit stripForSearch() - - # Inherit setAltEncoding() - - # Inherit recodeForEdit() - - # Inherit recodeInput() - - # Inherit isRTL() - - # Inherit getMagicWords() - function fallback8bitEncoding() { # Windows codepage 1252 is a superset of iso 8859-1 # override this to use difference source encoding to diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php index c88da06bd4..2e3cb71937 100755 --- a/languages/LanguageUk.php +++ b/languages/LanguageUk.php @@ -4,7 +4,7 @@ * @subpackage Language */ -require_once( "LanguageUtf8.php" ); +require_once( 'LanguageUtf8.php' ); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" @@ -57,10 +57,6 @@ require_once( "LanguageUtf8.php" ); ); -/* Add a $wgBookstoreListUk to override default list of book links for ISBN links */ - - - /* private */ $wgAllMessagesUk = array( 'special_version_prefix' => '', 'special_version_postfix' => '', diff --git a/languages/LanguageUr.php b/languages/LanguageUr.php index dada493eb1..5d9d60e2bd 100644 --- a/languages/LanguageUr.php +++ b/languages/LanguageUr.php @@ -11,7 +11,7 @@ require_once( "LanguageUtf8.php" ); class LanguageUr extends LanguageUtf8 { function getDefaultUserOptions() { - $opt = Language::getDefaultUserOptions(); + $opt = parent::getDefaultUserOptions(); $opt["quickbar"] = 2; # Right-to-left $opt["underline"] = 0; # Underline is hard to read in Arabic script return $opt; diff --git a/languages/LanguageWa.php b/languages/LanguageWa.php index 2d2388a363..8172cd1eaa 100644 --- a/languages/LanguageWa.php +++ b/languages/LanguageWa.php @@ -50,13 +50,6 @@ require_once( "LanguageUtf8.php" ); # "Nole preferince", ); -/* private */ $wgBookstoreListWa = array( - "AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN", - "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1", - "Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1", - "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1" -); - # All special pages have to be listed here: a description of "" # will make them not show up on the "Special Pages" page, which @@ -1165,11 +1158,6 @@ amusement.", # co a fé class LanguageWa extends LanguageUtf8 { - function getBookstoreList () { - global $wgBookstoreListWa ; - return $wgBookstoreListWa ; - } - function getNamespaces() { global $wgNamespaceNamesWa; return $wgNamespaceNamesWa; diff --git a/languages/LanguageYi.php b/languages/LanguageYi.php index 8c7f6c9bb5..9a2aa721a5 100644 --- a/languages/LanguageYi.php +++ b/languages/LanguageYi.php @@ -11,7 +11,7 @@ require_once( "LanguageUtf8.php" ); class LanguageYi extends LanguageUtf8 { function getDefaultUserOptions() { - $opt = Language::getDefaultUserOptions(); + $opt = parent::getDefaultUserOptions(); $opt["quickbar"] = 2; # Right-to-left return $opt; } diff --git a/languages/LanguageZh_cn.php b/languages/LanguageZh_cn.php index 5bc7f652b8..134b794867 100644 --- a/languages/LanguageZh_cn.php +++ b/languages/LanguageZh_cn.php @@ -53,15 +53,6 @@ require_once( "LanguageUtf8.php" ); 'myskin' => "MySkin" ); - - -/* private */ $wgBookstoreListZh_cn = array( - "AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN", - "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1", - "Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1", - "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1" -); - /* private */ $wgUserTogglesZh_cn = array( 'nolangconversion', ) + $wgUserTogglesEn; @@ -1017,11 +1008,6 @@ email address to them, and it can be used to send you a new password if you forg class LanguageZh_cn extends LanguageUtf8 { - function getBookstoreList () { - global $wgBookstoreListZh_cn ; - return $wgBookstoreListZh_cn ; - } - function getUserToggles() { global $wgUserTogglesZh_cn; return $wgUserTogglesZh_cn;