Adding the hooks "AddMagicWordsXX" to allow addition of localized magic words.

The current hook (LanguageGetMagic) cannot be used for internationalization,
because when we use it, we must include all the language aliases. Now we
include only the content language and English. However, this hook is retained
for backwards compatibility.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 21a3b13..015849b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -564,6 +564,7 @@ Some default configuration options have changed:
 * (bug 6314) Add user tool links on page histories
 * Fix display of file-type icons in galleries when $wgIgnoreImageErrors is off
 * (bug 6438) Update to Indonesian translation (id) #23
+* Adding the hooks "AddMagicWordsXX" to allow addition of localized magic words.
 
 
 == Compatibility ==

diff --git a/languages/Language.php b/languages/Language.php
index 85a6bce..b910b3c 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -295,6 +295,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_PAGESINNAMESPACE     => array( 1,    'PAGESINNAMESPACE:', 'PAGESINNS:' ),
        MAG_NUMBEROFADMINS               => array( 1,    'NUMBEROFADMINS' ),
 );
+wfRunHooks( 'AddMagicWordsEn', array( &$wgMagicWordsEn ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('Messages.php');

diff --git a/languages/LanguageAr.php b/languages/LanguageAr.php
index f56053d..b4a1e5c 100644 (file)
--- a/languages/LanguageAr.php
+++ b/languages/LanguageAr.php
@@ -90,6 +90,7 @@ require_once('LanguageUtf8.php');
 #      MAG_UC                   => array( 0,    'UC:'                    ),
 #      MAG_RAW                  => array( 0,    'RAW:'                   ),
 );
+wfRunHooks( 'AddMagicWordsAr', array( &$wgMagicWordsAr ) );
 
 
 if (!$wgCachedMessageArrays) {

diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php
index e55b1e7..d6e29d0 100644 (file)
--- a/languages/LanguageBe.php
+++ b/languages/LanguageBe.php
@@ -148,6 +148,7 @@ class LanguageBe extends LanguageUtf8 {
                        NS_CATEGORY_TALK  => 'Абмеркаваньне_катэгорыі'
                );
 
+               wfRunHooks( 'AddMagicWordsBe', array( &$this->mMagicWordsBe ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php
index da60098..b4a77b3 100644 (file)
--- a/languages/LanguageBg.php
+++ b/languages/LanguageBg.php
@@ -95,6 +95,7 @@
        MAG_CURRENTDOW           => array( 1, 'CURRENTDOW'             ),
        MAG_REVISIONID           => array( 1, 'REVISIONID'             ),
 );
+wfRunHooks( 'AddMagicWordsBg', array( &$wgMagicWordsBg ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesBg.php');

diff --git a/languages/LanguageBs.php b/languages/LanguageBs.php
index 21dadc8..1a75c0a 100644 (file)
--- a/languages/LanguageBs.php
+++ b/languages/LanguageBs.php
@@ -125,6 +125,8 @@ class LanguageBs extends LanguageUtf8 {
                        NS_CATEGORY         => 'Kategorija',
                        NS_CATEGORY_TALK    => 'Razgovor_o_kategoriji',
                );
+               
+               wfRunHooks( 'AddMagicWordsBs', array( &$this->mMagicWordsBs ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 0265c6f..7768a8a 100644 (file)
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -100,6 +100,7 @@ default:
        MAG_SERVER               => array( 0,    'SERVER'                 ),
        MAG_REVISIONID           => array( 1,    'REVISIONID',       'IDREVIZE'           )
 );
+wfRunHooks( 'AddMagicWordsCs', array( &$wgMagicWordsCs ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesCs.php');

diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 840248c..d0a6dd1 100644 (file)
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -76,6 +76,7 @@
        MAG_INT                  => array( 0,    "INT:"                                       )
 
 );
+wfRunHooks( 'AddMagicWordsCy', array( &$wgMagicWordsCy ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesCy.php');

diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php
index e806733..859b678 100644 (file)
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -85,6 +85,7 @@ class LanguageEt extends LanguageUtf8 {
                        NS_CATEGORY_TALK    => 'Kategooria_arutelu'
                );
 
+               wfRunHooks( 'AddMagicWordsEt', array( &$this->mMagicWordsEt ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index 02e00c8..77cbb5f 100644 (file)
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -114,7 +114,8 @@ class LanguageGa extends LanguageUtf8 {
                        NS_CATEGORY         => 'Catagóir',
                        NS_CATEGORY_TALK    => 'Plé_catagóire'
                );
-
+               
+               wfRunHooks( 'AddMagicWordsGa', array( &$this->mMagicWordsGa ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php
index 63d5077..dc896d4 100644 (file)
--- a/languages/LanguageHe.php
+++ b/languages/LanguageHe.php
@@ -157,6 +157,8 @@ class LanguageHe extends LanguageUtf8 {
                        NS_CATEGORY       => "קטגוריה",
                        NS_CATEGORY_TALK  => "שיחת_קטגוריה",
                );
+               
+               wfRunHooks( 'AddMagicWordsHe', array( &$this->mMagicWordsHe ) );
        }
        
        /**

diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php
index 97c5aa3..05c343b 100644 (file)
--- a/languages/LanguageIs.php
+++ b/languages/LanguageIs.php
@@ -67,7 +67,8 @@ class LanguageIs extends LanguageUtf8 {
                        NS_CATEGORY       => 'Flokkur',
                        NS_CATEGORY_TALK  => 'Flokkaspjall'
                );
-
+               
+               wfRunHooks( 'AddMagicWordsIs', array( &$this->mMagicWordsIs ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index 1d5318d..914a252 100644 (file)
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -91,6 +91,7 @@
        MAG_CURRENTDOW                  =>      array( 1, 'CURRENTDOW' ),
        MAG_REVISIONID                  =>      array( 1, 'REVISIONID' ),
 );
+wfRunHooks( 'AddMagicWordsMk', array( &$wgMagicWordsMk ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesMk.php');

diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php
index e55f585..3b0f58d 100644 (file)
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -99,7 +99,8 @@ class LanguageNds extends LanguageUtf8 {
                        NS_CATEGORY         => 'Kategorie',
                        NS_CATEGORY_TALK    => 'Kategorie_Diskuschoon'
                );
-
+               
+               wfRunHooks( 'AddMagicWordsNds', array( &$this->mMagicWordsNds ) );
        }
 
        function getBookstoreList() {

diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index e21164b..74d9627 100644 (file)
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -116,6 +116,7 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW', 'VEKEDAGNRNO', 'UKEDAGNRNÅ'                              ),
        MAG_REVISIONID           => array( 1,    'REVISIONID', 'VERSJONSID'                                             )
 ) + $wgMagicWordsEn;
+wfRunHooks( 'AddMagicWordsNn', array( &$wgMagicWordsNn ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesNn.php');

diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index 47f8f95..12729a4 100644 (file)
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -131,6 +131,7 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
        MAG_REVISIONID           => array( 1,    'REVISIONID'             ),
 );
+wfRunHooks( 'AddMagicWordsPt', array( &$wgMagicWordsPt ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesPt.php');

diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php
index 1cac3d0..d45f2b5 100644 (file)
--- a/languages/LanguageRo.php
+++ b/languages/LanguageRo.php
@@ -77,7 +77,8 @@ class LanguageRo extends LanguageUtf8 {
                        NS_CATEGORY       => 'Categorie',
                        NS_CATEGORY_TALK  => 'Discuţie_Categorie'
                );
-
+               
+               wfRunHooks( 'AddMagicWordsRo', array( &$this->mMagicWordsRo ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 4b1b385..9cc35ca 100644 (file)
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -109,6 +109,7 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW','ТЕКУЩИЙДЕНЬНЕДЕЛИ'),
        MAG_REVISIONID           => array( 1,    'REVISIONID', 'ИДВЕРСИИ'),
 );
+wfRunHooks( 'AddMagicWordsRu', array( &$wgMagicWordsRu ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesRu.php');

diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index be50900..b0b1dbd 100644 (file)
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -115,6 +115,8 @@ class LanguageSk extends LanguageUtf8 {
                        NS_CATEGORY       => 'Kategória',
                        NS_CATEGORY_TALK  => 'Diskusia_ku_kategórii'
                );
+               
+               wfRunHooks( 'AddMagicWordsSk', array( &$this->mMagicWordsSk ) );
        }
 
        function getNamespaces() {

diff --git a/languages/LanguageSr_ec.php b/languages/LanguageSr_ec.php
index bacca1b..7abf730 100644 (file)
--- a/languages/LanguageSr_ec.php
+++ b/languages/LanguageSr_ec.php
@@ -114,6 +114,7 @@ require_once( "LanguageUtf8.php" );
        MAG_LC                   => array( 0, 'LC:', 'ЛЦ:' ),
        MAG_UC                   => array( 0, 'UC:', 'УЦ:' ),
 );
+wfRunHooks( 'AddMagicWordsSr_ec', array( &$wgMagicWordsSr_ec ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesSr_ec.php');

diff --git a/languages/LanguageSr_el.php b/languages/LanguageSr_el.php
index 2c56bd8..395c022 100644 (file)
--- a/languages/LanguageSr_el.php
+++ b/languages/LanguageSr_el.php
@@ -114,6 +114,7 @@ require_once( "LanguageUtf8.php" );
        MAG_LC                   => array( 0, 'LC:', 'LC:' ),
        MAG_UC                   => array( 0, 'UC:', 'UC:' ),
 );
+wfRunHooks( 'AddMagicWordsSr_el', array( &$wgMagicWordsSr_el ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesSr_el.php');

diff --git a/languages/LanguageTt.php b/languages/LanguageTt.php
index 80eec2a..de72899 100644 (file)
--- a/languages/LanguageTt.php
+++ b/languages/LanguageTt.php
@@ -73,6 +73,7 @@ require_once( "LanguageUtf8.php" );
        MAG_LOCALURLE            => array( 0,    'URINLIURLE:'             ),
        MAG_SERVER               => array( 0,    'SERVER'                 )
 ) + $wgMagicWordsEn;
+wfRunHooks( 'AddMagicWordsTt', array( &$wgMagicWordsTt ) );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesTt.php');

diff --git a/languages/LanguageVi.php b/languages/LanguageVi.php
index b9ba462..c3c8f8c 100644 (file)
--- a/languages/LanguageVi.php
+++ b/languages/LanguageVi.php
@@ -89,6 +89,7 @@ require_once( 'LanguageUtf8.php' );
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
        MAG_REVISIONID           => array( 1,    'REVISIONID'  , 'SỐBẢN'           ),
  );
+wfRunHooks( 'AddMagicWordsVi', array( &$wgMagicWordsVi ) );
 
 /* private */ $wgDateFormatsVi = array(
     MW_DATE_DEFAULT => 'Không lựa chọn',