jenkins-bot has submitted this change and it was merged.
Change subject: Move <span class="plainlinks"> out of i18n
......................................................................
Move <span class="plainlinks"> out of i18n
Change-Id: If9ce4beefc41ad1680ebcadd2234118cfd8e4d87
---
M Flow.i18n.php
M includes/Log/Formatter.php
M templates/history-line.html.php
M templates/post-history.html.php
M templates/topic-history.html.php
5 files changed, 32 insertions(+), 18 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.i18n.php b/Flow.i18n.php
index 0a5aa30..e096cfc 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -12,10 +12,10 @@
'flow-specialpage' => '$1 – Flow',
'log-name-flow' => 'Flow activity log',
- 'logentry-delete-flow-delete-post' => '$1 {{GENDER:$2|deleted}} a <span
class="plainlinks">[$4 comment]</span> on [[$3]]',
- 'logentry-delete-flow-restore-post' => '$1 {{GENDER:$2|restored}} a
<span class="plainlinks">[$4 comment]</span> on [[$3]]',
- 'logentry-suppress-flow-censor-post' => '$1 {{GENDER:$2|suppressed}} a
<span class="plainlinks">[$4 comment]</span> on [[$3]]',
- 'logentry-suppress-flow-restore-post' => '$1 {{GENDER:$2|deleted}} a
<span class="plainlinks">[$4 comment]</span> on [[$3]]',
+ 'logentry-delete-flow-delete-post' => '$1 {{GENDER:$2|deleted}} a [$4
comment] on [[$3]]',
+ 'logentry-delete-flow-restore-post' => '$1 {{GENDER:$2|restored}} a [$4
comment] on [[$3]]',
+ 'logentry-suppress-flow-censor-post' => '$1 {{GENDER:$2|suppressed}} a
[$4 comment] on [[$3]]',
+ 'logentry-suppress-flow-restore-post' => '$1 {{GENDER:$2|deleted}} a
[$4 comment] on [[$3]]',
'flow-user-anonymous' => 'Anonymous',
'flow-user-moderated' => 'Moderated user',
@@ -90,25 +90,25 @@
'flow-edit-title-submit' => 'Change title',
- 'flow-rev-message-edit-post' => '[[User:$1|$1]] {{GENDER:$1|edited}} a
<span class="plainlinks">[$2 comment]</span>',
- 'flow-rev-message-reply' => '[[User:$1|$1]] {{GENDER:$1|added}} a <span
class="plainlinks">[$2 comment]</span>.',
+ 'flow-rev-message-edit-post' => '[[User:$1|$1]] {{GENDER:$1|edited}} a
[$2 comment]',
+ 'flow-rev-message-reply' => '[[User:$1|$1]] {{GENDER:$1|added}} a [$2
comment].',
'flow-rev-message-reply-bundle' => '$1 {{PLURAL:$1|comment|comments}}
were added.',
- 'flow-rev-message-new-post' => '[[User:$1|$1]] {{GENDER:$1|created}}
the topic <span class="plainlinks">[$2 $3]</span>.',
- 'flow-rev-message-hid-post' => '[[User:$1|$1]] {{GENDER:$1|hid}} a
<span class="plainlinks">[$3 comment]</span>.',
- 'flow-rev-message-edit-title' => '[[User:$1|$1]] {{GENDER:$1|edited}}
the topic title to <span class="plainlinks">[$2 $3]</span>.',
+ 'flow-rev-message-new-post' => '[[User:$1|$1]] {{GENDER:$1|created}}
the topic [$2 $3].',
+ 'flow-rev-message-hid-post' => '[[User:$1|$1]] {{GENDER:$1|hid}} a [$3
comment].',
+ 'flow-rev-message-edit-title' => '[[User:$1|$1]] {{GENDER:$1|edited}}
the topic title to [$2 $3].',
'flow-rev-message-create-header' => "[[User:$1|$1]]
{{GENDER:$1|created}} the board header.",
'flow-rev-message-edit-header' => "[[User:$1|$1]] {{GENDER:$1|edited}}
the board header.",
- 'flow-rev-message-restored-post' => '[[User:$1|$1]]
{{GENDER:$1|restored}} a <span class="plainlinks">[$3 comment]</span>.',
- 'flow-rev-message-deleted-post' => '[[User:$1|$1]]
{{GENDER:$1|deleted}} a <span class="plainlinks">[$3 comment]</span>.',
- 'flow-rev-message-censored-post' => '[[User:$1|$1]]
{{GENDER:$1|suppressed}} a <span class="plainlinks">[$3 comment]</span>.',
+ 'flow-rev-message-restored-post' => '[[User:$1|$1]]
{{GENDER:$1|restored}} a [$3 comment].',
+ 'flow-rev-message-deleted-post' => '[[User:$1|$1]]
{{GENDER:$1|deleted}} a [$3 comment].',
+ 'flow-rev-message-censored-post' => '[[User:$1|$1]]
{{GENDER:$1|suppressed}} a [$3 comment].',
'flow-topic-history' => '"$1" Topic History',
'flow-post-history' => 'Comment by {{GENDER:$2|$2}} Post History',
'flow-history-last4' => 'Last 4 hours',
'flow-history-day' => 'Today',
'flow-history-week' => 'Last week',
- 'flow-history-pages-topic' => 'Appears on <span class="plainlinks">[$1
"$2" board]</span>',
- 'flow-history-pages-post' => 'Appears on <span class="plainlinks">[$1
$2]</span>',
+ 'flow-history-pages-topic' => 'Appears on [$1 "$2" board]',
+ 'flow-history-pages-post' => 'Appears on [$1 $2]',
'flow-topic-participants' => '{{PLURAL:$1|$3 started this
topic|{{GENDER:$3|$3}}, {{GENDER:$4|$4}} and {{PLURAL:$2|other|others}}|0=No
participation yet|2={{GENDER:$3|$3}} and {{GENDER:$4|$4}}}}',
'flow-topic-comments' => '{{PLURAL:$1|0=Be the first to
comment!|Comment ($1)}}',
diff --git a/includes/Log/Formatter.php b/includes/Log/Formatter.php
index c24cb00..659cf28 100644
--- a/includes/Log/Formatter.php
+++ b/includes/Log/Formatter.php
@@ -23,7 +23,7 @@
// logentry-delete-flow-delete-post,
logentry-delete-flow-restore-post,
// logentry-suppress-flow-restore-post,
logentry-suppress-flow-censor-post,
$language = $skin === null ? $wgContLang : $wgLang;
- return wfMessage( "logentry-$type-$action" )
+ $message = wfMessage( "logentry-$type-$action" )
->params( array(
Message::rawParam( $this->getPerformerElement()
),
$this->entry->getPerformer()->getId(),
@@ -32,6 +32,12 @@
) )
->inLanguage( $language )
->parse();
+
+ return \Html::rawElement(
+ 'span',
+ array( 'class' => 'plainlinks' ),
+ $message
+ );
}
/**
diff --git a/templates/history-line.html.php b/templates/history-line.html.php
index dd0c4f2..019f369 100644
--- a/templates/history-line.html.php
+++ b/templates/history-line.html.php
@@ -1,5 +1,5 @@
<li class="<?php echo $class; ?>">
- <p><?php echo $message->parse(); ?></p>
+ <p><span class="plainlinks"><?php echo $message->parse(); ?></span></p>
<p class="flow-datestamp">
<a href="<?php echo '#'; /* @todo: link to historical revision
*/ ?>">
<span class="flow-agotime" style="display:
inline"><?php echo htmlspecialchars( $timestamp->getHumanTimestamp() );
?></span>
diff --git a/templates/post-history.html.php b/templates/post-history.html.php
index 638121b..03ad7d0 100644
--- a/templates/post-history.html.php
+++ b/templates/post-history.html.php
@@ -12,7 +12,11 @@
?>
<div class="flow-history-container">
- <p class='flow-history-pages'><?php echo wfMessage(
'flow-history-pages-post', $topicLink, $topicTitle )->parse(); ?></p>
+ <p class='flow-history-pages'>
+ <span class="plainlinks">
+ <?php echo wfMessage( 'flow-history-pages-post',
$topicLink, $topicTitle )->parse(); ?>
+ </span>
+ </p>
<div class="flow-history-log">
<?php
diff --git a/templates/topic-history.html.php b/templates/topic-history.html.php
index 1f87b3f..3151dee 100644
--- a/templates/topic-history.html.php
+++ b/templates/topic-history.html.php
@@ -13,7 +13,11 @@
?>
<div class="flow-history-container">
- <p class='flow-history-pages'><?php echo wfMessage(
'flow-history-pages-topic', $pageLink, $pageTitle )->parse(); ?></p>
+ <p class='flow-history-pages'>
+ <span class="plainlinks">
+ <?php echo wfMessage( 'flow-history-pages-topic',
$pageLink, $pageTitle )->parse(); ?>
+ </span>
+ </p>
<div class="flow-history-log">
<?php
--
To view, visit https://gerrit.wikimedia.org/r/93312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9ce4beefc41ad1680ebcadd2234118cfd8e4d87
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
