Added magicWords to mergeable map keys, touched MessagesEn.php to invalidate caches

diff --git a/languages/Language.php b/languages/Language.php
index 990fed5..b4de4a1 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -70,7 +70,7 @@ class Language {
                'defaultDateFormat', 'extraUserToggles' );
 
        static public $mMergeableMapKeys = array( 'messages', 'namespaceNames', 'mathNames', 
-               'dateFormats', 'defaultUserOptionOverrides' );
+               'dateFormats', 'defaultUserOptionOverrides', 'magicWords' );
 
        static public $mMergeableListKeys = array( 'extraUserToggles' );
 

diff --git a/languages/MessagesEn.php b/languages/MessagesEn.php
index df91e71..0013d4f 100644 (file)
--- a/languages/MessagesEn.php
+++ b/languages/MessagesEn.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * This is the default English localisation file
+ */
+
 
 /**
  * Fallback language, used for all unspecified messages and behaviour. This