r23504 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r23503‎ | r23504 | r23505 >
Date:14:00, 28 June 2007
Author:robchurch
Status:old
Tags:
Comment:
Merge r23460:r23503 from trunk
Modified paths:
  • /branches/robchurch/logs/RELEASE-NOTES (modified) (history)
  • /branches/robchurch/logs/docs/hooks.txt (modified) (history)
  • /branches/robchurch/logs/includes/Article.php (modified) (history)
  • /branches/robchurch/logs/includes/GlobalFunctions.php (modified) (history)
  • /branches/robchurch/logs/includes/SpecialContributions.php (modified) (history)
  • /branches/robchurch/logs/includes/SpecialLog.php (modified) (history)
  • /branches/robchurch/logs/includes/SpecialUserrights.php (modified) (history)
  • /branches/robchurch/logs/includes/User.php (modified) (history)
  • /branches/robchurch/logs/includes/Wiki.php (modified) (history)
  • /branches/robchurch/logs/includes/Xml.php (modified) (history)
  • /branches/robchurch/logs/includes/XmlFunctions.php (modified) (history)
  • /branches/robchurch/logs/includes/api/ApiMain.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesDa.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesKk_cn.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesKk_kz.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesKk_tr.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesTi.php (added) (history)
  • /branches/robchurch/logs/languages/messages/MessagesTi.php (added) (history)
  • /branches/robchurch/logs/languages/messages/MessagesZh_classical.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesZh_cn.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesZh_tw.php (modified) (history)
  • /branches/robchurch/logs/languages/messages/MessagesZh_yue.php (modified) (history)
  • /branches/robchurch/logs/maintenance/archives/patch-archive-user-index.sql (added) (history)
  • /branches/robchurch/logs/maintenance/archives/patch-archive-user-index.sql (added) (history)
  • /branches/robchurch/logs/maintenance/updaters.inc (modified) (history)

Diff [purge]

Index: branches/robchurch/logs/docs/hooks.txt
@@ -637,6 +637,10 @@
638638 $user: user that watched
639639 $article: article object that was watched
640640
 641+'UserEffectiveGroups': Called in User::getEffectiveGroups()
 642+$user: User to get groups for
 643+&$groups: Current effective groups
 644+
641645 'CategoryPageView': before viewing a categorypage in CategoryPage::view
642646 $catpage: CategoryPage instance
643647
Index: branches/robchurch/logs/languages/messages/MessagesZh_cn.php
@@ -818,6 +818,9 @@
819819 'userrights-groupsavailable' => '可加入群组:',
820820 'userrights-groupshelp' => '选择您想使该用户退出或加入的组群。反选时组群将不改变。您可以通过按住 CTRL 键 + 单击鼠标左键来反选',
821821 'userrights-reason' => '更改原因:',
 822+'userrights-list' => '因为您是$1的成员,您可以加入$2以及移除$3。',
 823+'userrights-list-nogroups' => '无组别',
 824+'userrights-list-groups' => '$2{{PLURAL:$1|组别|组别}}',
822825
823826 # Groups
824827 'group' => '群组:',
@@ -900,7 +903,7 @@
901904 'uploadedfiles' => '已上传文件',
902905 'ignorewarning' => '忽略警告并保存文件。',
903906 'ignorewarnings' => '忽略所有警告',
904 -'minlength' => '文件名字必须至少有三个字母。',
 907+'minlength1' => '文件名字必须至少有一个字母。',
905908 'illegalfilename' => '文件名"$1"包含有页面标题所禁止的字符。请改名后重新上传。',
906909 'badfilename' => '文件名已被改为"$1"。',
907910 'filetype-badmime' => 'MIME类别"$1"不是容许的文件格式。',
@@ -1037,7 +1040,7 @@
10381041 'disambiguations-text' => '以下的页面都有到<b>消含糊页</b>的链接, 但它们应该是链到适当的标题。<br />一个页面会被视为消含糊页如果它是链自[[MediaWiki:disambiguationspage]]。',
10391042
10401043 'doubleredirects' => '双重重定向页面',
1041 -'doubleredirectstext' => '每一行都包含到第一和第二个重定向页面的链接,以及第二个重定向页面的第一行文字,通常显示的都会是"真正"的目标页面,也就是第一个重定向页面应该指向的页面。',
 1044+'doubleredirectstext' => '每一行都包含到第一和第二个重定向页面的链接,以及第二个重定向页面的目标,通常显示的都会是"真正"的目标页面,也就是第一个重定向页面应该指向的页面。',
10421045
10431046 'brokenredirects' => '损坏的重定向页',
10441047 'brokenredirectstext' => '以下的重定向页面指向的是不存在的页面:',
@@ -1377,6 +1380,9 @@
13781381 'uclinks' => '参看最后$1次修改;参看最后$2天。',
13791382 'uctop' => ' (最新修改)',
13801383
 1384+'month' => '月份:',
 1385+'year' => '年份:',
 1386+
13811387 'sp-contributions-newest' => '最新',
13821388 'sp-contributions-oldest' => '最早',
13831389 'sp-contributions-newer' => '前$1次',
@@ -1524,11 +1530,11 @@
15251531 *您不勾选下面的复选框。
15261532
15271533 在这些情况下,您在必要时必须手工移动或合并页面。",
1528 -'movearticle' => '移动页面',
 1534+'movearticle' => '移动页面:',
15291535 'movenologin' => '未登录',
15301536 'movenologintext' => '您必须是一名登记用户并且[[Special:Userlogin|登录]]
15311537 后才可移动一个页面。',
1532 -'newtitle' => '新标题',
 1538+'newtitle' => '新标题:',
15331539 'move-watch' => '监视此页',
15341540 'movepagebtn' => '移动页面',
15351541 'pagemovedsub' => '移动成功',
@@ -2065,6 +2071,7 @@
20662072 'watchlistall1' => '全部',
20672073 'watchlistall2' => '全部',
20682074 'namespacesall' => '全部',
 2075+'monthsall' => '全部',
20692076
20702077 # E-mail address confirmation
20712078 'confirmemail' => '确认邮箱地址',
@@ -2135,9 +2142,6 @@
21362143 'articletitles' => '文章以"$1"开头',
21372144 'hideresults' => '隐藏结果',
21382145
2139 -# DISPLAYTITLE
2140 -'displaytitle' => '(以[[$1]]链接到此页)',
2141 -
21422146 'loginlanguagelabel' => '语言: $1',
21432147
21442148 # Multipage image navigation
Index: branches/robchurch/logs/languages/messages/MessagesZh_classical.php
@@ -740,7 +740,7 @@
741741 'uploadedfiles' => '進獻',
742742 'ignorewarning' => '強儲之。',
743743 'ignorewarnings' => '警略。',
744 -'minlength' => '名務逾三字元。',
 744+'minlength1' => '名務逾一字元。',
745745 'illegalfilename' => '名"$1"不格,更之再焉。',
746746 'badfilename' => '更名"$1。".',
747747 'emptyfile' => '無以獻,疑謬名也,請核之。',
@@ -989,6 +989,9 @@
990990 'uclinks' => ' 近$1易,近$2日',
991991 'uctop' => ' (頂)',
992992
 993+'month' => '月:',
 994+'year' => '年:',
 995+
993996 'sp-contributions-newest' => '末',
994997 'sp-contributions-oldest' => '首',
995998 'sp-contributions-newer' => '後$1',
@@ -1062,10 +1065,10 @@
10631066
10641067 # Move page
10651068 'movepage' => '遷文',
1066 -'movearticle' => '遷此文',
 1069+'movearticle' => '遷此文:',
10671070 'movenologin' => '未登簿',
10681071 'movenologintext' => '遷文須[[Special:Userlogin|登簿]]。',
1069 -'newtitle' => '至新題',
 1072+'newtitle' => '至新題:',
10701073 'movepagebtn' => '遷此頁',
10711074 'pagemovedsub' => '成',
10721075 'pagemovedtext' => '[[$1]]"遷"[[$2]]"矣。',
@@ -1172,6 +1175,7 @@
11731176 'watchlistall1' => '全',
11741177 'watchlistall2' => '全',
11751178 'namespacesall' => '全',
 1179+'monthsall' => '全',
11761180
11771181 # E-mail address confirmation
11781182 'confirmemail' => '核郵驛',
Index: branches/robchurch/logs/languages/messages/MessagesDa.php
@@ -883,6 +883,9 @@
884884 'userrights-groupshelp' => 'Vælg grupper som du ønsker brugeren skal fjernes fra eller føjes til.
885885 Grupper som ikke er valgt, vil ikke blive ændret. Du kan ophæve valget af en gruppe ved hjælp af CTRL-tasten og et venstreklik.',
886886 'userrights-reason' => 'Årsag:',
 887+'userrights-list' => 'Som medlem af $1, kan du tilføje $2 og fjerne $3.',
 888+'userrights-list-nogroups' => 'ingen grupper',
 889+'userrights-list-groups' => '{{PLURAL:$1|gruppen|grupperne}} $2',
887890
888891 # Groups
889892 'group' => 'Gruppe:',
@@ -1239,6 +1242,7 @@
12401243 'allpagessubmit' => 'Vis',
12411244 'allpagesprefix' => 'Vis sider med præfiks:',
12421245 'allpagesbadtitle' => 'Det indtastede sidenavn er ugyldigt: Det har enten et foranstillet sprog-, en Interwiki-forkortelse eller indeholder et eller flere tegn, som ikke må anvendes i sidenavne.',
 1246+'allpages-bad-ns' => 'Navnerummet $1 findes ikke på {{SITENAME}}.',
12431247
12441248 # Special:Listusers
12451249 'listusersfrom' => 'Vis brugere fra:',
@@ -2197,9 +2201,6 @@
21982202 'articletitles' => "Sider, som begynder med ''$1''",
21992203 'hideresults' => 'Skjul',
22002204
2201 -# DISPLAYTITLE
2202 -'displaytitle' => '(Henvis til denne side som [[$1]])',
2203 -
22042205 'loginlanguagelabel' => 'Sprog: $1',
22052206
22062207 # Multipage image navigation
Index: branches/robchurch/logs/languages/messages/MessagesZh_tw.php
@@ -791,6 +791,9 @@
792792 'userrights-groupsavailable' => '可用群組:',
793793 'userrights-groupshelp' => '請選擇您想讓用戶加入或退出的群組。沒有選擇的群組將不會被改變。您也可以用"CTRL + 左擊滑鼠"複選或取消已經選擇的群組。',
794794 'userrights-reason' => '更改原因:',
 795+'userrights-list' => '因為您是$1的成員,您可以加入$2以及移除$3。',
 796+'userrights-list-nogroups' => '無組別',
 797+'userrights-list-groups' => '$2{{PLURAL:$1|組別|組別}}',
795798
796799 # Groups
797800 'group' => '群組:',
@@ -874,7 +877,7 @@
875878 'uploadedfiles' => '已上載文件',
876879 'ignorewarning' => '忽略警告並儲存檔案。',
877880 'ignorewarnings' => '忽略所有警告',
878 -'minlength' => '檔案名字必須至少有三個字母。',
 881+'minlength1' => '檔案名字必須至少有一個字母。',
879882 'illegalfilename' => '檔案名"$1"包含有頁面標題所禁止的字符。請改名後重新上傳。',
880883 'badfilename' => '檔案名已被改為"$1"。',
881884 'filetype-badmime' => 'MIME類別"$1"不是容許的檔案格式。',
@@ -1011,7 +1014,7 @@
10121015 'disambiguations-text' => '以下的頁面都有到<b>消含糊頁</b>的鏈接, 但它們應該是連到適當的標題。<br />一個頁面會被視為消含糊頁如果它是連自[[MediaWiki:disambiguationspage]]。',
10131016
10141017 'doubleredirects' => '雙重重定向頁面',
1015 -'doubleredirectstext' => '每一行都包含到第一和第二個重定向頁面的鏈接,以及第二個重定向頁面的第一行文字,通常顯示的都會是"真正"的目標頁面,也就是第一個重定向頁面應該指向的頁面。',
 1018+'doubleredirectstext' => '每一行都包含到第一和第二個重定向頁面的鏈接,以及第二個重定向頁面的目標,通常顯示的都會是"真正"的目標頁面,也就是第一個重定向頁面應該指向的頁面。',
10161019
10171020 'brokenredirects' => '損壞的重定向頁',
10181021 'brokenredirectstext' => '以下的重定向頁指向的是不存在的頁面:',
@@ -1351,6 +1354,9 @@
13521355 'uclinks' => '參看最後$1次修改;參看最後$2天。',
13531356 'uctop' => ' (最新修改)',
13541357
 1358+'month' => '月份:',
 1359+'year' => '年份:',
 1360+
13551361 'sp-contributions-newest' => '最新',
13561362 'sp-contributions-oldest' => '最舊',
13571363 'sp-contributions-newer' => '前$1次',
@@ -1498,11 +1504,11 @@
14991505 *您不勾選下面的覆選框。
15001506
15011507 在這些情況下,您在必要時必須手工移動或合併頁面。",
1502 -'movearticle' => '移動頁面',
 1508+'movearticle' => '移動頁面:',
15031509 'movenologin' => '未登入',
15041510 'movenologintext' => '您必須是一名登記用戶並且[[Special:Userlogin|登入]]
15051511 後才可移動一個頁面。',
1506 -'newtitle' => '新標題',
 1512+'newtitle' => '新標題:',
15071513 'move-watch' => '監視此頁',
15081514 'movepagebtn' => '移動頁面',
15091515 'pagemovedsub' => '移動成功',
@@ -2039,6 +2045,7 @@
20402046 'watchlistall1' => '全部',
20412047 'watchlistall2' => '全部',
20422048 'namespacesall' => '全部',
 2049+'monthsall' => '全部',
20432050
20442051 # E-mail address confirmation
20452052 'confirmemail' => '確認郵箱位址',
@@ -2109,9 +2116,6 @@
21102117 'articletitles' => '文章以"$1"開頭',
21112118 'hideresults' => '隱藏結果',
21122119
2113 -# DISPLAYTITLE
2114 -'displaytitle' => '(以[[$1]]連結到此頁)',
2115 -
21162120 'loginlanguagelabel' => '語言: $1',
21172121
21182122 # Multipage image navigation
Index: branches/robchurch/logs/languages/messages/MessagesZh_yue.php
@@ -912,6 +912,9 @@
913913 'userrights-groupsavailable' => '可用嘅組:',
914914 'userrights-groupshelp' => '選擇你想畀用戶加入或移出嘅組。未選擇嘅組將唔會被改變。你可以用CTRL + 撳滑鼠左掣以取消已經選擇嘅一個組',
915915 'userrights-reason' => '更改嘅原因:',
 916+'userrights-list' => '因為你係$1嘅成員,你可以加入$2同埋拎走$3。',
 917+'userrights-list-nogroups' => '無組別',
 918+'userrights-list-groups' => '$2{{PLURAL:$1|組|組}}',
916919
917920 # Groups
918921 #
@@ -996,7 +999,7 @@
9971000 'uploadedfiles' => '上載檔案中',
9981001 'ignorewarning' => '總要忽略警告同埋儲存檔案。',
9991002 'ignorewarnings' => '忽略任何警告',
1000 -'minlength' => '檔名必須最少要有三個字。',
 1003+'minlength1' => '檔名必須最少要有一個字。',
10011004 'illegalfilename' => '檔名「$1」含有頁面標題所唔允許嘅字。請試下改檔名再上載。',
10021005 'badfilename' => '檔名已經更改成「$1」。',
10031006 'filetype-badmime' => '「$1」嘅MIME類型檔案係唔容許上載嘅。',
@@ -1136,7 +1139,7 @@
11371140 'disambiguations-text' => "以下呢啲頁面連結去一個'''搞清楚頁'''。佢哋先至應該指去正確嘅主題。<br />如果一個頁面連結自[[MediaWiki:disambiguationspage]],噉就會當佢係搞清楚頁。",
11381141
11391142 'doubleredirects' => '雙重跳轉',
1140 -'doubleredirectstext' => "每一行包括指去第一個同第二個跳轉嘅連結,以及第二個跳轉嘅首行文字。呢行文字通常畀出咗第一個跳轉應該指去嘅嗰個「真正」嘅目標頁面",
 1143+'doubleredirectstext' => "每一行包括指去第一個同第二個跳轉嘅連結,以及第二個跳轉嘅目標。呢行文字通常畀出咗第一個跳轉應該指去嘅嗰個「真正」嘅目標頁面",
11411144
11421145 'brokenredirects' => '破碎嘅跳轉',
11431146 'brokenredirectstext' => '以下嘅跳轉係指向唔存在嘅頁面:',
@@ -1489,6 +1492,9 @@
14901493 'uclinks' => "睇吓最近$2日;睇吓最近嘅$1次修改。",
14911494 'uctop' => ' (最頂)' ,
14921495
 1496+'month' => '月:',
 1497+'year' => '年:',
 1498+
14931499 'sp-contributions-newest' => '最新',
14941500 'sp-contributions-oldest' => '最舊',
14951501 'sp-contributions-newer' => '較新嘅$1次',
@@ -1648,10 +1654,10 @@
16491655 *你唔剔下面個框。
16501656
16511657 喺呢啲情況下,需要嘅話你唯有手動搬同合併個頁面。',
1652 -'movearticle' => '搬頁',
 1658+'movearticle' => '搬頁:',
16531659 'movenologin' => '未登入',
16541660 'movenologintext' => "你要係註冊用戶而且要[[Special:Userlogin|登入]]咗先可以搬頁",
1655 -'newtitle' => '到新標題',
 1661+'newtitle' => '到新標題:',
16561662 'move-watch' => '睇實呢一版',
16571663 'movepagebtn' => '搬頁',
16581664 'pagemovedsub' => '搬頁成功',
@@ -2211,6 +2217,7 @@
22122218 'watchlistall1' => '全部',
22132219 'watchlistall2' => '全部',
22142220 'namespacesall' => '全部',
 2221+'monthsall' => '全部',
22152222
22162223 # E-mail address confirmation
22172224 'confirmemail' => '確認電郵地址',
@@ -2290,9 +2297,6 @@
22912298 'articletitles' => "以''$1''開頭嘅文章",
22922299 'hideresults' => '收埋結果',
22932300
2294 -# DISPLAYTITLE
2295 -'displaytitle' => '(以[[$1]]連結到呢一頁)',
2296 -
22972301 'loginlanguagelabel' => '語言:$1',
22982302
22992303 # Multipage image navigation
Index: branches/robchurch/logs/languages/messages/MessagesKk_tr.php
@@ -1136,6 +1136,9 @@
11371137 'userrights-groupshelp' => 'Qatıswşını üsteýtin ne alastatın toptardı talğañız.
11381138 Talğawı öşirilgen toptar özgertilimeýdi. Toptardıñ talğawın CTRL + Sol jaq nuqwmen öşirwiñizge boladı.',
11391139 'userrights-reason' => 'Özgertw sebebi:',
 1140+'userrights-list' => '$1 müşesi bolğandıqtan $2 üsteý alasız jäne $3 alastaý alasız.',
 1141+'userrights-list-nogroups' => 'toptarsız',
 1142+'userrights-list-groups' => '$2 {{PLURAL:$1|top|toptar}}',
11401143
11411144 # Groups
11421145 'group' => 'Top:',
@@ -1216,7 +1219,7 @@
12171220 'uploadedfiles' => 'Qotarılğan faýldar',
12181221 'ignorewarning' => 'Nazar salwdı elemew jäne faýldı ärdeqaşan saqtaw.',
12191222 'ignorewarnings' => 'Ärqaýsı nazar salwlardı elemew',
1220 -'minlength' => 'Faýl atında eñ keminde üş ärip bolwı kerek.',
 1223+'minlength1' => 'Faýl atawında eñ keminde bir ärip bolwı qajet.',
12211224 'illegalfilename' => '«$1» faýl atawında bet atawlarında ruqsat etilmegen nışandar bar. Faýldı qaýta atañız, sosın qaýta jwktep köriñiz.',
12221225 'badfilename' => 'Faýldıñ atı «$1» bop özgertildi.',
12231226 'filetype-badmime' => '«$1» degen MIME türi bar faýldardı qotarwğa ruqsat etilmeýdi.',
@@ -1358,7 +1361,7 @@
13591362 'disambiguations-text' => "Kelesi better '''aýrıqtı betke''' silteýdi. Bunıñ ornına belgili taqırıpqa siltewi qajet.<br />Eger [[{{ns:mediawiki}}:disambiguationspage]] tizimindegi ülgi qoldanılsa, bet aýrıqtı dep sanaladı.",
13601363
13611364 'doubleredirects' => 'Şınjırlı aýdatwlar',
1362 -'doubleredirectstext' => 'Ärbir joldağı birinşi men ekinşi aýdatw siltemeleri bar, sonımen birge ekinşi aýdatw mätinniñ birinşi jolı bar. Ädette birinşi silteme aýdaýtın «şın» aqırğı bettiñ atawı bolwı qajet.',
 1365+'doubleredirectstext' => 'Ärbir jolaqta birinşi jäne ekinşi aýdatwğa siltemeler bar, sonımen birge ekinşi aýdatw nısanası bar, ädette bul birinşi aýdatw bağıttaýtın «şın» nısana bet atawı bolwı qajet.',
13631366
13641367 'brokenredirects' => 'Eş betke keltirmeýtin aýdatwlar',
13651368 'brokenredirectstext' => 'Kelesi aýdatwlar joq betterge silteýdi:',
@@ -1719,6 +1722,9 @@
17201723 'uclinks' => 'Soñğı $2 kündegi, soñğı jasalğan $1 özgerisin qaraw.',
17211724 'uctop' => ' (üsti)',
17221725
 1726+'month' => 'Aý:',
 1727+'year' => 'Jıl:',
 1728+
17231729 'sp-contributions-newest' => 'Eñ jañasına',
17241730 'sp-contributions-oldest' => 'Eñ eskisine',
17251731 'sp-contributions-newer' => 'Jañalaw $1',
@@ -2478,6 +2484,7 @@
24792485 'watchlistall1' => 'barlığı',
24802486 'watchlistall2' => 'barlıq',
24812487 'namespacesall' => 'barlığı',
 2488+'monthsall' => 'barlığı',
24822489
24832490 # E-mail address confirmation
24842491 'confirmemail' => 'E-poşta jaýın kwälandırw',
@@ -2557,9 +2564,6 @@
25582565 'articletitles' => "Atawları mınadan bastalğan better: ''$1''",
25592566 'hideresults' => 'Nätïjelerdi jasır',
25602567
2561 -# DISPLAYTITLE
2562 -'displaytitle' => '(Bul bettiñ siltemesi: [[$1]])',
2563 -
25642568 'loginlanguagelabel' => 'Til: $1',
25652569
25662570 # Multipage image navigation
Index: branches/robchurch/logs/languages/messages/MessagesTi.php
@@ -0,0 +1,146 @@
 2+<?php
 3+/** Tigrinya (ትግርኛ)
 4+ *
 5+ * Translators: Blake
 6+ *
 7+ * @addtogroup Language
 8+ * @author Niklas Laxström
 9+ */
 10+
 11+$messages = array(
 12+'underline-always' => 'ጥራይ',
 13+'underline-never' => 'ኣይትግበሩ',
 14+
 15+# Dates
 16+'sunday' => 'ሰንበት',
 17+'monday' => 'ሰኑይ',
 18+'tuesday' => 'ሰሉስ',
 19+'wednesday' => 'ረብዓ',
 20+'thursday' => 'ኃሙስ',
 21+'friday' => 'ዓርቢ',
 22+'saturday' => 'ቀዳም',
 23+'january' => 'ትሪ',
 24+'february' => 'ለካቲት',
 25+'march' => 'መጋቢት',
 26+'april' => 'ሚያዝያ',
 27+'may_long' => 'ግንቦት',
 28+'june' => 'ሰነ',
 29+'july' => 'ሓምለ',
 30+'august' => 'ነሓሰ',
 31+'september' => 'መስከረም',
 32+'october' => 'ጥቅምቲ',
 33+'november' => 'ኅዳር',
 34+'december' => 'ታኅሣሥ',
 35+
 36+'about' => 'ብዛዕባ ብጠቅላላ',
 37+'qbpageoptions' => 'ፅሑፍዚ',
 38+'qbmyoptions' => 'ፅሑፋተይ',
 39+'mypage' => 'ፅሑፈይ',
 40+
 41+'search' => 'ድሉይ',
 42+'searchbutton' => 'ድሉይ',
 43+'history' => 'ናይ ፅሑፍ ታሪኽ',
 44+'history_short' => 'ታሪኽ',
 45+'jumptosearch' => 'ድሉይ',
 46+
 47+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 48+'aboutsite' => 'ብዛዕባ {{SITENAME}} ብጠቅላላ',
 49+'mainpage' => 'መበገሲ ገጽ',
 50+
 51+# Short words for each namespace, by default used in the 'article' tab in monobook
 52+'nstab-main' => 'ፅሑፍ',
 53+'nstab-user' => 'ናይ ፅሑፍ ኣባል',
 54+'nstab-project' => 'ናይ ፅሑፍ ዊኪፒዲያ',
 55+'nstab-image' => 'ምስሊ',
 56+
 57+# General errors
 58+'viewsourcefor' => 'ን$1',
 59+
 60+# Login and logout pages
 61+'yourlanguage' => 'ቋንቋ:',
 62+
 63+# History pages
 64+'next' => 'ዝቕጽል',
 65+
 66+# Search results
 67+'prevn' => 'ናይ ቀደም $1',
 68+'nextn' => 'ዝቕጽል $1',
 69+'powersearch' => 'ድሉይ',
 70+
 71+# Preferences page
 72+'preferences' => 'ኣማረጽቲ',
 73+'mypreferences' => 'ናተይ ኣማረጽቲ',
 74+'searchresultshead' => 'ድሉይ',
 75+'files' => 'ምስልታት',
 76+
 77+# Groups
 78+'group' => 'ብሓበር:',
 79+'group-sysop' => 'ሲሶፓት',
 80+
 81+'group-sysop-member' => 'ሲሶፕ',
 82+
 83+# Recent changes
 84+'hist' => 'ታሪኽ',
 85+
 86+# Image list
 87+'imagelist' => 'ምስልታት',
 88+'ilsubmit' => 'ድሉይ',
 89+'imgfile' => 'ምስሊ',
 90+'imghistory' => 'ናይ ምስሊ ታሪኽ',
 91+'imagelist_user' => 'ኣባል',
 92+
 93+# Miscellaneous special pages
 94+'nbytes' => '$1 {{PLURAL:$1|ባይት|ባይታት}}',
 95+'listusers' => 'ኣባላት',
 96+'newpages' => 'ሓደሽቲ ዛዕባታት',
 97+
 98+'alphaindexline' => '$1 ናብ $2',
 99+
 100+# Special:Log
 101+'specialloguserlabel' => 'ኣባል:',
 102+
 103+# Special:Allpages
 104+'nextpage' => 'ዝቕጽል ፅሑፍ ($1)',
 105+'prevpage' => 'ናይ ቀደም ፅሑፍ ($1)',
 106+'allpagesprev' => 'ናይ ቀደም',
 107+'allpagesnext' => 'ዝቕጽል',
 108+
 109+# Watchlist
 110+'watchlistfor' => "(ን'''$1''')",
 111+
 112+# Delete/protect/revert
 113+'pagesize' => '(ባይታት)',
 114+
 115+# Undelete
 116+'undelete-search-submit' => 'ድሉይ',
 117+
 118+# Contributions
 119+'contribsub2' => 'ን$1 ($2)',
 120+
 121+'sp-contributions-submit' => 'ድሉይ',
 122+
 123+# Block/unblock
 124+'ipblocklist-submit' => 'ድሉይ',
 125+
 126+# Tooltip help for the actions
 127+'tooltip-pt-preferences' => 'ናተይ ኣማረጽቲ',
 128+
 129+'loginlanguagelabel' => 'ቋንቋ: $1',
 130+
 131+# Multipage image navigation
 132+'imgmultipageprev' => '← ናይ ቀደም ፅሑፍ',
 133+'imgmultipagenext' => 'ዝቕጽል ፅሑፍ →',
 134+
 135+# Table pager
 136+'table_pager_next' => 'ዝቕጽል ፅሑፍ',
 137+'table_pager_prev' => 'ናይ ቀደም ፅሑፍ',
 138+
 139+# Size units
 140+'size-bytes' => '$1 ባይታት',
 141+'size-kilobytes' => '$1 ኪሎባይታት',
 142+'size-megabytes' => '$1 ሜጋባይታት',
 143+'size-gigabytes' => '$1 ጊጋባይታት',
 144+
 145+);
 146+
 147+?>
Property changes on: branches/robchurch/logs/languages/messages/MessagesTi.php
___________________________________________________________________
Added: svn:eol-style
1148 + native
Index: branches/robchurch/logs/languages/messages/MessagesKk_cn.php
@@ -1143,6 +1143,9 @@
11441144 'userrights-groupshelp' => 'قاتىسۋشىنى ٷستەيتٸن نە الاستاتىن توپتاردى تالعاڭىز.
11451145 تالعاۋى ٶشٸرٸلگەن توپتار ٶزگەرتٸلٸمەيدٸ. توپتاردىڭ تالعاۋىن CTRL + سول جاق نۇقۋمەن ٶشٸرۋٸڭٸزگە بولادى.',
11461146 'userrights-reason' => 'ٶزگەرتۋ سەبەبٸ:',
 1147+'userrights-list' => '$1 مٷشەسٸ بولعاندىقتان $2 ٷستەي الاسىز جٵنە $3 الاستاي الاسىز.',
 1148+'userrights-list-nogroups' => 'توپتارسىز',
 1149+'userrights-list-groups' => '$2 {{PLURAL:$1|توپ|توپتار}}',
11471150
11481151 # Groups
11491152 'group' => 'توپ:',
@@ -1223,7 +1226,7 @@
12241227 'uploadedfiles' => 'قوتارىلعان فايلدار',
12251228 'ignorewarning' => 'نازار سالۋدى ەلەمەۋ جٵنە فايلدى ٵردەقاشان ساقتاۋ.',
12261229 'ignorewarnings' => 'ٵرقايسى نازار سالۋلاردى ەلەمەۋ',
1227 -'minlength' => 'فايل اتىندا ەڭ كەمٸندە ٷش ٵرٸپ بولۋى كەرەك.',
 1230+'minlength1' => 'فايل اتاۋىندا ەڭ كەمٸندە بٸر ٵرٸپ بولۋى قاجەت.',
12281231 'illegalfilename' => '«$1» فايل اتاۋىندا بەت اتاۋلارىندا رۇقسات ەتٸلمەگەن نىشاندار بار. فايلدى قايتا اتاڭىز, سوسىن قايتا جۋكتەپ كٶرٸڭٸز.',
12291232 'badfilename' => 'فايلدىڭ اتى «$1» بوپ ٶزگەرتٸلدٸ.',
12301233 'filetype-badmime' => '«$1» دەگەن MIME تٷرٸ بار فايلداردى قوتارۋعا رۇقسات ەتٸلمەيدٸ.',
@@ -1365,7 +1368,7 @@
13661369 'disambiguations-text' => "كەلەسٸ بەتتەر '''ايرىقتى بەتكە''' سٸلتەيدٸ. بۇنىڭ ورنىنا بەلگٸلٸ تاقىرىپقا سٸلتەۋٸ قاجەت.<br />ەگەر [[{{ns:mediawiki}}:disambiguationspage]] تٸزٸمٸندەگٸ ٷلگٸ قولدانىلسا, بەت ايرىقتى دەپ سانالادى.",
13671370
13681371 'doubleredirects' => 'شىنجىرلى ايداتۋلار',
1369 -'doubleredirectstext' => 'ٵربٸر جولداعى بٸرٸنشٸ مەن ەكٸنشٸ ايداتۋ سٸلتەمەلەرٸ بار, سونىمەن بٸرگە ەكٸنشٸ ايداتۋ مٵتٸننٸڭ بٸرٸنشٸ جولى بار. ٵدەتتە بٸرٸنشٸ سٸلتەمە ايدايتىن «شىن» اقىرعى بەتتٸڭ اتاۋى بولۋى قاجەت.',
 1372+'doubleredirectstext' => 'ٵربٸر جولاقتا بٸرٸنشٸ جٵنە ەكٸنشٸ ايداتۋعا سٸلتەمەلەر بار, سونىمەن بٸرگە ەكٸنشٸ ايداتۋ نىساناسى بار, ٵدەتتە بۇل بٸرٸنشٸ ايداتۋ باعىتتايتىن «شىن» نىسانا بەت اتاۋى بولۋى قاجەت.',
13701373
13711374 'brokenredirects' => 'ەش بەتكە كەلتٸرمەيتٸن ايداتۋلار',
13721375 'brokenredirectstext' => 'كەلەسٸ ايداتۋلار جوق بەتتەرگە سٸلتەيدٸ:',
@@ -1726,6 +1729,9 @@
17271730 'uclinks' => 'سوڭعى $2 كٷندەگٸ, سوڭعى جاسالعان $1 ٶزگەرٸسٸن قاراۋ.',
17281731 'uctop' => ' (ٷستٸ)',
17291732
 1733+'month' => 'اي:',
 1734+'year' => 'جىل:',
 1735+
17301736 'sp-contributions-newest' => 'ەڭ جاڭاسىنا',
17311737 'sp-contributions-oldest' => 'ەڭ ەسكٸسٸنە',
17321738 'sp-contributions-newer' => 'جاڭالاۋ $1',
@@ -2485,6 +2491,7 @@
24862492 'watchlistall1' => 'بارلىعى',
24872493 'watchlistall2' => 'بارلىق',
24882494 'namespacesall' => 'بارلىعى',
 2495+'monthsall' => 'بارلىعى',
24892496
24902497 # E-mail address confirmation
24912498 'confirmemail' => 'ە-پوشتا جايىن كۋٵلاندىرۋ',
@@ -2564,9 +2571,6 @@
25652572 'articletitles' => "اتاۋلارى مىنادان باستالعان بەتتەر: ''$1''",
25662573 'hideresults' => 'نٵتيجەلەردٸ جاسىر',
25672574
2568 -# DISPLAYTITLE
2569 -'displaytitle' => '(بۇل بەتتٸڭ سٸلتەمەسٸ: [[$1]])',
2570 -
25712575 'loginlanguagelabel' => 'تٸل: $1',
25722576
25732577 # Multipage image navigation
Index: branches/robchurch/logs/languages/messages/MessagesKk_kz.php
@@ -1135,6 +1135,9 @@
11361136 'userrights-groupshelp' => 'Қатысушыны үстейтін не аластатын топтарды талғаңыз.
11371137 Талғауы өшірілген топтар өзгертілімейді. Топтардың талғауын CTRL + Сол жақ нұқумен өшіруіңізге болады.',
11381138 'userrights-reason' => 'Өзгерту себебі:',
 1139+'userrights-list' => '$1 мүшесі болғандықтан $2 үстей аласыз және $3 аластай аласыз.',
 1140+'userrights-list-nogroups' => 'топтарсыз',
 1141+'userrights-list-groups' => '$2 {{PLURAL:$1|топ|топтар}}',
11391142
11401143 # Groups
11411144 'group' => 'Топ:',
@@ -1215,7 +1218,7 @@
12161219 'uploadedfiles' => 'Қотарылған файлдар',
12171220 'ignorewarning' => 'Назар салуды елемеу және файлды әрдеқашан сақтау.',
12181221 'ignorewarnings' => 'Әрқайсы назар салуларды елемеу',
1219 -'minlength' => 'Файл атында ең кемінде үш әріп болуы керек.',
 1222+'minlength1' => 'Файл атауында ең кемінде бір әріп болуы қажет.',
12201223 'illegalfilename' => '«$1» файл атауында бет атауларында рұқсат етілмеген нышандар бар. Файлды қайта атаңыз, сосын қайта жуктеп көріңіз.',
12211224 'badfilename' => 'Файлдың аты «$1» боп өзгертілді.',
12221225 'filetype-badmime' => '«$1» деген MIME түрі бар файлдарды қотаруға рұқсат етілмейді.',
@@ -1357,7 +1360,7 @@
13581361 'disambiguations-text' => "Келесі беттер '''айрықты бетке''' сілтейді. Бұның орнына белгілі тақырыпқа сілтеуі қажет.<br />Егер [[{{ns:mediawiki}}:disambiguationspage]] тізіміндегі үлгі қолданылса, бет айрықты деп саналады.",
13591362
13601363 'doubleredirects' => 'Шынжырлы айдатулар',
1361 -'doubleredirectstext' => 'Әрбір жолдағы бірінші мен екінші айдату сілтемелері бар, сонымен бірге екінші айдату мәтіннің бірінші жолы бар. Әдетте бірінші сілтеме айдайтын «шын» ақырғы беттің атауы болуы қажет.',
 1364+'doubleredirectstext' => 'Әрбір жолақта бірінші және екінші айдатуға сілтемелер бар, сонымен бірге екінші айдату нысанасы бар, әдетте бұл бірінші айдату бағыттайтын «шын» нысана бет атауы болуы қажет.',
13621365
13631366 'brokenredirects' => 'Еш бетке келтірмейтін айдатулар',
13641367 'brokenredirectstext' => 'Келесі айдатулар жоқ беттерге сілтейді:',
@@ -1718,6 +1721,9 @@
17191722 'uclinks' => 'Соңғы $2 күндегі, соңғы жасалған $1 өзгерісін қарау.',
17201723 'uctop' => ' (үсті)',
17211724
 1725+'month' => 'Ай:',
 1726+'year' => 'Жыл:',
 1727+
17221728 'sp-contributions-newest' => 'Ең жаңасына',
17231729 'sp-contributions-oldest' => 'Ең ескісіне',
17241730 'sp-contributions-newer' => 'Жаңалау $1',
@@ -2477,6 +2483,7 @@
24782484 'watchlistall1' => 'барлығы',
24792485 'watchlistall2' => 'барлық',
24802486 'namespacesall' => 'барлығы',
 2487+'monthsall' => 'барлығы',
24812488
24822489 # E-mail address confirmation
24832490 'confirmemail' => 'Е-пошта жайын куәландыру',
@@ -2556,9 +2563,6 @@
25572564 'articletitles' => "Атаулары мынадан басталған беттер: ''$1''",
25582565 'hideresults' => 'Нәтижелерді жасыр',
25592566
2560 -# DISPLAYTITLE
2561 -'displaytitle' => '(Бұл беттің сілтемесі: [[$1]])',
2562 -
25632567 'loginlanguagelabel' => 'Тіл: $1',
25642568
25652569 # Multipage image navigation
Index: branches/robchurch/logs/includes/api/ApiMain.php
@@ -425,6 +425,7 @@
426426 */
427427 public function getVersion() {
428428 $vers = array ();
 429+ $vers[] = 'MediaWiki ' . SpecialVersion::getVersion();
429430 $vers[] = __CLASS__ . ': $Id$';
430431 $vers[] = ApiBase :: getBaseVersion();
431432 $vers[] = ApiFormatBase :: getBaseVersion();
Index: branches/robchurch/logs/includes/SpecialUserrights.php
@@ -153,11 +153,23 @@
154154 return;
155155 }
156156
 157+ $this->showEditUserGroupsForm( $username, $user->getGroups() );
 158+ }
 159+
 160+ /**
 161+ * Go through used and available groups and return the ones that this
 162+ * form will be able to manipulate based on the current user's system
 163+ * permissions.
 164+ *
 165+ * @param $groups Array: list of groups the given user is in
 166+ * @return Array: Tuple of addable, then removable groups
 167+ */
 168+ protected function splitGroups( $groups ) {
157169 list($addable, $removable) = array_values( $this->changeableGroups() );
158 - $removable = array_intersect($removable, $user->getGroups()); // Can't remove groups the user doesn't have
159 - $addable = array_diff( $addable, $user->getGroups()); // Can't add groups the user does have
160 -
161 - $this->showEditUserGroupsForm( $username, $addable, $removable );
 170+ $removable = array_intersect($removable, $groups ); // Can't remove groups the user doesn't have
 171+ $addable = array_diff( $addable, $groups ); // Can't add groups the user does have
 172+
 173+ return array( $addable, $removable );
162174 }
163175
164176 /**
@@ -165,11 +177,12 @@
166178 *
167179 * @todo make all CSS-y and semantic
168180 * @param $username String: Name of user you're editing
169 - * @param $addable Array: Array of groups that can be added
170 - * @param $removable Array: Array of groups that can be removed
 181+ * @param $groups Array: Array of groups the user is in
171182 */
172 - private function showEditUserGroupsForm( $username, $addable, $removable ) {
 183+ protected function showEditUserGroupsForm( $username, $groups ) {
173184 global $wgOut, $wgUser;
 185+
 186+ list( $addable, $removable ) = $this->splitGroups( $groups );
174187
175188 $wgOut->addHTML(
176189 Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->action, 'name' => 'editGroup' ) ) .
Index: branches/robchurch/logs/includes/XmlFunctions.php
@@ -18,9 +18,6 @@
1919 function HTMLnamespaceselector($selected = '', $allnamespaces = null, $includehidden=false) {
2020 return Xml::namespaceSelector( $selected, $allnamespaces, $includehidden );
2121 }
22 -function HTMLmonthelector($selected = '', $allmonths = null) {
23 - return Xml::monthSelector( $selected, $allmonths );
24 -}
2522 function wfSpan( $text, $class, $attribs=array() ) {
2623 return Xml::span( $text, $class, $attribs );
2724 }
Index: branches/robchurch/logs/includes/User.php
@@ -1637,6 +1637,8 @@
16381638 $this->mEffectiveGroups[] = 'emailconfirmed';
16391639 }
16401640 }
 1641+ # Hook for additional groups
 1642+ wfRunHooks( 'UserEffectiveGroups', array( &$this, &$this->mEffectiveGroups ) );
16411643 }
16421644 }
16431645 return $this->mEffectiveGroups;
@@ -2467,6 +2469,18 @@
24682470 $this->mEmailToken &&
24692471 $this->mEmailTokenExpires > wfTimestamp();
24702472 }
 2473+
 2474+ /**
 2475+ * Get the timestamp of account creation, or false for
 2476+ * non-existent/anonymous user accounts
 2477+ *
 2478+ * @return mixed
 2479+ */
 2480+ public function getRegistration() {
 2481+ return $this->mId > 0
 2482+ ? $this->mRegistration
 2483+ : false;
 2484+ }
24712485
24722486 /**
24732487 * @param array $groups list of groups
Index: branches/robchurch/logs/includes/SpecialLog.php
@@ -323,25 +323,13 @@
324324 }
325325
326326 function doShowList( &$out, $result ) {
327 - global $wgLang;
328 -
329 - $lastdate = '';
330 - $listopen = false;
331327 // Rewind result pointer and go through it again, making the HTML
332 - $html = '';
 328+ $html = "\n<ul>\n";
333329 $result->seek( 0 );
334330 while( $s = $result->fetchObject() ) {
335 - $date = $wgLang->date( $s->log_timestamp, /* adj */ true );
336 - if ( $date != $lastdate ) {
337 - if ( $listopen ) { $html .= Xml::closeElement( 'ul' ); }
338 - $html .= Xml::element('h4', null, $date) . "\n";
339 - $html .= Xml::openElement( 'ul' );
340 - $listopen = true;
341 - $lastdate = $date;
342 - }
343331 $html .= $this->logLine( $s );
344332 }
345 - if ( $listopen ) { $html .= Xml::closeElement( 'ul' ); }
 333+ $html .= "\n</ul>\n";
346334 $out->addHTML( $html );
347335 $result->free();
348336 }
@@ -358,7 +346,7 @@
359347 */
360348 private function logLine( $row ) {
361349 $line = LogItem::newFromRow( $row );
362 - return $line->format( LogFormatter::NO_DATE );
 350+ return $line->format();
363351 }
364352
365353 /**
Index: branches/robchurch/logs/includes/Xml.php
@@ -123,28 +123,6 @@
124124 $s .= "</select>\n";
125125 return $s;
126126 }
127 -
128 - /**
129 - * Create a date selector
130 - *
131 - * @param $selected Mixed: the month which should be selected, default ''
132 - * @param $allmonths String: value of a special item denoting all month. Null to not include (default)
133 - * @param string $id Element identifier
134 - * @return String: Html string containing the month selector
135 - */
136 - public static function monthSelector( $selected = '', $allmonths = null, $id = 'month' ) {
137 - global $wgLang;
138 - $options = array();
139 - if( is_null( $selected ) )
140 - $selected = '';
141 - if( !is_null( $allmonths ) )
142 - $options[] = self::option( wfMsg( 'monthsall' ), $allmonths, $selected === $allmonths );
143 - for( $i = 1; $i < 13; $i++ )
144 - $options[] = self::option( $wgLang->getMonthName( $i ), $i, $selected === $i );
145 - return self::openElement( 'select', array( 'id' => $id, 'name' => 'month' ) )
146 - . implode( "\n", $options )
147 - . self::closeElement( 'select' );
148 - }
149127
150128 /**
151129 *
Index: branches/robchurch/logs/includes/SpecialContributions.php
@@ -9,19 +9,13 @@
1010 var $messages, $target;
1111 var $namespace = '', $mDb;
1212
13 - function __construct( $target, $namespace = false, $year = false, $month = false ) {
 13+ function __construct( $target, $namespace = false ) {
1414 parent::__construct();
1515 foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
1616 $this->messages[$msg] = wfMsgExt( $msg, array( 'escape') );
1717 }
1818 $this->target = $target;
1919 $this->namespace = $namespace;
20 -
21 - $year = intval($year);
22 - $month = intval($month);
23 -
24 - $this->year = ($year > 0 && $year < 10000) ? $year : false;
25 - $this->month = ($month > 0 && $month < 13) ? $month : false;
2620 $this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
2721 }
2822
@@ -33,7 +27,7 @@
3428
3529 function getQueryInfo() {
3630 list( $index, $userCond ) = $this->getUserCond();
37 - $conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond(), $this->GetDateCond() );
 31+ $conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond() );
3832
3933 return array(
4034 'tables' => array( 'page', 'revision' ),
@@ -69,39 +63,6 @@
7064 }
7165 }
7266
73 - function getDateCond() {
74 - $condition = array();
75 -
76 - if ( $this->year || $this->month ) {
77 - // Assume this year if only a month is given
78 - if ( $this->year ) {
79 - $year_start = $this->year;
80 - } else {
81 - $year_start = substr( wfTimestampNow(), 0, 4 );
82 - }
83 -
84 - if ( $this->month ) {
85 - $month_start = str_pad($this->month, 2, '0', STR_PAD_LEFT);
86 - $month_end = str_pad($this->month + 1, 2, '0', STR_PAD_LEFT);
87 - $year_end = $year_start;
88 - } else {
89 - $month_start = 0;
90 - $month_end = 0;
91 - $year_end = $year_start + 1;
92 - }
93 -
94 - $ts_start = str_pad($year_start . $month_start, 14, '0' );
95 - $ts_end = str_pad($year_end . $month_end, 14, '0' );
96 -
97 - $condition[] = "rev_timestamp >= $ts_start";
98 - # If just given the year 9999, we need not enforce an upper bound
99 - if( strlen($year_end) <= 4 )
100 - $condition[] = "rev_timestamp < $ts_end";
101 - }
102 -
103 - return $condition;
104 - }
105 -
10667 function getIndexField() {
10768 return 'rev_timestamp';
10869 }
@@ -273,25 +234,11 @@
274235 $options['bot'] = '1';
275236 }
276237
277 - if ( ( $month = $wgRequest->getVal( 'month', null ) ) !== null && $month !== '' ) {
278 - $options['month'] = intval( $month );
279 - } else {
280 - $options['month'] = '';
281 - }
282 -
283 - if ( ( $year = $wgRequest->getVal( 'year', null ) ) !== null && $year !== '' ) {
284 - $options['year'] = intval( $year );
285 - } else if( $month ) {
286 - $options['year'] = intval( substr( wfTimestampNow(), 0, 4 ) );
287 - } else {
288 - $options['year'] = '';
289 - }
290 -
291238 wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
292239
293240 $wgOut->addHTML( contributionsForm( $options ) );
294241
295 - $pager = new ContribsPager( $target, $options['namespace'], $options['year'], $options['month'] );
 242+ $pager = new ContribsPager( $target, $options['namespace'] );
296243 if ( !$pager->getNumRows() ) {
297244 $wgOut->addWikiText( wfMsg( 'nocontribs' ) );
298245 return;
@@ -388,14 +335,6 @@
389336 $options['contribs'] = 'user';
390337 }
391338
392 - if ( !isset( $options['year'] ) ) {
393 - $options['year'] = '';
394 - }
395 -
396 - if ( !isset( $options['month'] ) ) {
397 - $options['month'] = '';
398 - }
399 -
400339 if ( $options['contribs'] == 'newbie' ) {
401340 $options['target'] = '';
402341 }
@@ -416,13 +355,7 @@
417356 Xml::input( 'target', 20, $options['target']) . ' '.
418357 Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
419358 Xml::namespaceSelector( $options['namespace'], '' ) .
420 - Xml::openElement( 'p' ) .
421 - Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
422 - Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) . ' '.
423 - Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
424 - xml::monthSelector( $options['month'], -1 ) .
425359 Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
426 - Xml::closeElement( 'p' ) .
427360 '</fieldset>' .
428361 Xml::closeElement( 'form' );
429362 return $f;
Index: branches/robchurch/logs/includes/Article.php
@@ -141,10 +141,7 @@
142142
143143 wfProfileIn( __METHOD__ );
144144
145 - // We want to show the content even if the page doesn't exist, as long
146 - // as the revision does (perhaps it's been moved and the redirect
147 - // deleted: bug 10377)
148 - if ( 0 == $this->getID() and !$this->mOldId ) {
 145+ if ( 0 == $this->getID() ) {
149146 wfProfileOut( __METHOD__ );
150147 $wgOut->setRobotpolicy( 'noindex,nofollow' );
151148
Index: branches/robchurch/logs/includes/GlobalFunctions.php
@@ -1665,6 +1665,8 @@
16661666 function wfMkdirParents( $fullDir, $mode = 0777 ) {
16671667 if( strval( $fullDir ) === '' )
16681668 return true;
 1669+ if( file_exists( $fullDir ) )
 1670+ return true;
16691671 return mkdir( $fullDir, $mode, true );
16701672 }
16711673
Index: branches/robchurch/logs/includes/Wiki.php
@@ -98,6 +98,13 @@
9999 $lang->findVariantLink( $title, $ret );
100100
101101 }
 102+ if ( $oldid = $request->getInt( 'oldid' ) ) {
 103+ // Allow oldid to override a changed or missing title.
 104+ $rev = Revision::newFromId( $oldid );
 105+ if( $rev ) {
 106+ $ret = $rev->getTitle();
 107+ }
 108+ }
102109 return $ret ;
103110 }
104111
Index: branches/robchurch/logs/RELEASE-NOTES
@@ -109,6 +109,7 @@
110110 classes: mw-code, mw-css, mw-js)
111111 * (bug 6711) Add $wgAddGroups and $wgRemoveGroups to allow finer control over
112112 usergroup assignment.
 113+* Introduce 'UserEffectiveGroups' hook; see docs/hooks.txt for more information
113114
114115 == Bugfixes since 1.10 ==
115116
@@ -217,7 +218,10 @@
218219 * namespaceDupes.php should work better for initial-lowercase wikis
219220 * (bug 10377) "Permanent links" to revisions still work if the page is moved
220221 and the redirect deleted
 222+* (bug 7071) Properly handle an 'oldid' passed to view or edit that doesn't
 223+ match the given title. Fixes inconsistencies with talk, history, edit links.
221224
 225+
222226 == API changes since 1.10 ==
223227
224228 (For ongoing development discussion, see http://www.mediawiki.org/wiki/API)
@@ -253,6 +257,7 @@
254258 "interwiki" section of the output.
255259 * Added categorymembers list to query for pages in a category.
256260 * (bug 10260) Show page protection status
 261+* (bug 10392) Include MediaWiki version details in version output
257262
258263 == Maintenance script changes since 1.10 ==
259264
@@ -300,6 +305,7 @@
301306 * Albanian (sq)
302307 * Sundanese (su)
303308 * Swedish (sv)
 309+* Tigrinya (ti)
304310 * Volapük (vo)
305311 * Old Chinese / Late Middle Chinese (zh-classical)
306312 * Chinese (PRC) (zh-cn)
Index: branches/robchurch/logs/maintenance/archives/patch-archive-user-index.sql
@@ -0,0 +1,4 @@
 2+-- Adds a user,timestamp index to the archive table
 3+-- Used for browsing deleted contributions and renames
 4+ALTER TABLE /*$wgDBprefix*/archive
 5+ ADD INDEX usertext_timestamp ( ar_user_text , ar_timestamp );
Index: branches/robchurch/logs/maintenance/updaters.inc
@@ -222,6 +222,16 @@
223223 }
224224 }
225225
 226+function do_archive_user_index() {
 227+ global $wgDatabase;
 228+ if( $wgDatabase->indexExists( 'archive', 'usertext_timestamp' ) ) {
 229+ echo "...usertext,timestamp key on archive already exists.\n";
 230+ } else {
 231+ echo "Adding usertext,timestamp key on archive table... ";
 232+ dbsource( archive("patch-archive-user-index.sql"), $wgDatabase );
 233+ echo "ok\n";
 234+ }
 235+}
226236
227237 function do_watchlist_update() {
228238 global $wgDatabase;
@@ -945,6 +955,8 @@
946956 do_categorylinks_indices_update(); flush();
947957
948958 do_restrictions_update(); flush ();
 959+
 960+ do_archive_user_index(); flush ();
949961
950962 echo "Deleting old default messages (this may take a long time!)..."; flush();
951963 deleteDefaultMessages();
@@ -1276,7 +1288,8 @@
12771289 );
12781290
12791291 $newindexes = array(
1280 - array("revision", "rev_text_id_idx", "patch-rev_text_id_idx.sql")
 1292+ array("revision", "rev_text_id_idx", "patch-rev_text_id_idx.sql"),
 1293+ array("archive", "usertext_timestamp", "patch-archive-user-index.sql"),
12811294 );
12821295
12831296 $newrules = array(

Follow-up revisions

RevisionCommit summaryAuthorDate
r23820* Merged r23504:r23819 from trunk...robchurch03:45, 7 July 2007

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r23460Updated translations for dawegge08:04, 27 June 2007
r23503Tweak API change which broke Makesysop extension. Same functionality, now in ...brion13:42, 28 June 2007

Status & tagging log