Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/66231


Change subject: Add a message to the edit form when external text is loaded. 
Also, an i18n file for the messages.
......................................................................

Add a message to the edit form when external text is loaded. Also, an i18n
file for the messages.

Change-Id: Ib2700ba24e055816ecd0809cb4d0a71d0d661326
---
A ExternalArticles.i18n.php
M ExternalArticles.php
2 files changed, 26 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExternalArticles 
refs/changes/31/66231/1

diff --git a/ExternalArticles.i18n.php b/ExternalArticles.i18n.php
new file mode 100644
index 0000000..0efd351
--- /dev/null
+++ b/ExternalArticles.i18n.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Internationalisation for the ExternalArticles extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+$messages = array();
+
+/** English */
+$messages['en'] = array(
+       'externalarticles-desc' => 'Automatically fetch article text from 
external wikis',
+       'externalarticles-article-loaded' => 'This article has been 
automatically loaded from $1.',
+);
+
+/** Message documentation */
+$messages['qqq'] = array(
+       'externalarticles-desc' => 'General description of this extension.',
+       'externalarticles-article-loaded' => 'Parameters:
+* $1: The URL of the external page.',
+);
diff --git a/ExternalArticles.php b/ExternalArticles.php
index cb7ad89..edf442a 100644
--- a/ExternalArticles.php
+++ b/ExternalArticles.php
@@ -44,20 +44,18 @@
 }
 
 /**
- * Initialize variables
+ * Extension setup.
  */
-define( 'MEDIAWIKI_EXTERNALARTICLES', true );
-//define( 'EXTERNALARTICLES_DEBUG', true );
-
 $wgExtensionCredits['other'][] = array(
        'path' => __FILE__,
        'name' => 'External Articles',
-       'description' => 'Preloads source from external articles.',
-       //'descriptionmsg' => 'externalarticles-description-msg',
+       'descriptionmsg' => 'externalarticles-desc',
        'version' => '0.1.4', // version date 2013-05-31
        'author' => 'Nathan Perry, Alvinos, and Sam Wilson',
        'url' => 'http://www.mediawiki.org/wiki/Extension:ExternalArticles'
 );
+$wgExtensionMessagesFiles['ExternalArticles'] = dirname( __FILE__ ) . 
'/ExternalArticles.i18n.php';
+$wgHooks['EditFormPreloadText'][] = 'ExternalArticles_EditFormPreloadText';
 
 // todo: change this so each setting is set to it's default if it is not 
defined.
 //       Currently, if anything is overridden, all must be defined.
@@ -72,7 +70,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
@@ -111,6 +108,7 @@
                        }
                        return false;
                }
+               $wgOut->wrapWikiMsg('<div class="success">$1</div>', 
array('externalarticles-article-loaded', $url));
                $text = $httpRequest->getContent();
 
                return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/66231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2700ba24e055816ecd0809cb4d0a71d0d661326
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExternalArticles
Gerrit-Branch: master
Gerrit-Owner: Samwilson <s...@samwilson.id.au>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to