https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113390
Revision: 113390
Author: emsmith
Date: 2012-03-08 19:44:55 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
bug 34090 - adding translation for "automatic hider" user
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-08 19:42:54 UTC (rev 113389)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-08 19:44:55 UTC (rev 113390)
@@ -364,6 +364,9 @@
'articlefeedbackv5-activity-item-comment' => '$1 $2 $3 : $4',
'articlefeedbackv5-activity-item' => '$1 $2 $3',
+ /* Our fake/default user */
+ 'articlefeedbackv5-default-user' => 'Article Feedback V5',
+
/* EmailCapture */
'articlefeedbackv5-emailcapture-response-body' => 'Hello!
@@ -683,6 +686,7 @@
* <code>$2</code> – Page name of item with feedback requiring oversight.
* <code>$3</code> – URL directly to feedback location
* <code>$4</code> – The help link.',
+ 'articlefeedbackv5-default-user' => 'The name of the default or
internal user who is listed as being the one who autohides feedback for logging
and display purposes'
);
/** Afrikaans (Afrikaans)
Modified: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-08 19:42:54 UTC (rev 113389)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-08 19:44:55 UTC (rev 113390)
@@ -241,7 +241,8 @@
// if this is an automatic action, we create our special
extension doer and send
if ($auto) {
- $doer = User::newFromName( 'Article Feedback V5' );
+ $default_user = wfMessage(
'articlefeedbackv5-default-user' )->text();
+ $doer = User::newFromName( $default_user );
// I cannot see how this could fail, but if it does do
not log
if (!$doer) {
return;
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
2012-03-08 19:42:54 UTC (rev 113389)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
2012-03-08 19:44:55 UTC (rev 113390)
@@ -48,6 +48,9 @@
// woah, we were not checking for permissions (that could have
been script kiddy bad)
global $wgUser;
+ // we may not actually use this, but don't want to repeat this
a million times
+ $default_user = wfMessage( 'articlefeedbackv5-default-user'
)->text();
+
// we use ONE db connection that talks to master
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
@@ -98,7 +101,7 @@
// tell front-end autohiding was done
$results['autohidden'] = 1;
// This is data for the "hidden by,
oversighted by" red line
- $results['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink(null, 'Article Feedback V5');
+ $results['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink(null, $default_user);
$results['hide-timestamp'] =
wfTimestamp( TS_RFC2822, $timestamp );
}
@@ -202,7 +205,7 @@
// tell front-end autohiding was done
$results['autohidden'] = 1;
// This is data for the "hidden by,
oversighted by" red line
- $results['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink(null, 'Article Feedback V5');
+ $results['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink(null, $default_user);
$results['hide-timestamp'] =
wfTimestamp( TS_RFC2822, $timestamp );
}
}
@@ -250,7 +253,7 @@
// tell front-end autohiding was done
$results['autohidden'] = 1;
// This is data for the "hidden by,
oversighted by" red line
- $results['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink(null, 'Article Feedback V5');
+ $results['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink(null, $default_user);
$results['hide-timestamp'] =
wfTimestamp( TS_RFC2822, $timestamp );
}
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-03-08 19:42:54 UTC (rev 113389)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-03-08 19:44:55 UTC (rev 113390)
@@ -347,6 +347,7 @@
$can_vote = !$wgUser->isBlocked();
$can_hide = $wgUser->isAllowed( 'aftv5-hide-feedback' );
$can_delete = $wgUser->isAllowed( 'aftv5-delete-feedback' );
+ $default_user = wfMessage( 'articlefeedbackv5-default-user'
)->text();
$footer_links = Html::openElement( 'div', array(
'class' => 'articleFeedbackv5-vote-wrapper'
@@ -498,12 +499,12 @@
);
if ( $record[0]->af_is_hidden ) {
- $attributes['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink($record[0]->af_hide_user_id, 'Article
Feedback V5');
+ $attributes['hide-user'] =
ApiArticleFeedbackv5Utils::getUserLink($record[0]->af_hide_user_id,
$default_user);
$attributes['hide-timestamp'] = wfTimestamp(
TS_RFC2822, $record[0]->af_hide_timestamp );
}
if ( $record[0]->af_is_deleted ) {
- $attributes['oversight-user'] =
ApiArticleFeedbackv5Utils::getUserLink($record[0]->af_oversight_user_id,
'Article Feedback V5');
+ $attributes['oversight-user'] =
ApiArticleFeedbackv5Utils::getUserLink($record[0]->af_oversight_user_id,
$default_user);
$attributes['oversight-timestamp'] = wfTimestamp(
TS_RFC2822, $record[0]->af_oversight_timestamp );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
