Samwilson has submitted this change and it was merged.
Change subject: Add a message to the edit form when external text is loaded
......................................................................
Add a message to the edit form when external text is loaded
This change adds a message, with 'success' class (so green by
default), above the page edit form when an external article's
text has been loaded. This message shows the external URL that
the text has been loaded from.
Change-Id: Ib2700ba24e055816ecd0809cb4d0a71d0d661326
---
M ExternalArticles.php
M i18n/en.json
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Samwilson: Verified; Looks good to me, approved
diff --git a/ExternalArticles.php b/ExternalArticles.php
index 26cc57f..f98fce0 100644
--- a/ExternalArticles.php
+++ b/ExternalArticles.php
@@ -43,11 +43,8 @@
}
/**
- * Initialize variables
+ * Extension setup.
*/
-define( 'MEDIAWIKI_EXTERNALARTICLES', true );
-//define( 'EXTERNALARTICLES_DEBUG', true );
-
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'External Articles',
@@ -56,6 +53,8 @@
'author' => array( 'Nathan Perry', 'Alvinos', 'Sam Wilson' ),
'url' => 'http://www.mediawiki.org/wiki/Extension:ExternalArticles'
);
+$wgExtensionMessagesFiles['ExternalArticles'] = dirname( __FILE__ ) .
'/ExternalArticles.i18n.php';
+$wgHooks['EditFormPreloadText'][] = 'ExternalArticles_EditFormPreloadText';
$wgMessagesDirs['ExternalArticles'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['ExternalArticles'] = __DIR__ .
'/ExternalArticles.i18n.php';
@@ -73,7 +72,6 @@
// @todo: validate $eagRules URL's, etc...
}
-$wgHooks['EditFormPreloadText'][] = 'ExternalArticles_EditFormPreloadText';
/**
* Preload text from a remote wiki into the edit form. Called when edit page
for
@@ -112,6 +110,7 @@
}
return false;
}
+ $wgOut->wrapWikiMsg('<div class="success">$1</div>',
array('externalarticles-article-loaded', $url));
$text = $httpRequest->getContent();
return true;
diff --git a/i18n/en.json b/i18n/en.json
index 057242c..a35c256 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,5 +2,6 @@
"@metadata": {
"authors": []
},
- "externalarticles-desc": "Preloads source from external pages"
-}
\ No newline at end of file
+ "externalarticles-desc": "Preloads source from external pages",
+ "externalarticles-article-loaded": "This article has been automatically
loaded from $1."
+}
--
To view, visit https://gerrit.wikimedia.org/r/66231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2700ba24e055816ecd0809cb4d0a71d0d661326
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ExternalArticles
Gerrit-Branch: master
Gerrit-Owner: Samwilson <[email protected]>
Gerrit-Reviewer: Qgil <[email protected]>
Gerrit-Reviewer: Samwilson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
