r71886 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r71885‎ | r71886 | r71887 >
Date:16:42, 29 August 2010
Author:siebrand
Status:ok
Tags:
Comment:
Merge r71881, r71413 to 1.16wmf4:
* Change language name of North Frisian (frr) from "Frasch" to "Nordfriisk"
* (bug 24794) Update Tatar link trail.

Done using:
* svn merge -r71412:71413 svn+ssh://siebrand@svn.wikimedia.org/svnroot/mediawiki/trunk/phase3
* svn merge -r71880:71881 svn+ssh://siebrand@svn.wikimedia.org/svnroot/mediawiki/trunk/phase3

After that, reverted all files the above revs didn't touch (89 of them) and manually added svn:mergeinfo property. Please let me know if there would have been an easier way...
Modified paths:
  • /branches/wmf/1.16wmf4/languages/Names.php (modified) (history)
  • /branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php
@@ -127,6 +127,8 @@
128128 'localurle' => array( '0', 'URINLIURLE:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
129129 );
130130
 131+$linkTrail = '/^([a-zабвгдеёжзийклмнопрстуфхцчшщъыьэюяӘәӨөҮүҖҗҢңҺһ]+)(.*)$/sDu';
 132+
131133 $messages = array(
132134 # User preference toggles
133135 'tog-underline' => 'Сылтамаларның астына сызу:',
Property changes on: branches/wmf/1.16wmf4/languages/messages/MessagesTt_cyrl.php
___________________________________________________________________
Added: svn:mergeinfo
134136 Merged /trunk/phase3:r71881
Index: branches/wmf/1.16wmf4/languages/Names.php
@@ -98,7 +98,7 @@
9999 'fr' => 'Français', # French
100100 'frc' => 'Français cadien', # Cajun French
101101 'frp' => 'Arpetan', # Franco-Provençal/Arpitan
102 - 'frr' => 'Frasch', # North Frisian
 102+ 'frr' => 'Nordfriisk', # North Frisian
103103 'fur' => 'Furlan', # Friulian
104104 'fy' => 'Frysk', # Frisian
105105 'ga' => 'Gaeilge', # Irish
Property changes on: branches/wmf/1.16wmf4/languages/Names.php
___________________________________________________________________
Added: svn:mergeinfo
106106 Merged /trunk/phase3:r71413

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r71413Change language name of North Frisian (frr) from "Frasch" to "Nordfriisk", pe...robin18:08, 21 August 2010
r71880Add fieldset/legend for consistenxyraymond11:32, 29 August 2010
r71881(bug 24794) Update Tatar link trail.siebrand11:40, 29 August 2010

Status & tagging log