Merge "Made convertNamespace() use APC"

diff --combined languages/LanguageConverter.php
index 41d282b,5f1dca4..78b3572
--- 1/languages/LanguageConverter.php
--- 2/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@@ -539,27 -539,45 +539,45 @@@ class LanguageConverter 
         * @return string Namespace name for display
         */
        public function convertNamespace( $index, $variant = null ) {
+               if ( $index === NS_MAIN ) {
+                       return '';
+               }
+ 
                if ( $variant === null ) {
                        $variant = $this->getPreferredVariant();
                }
-               if ( $index === NS_MAIN ) {
-                       return '';
-               } else {
-                       // First check if a message gives a converted name in the target variant.
-                       $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inLanguage( $variant );
-                       if ( $nsConvMsg->exists() ) {
-                               return $nsConvMsg->plain();
-                       }
-                       // Then check if a message gives a converted name in content language
-                       // which needs extra translation to the target variant.
+ 
+               $cache = ObjectCache::newAccelerator( CACHE_NONE );
+               $key = wfMemcKey( 'languageconverter', 'namespace-text', $index, $variant );
+               $nsVariantText = $cache->get( $key );
+               if ( $nsVariantText !== false ) {
+                       return $nsVariantText;
+               }
+ 
+               // First check if a message gives a converted name in the target variant.
+               $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inLanguage( $variant );
+               if ( $nsConvMsg->exists() ) {
+                       $nsVariantText = $nsConvMsg->plain();
+               }
+ 
+               // Then check if a message gives a converted name in content language
+               // which needs extra translation to the target variant.
+               if ( $nsVariantText === false ) {
                        $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inContentLanguage();
                        if ( $nsConvMsg->exists() ) {
-                               return $this->translate( $nsConvMsg->plain(), $variant );
+                               $nsVariantText = $this->translate( $nsConvMsg->plain(), $variant );
                        }
+               }
+ 
+               if ( $nsVariantText === false ) {
                        // No message exists, retrieve it from the target variant's namespace names.
                        $langObj = $this->mLangObj->factory( $variant );
-                       return $langObj->getFormattedNsText( $index );
+                       $nsVariantText = $langObj->getFormattedNsText( $index );
                }
+ 
+               $cache->set( $key, $nsVariantText, 60 );
+ 
+               return $nsVariantText;
        }
  
        /**
@@@ -1092,13 -1110,13 +1110,13 @@@
                        // text should be splited by ";" only if a valid variant
                        // name exist after the markup, for example:
                        //  -{zh-hans:<span style="font-size:120%;">xxx</span>;zh-hant:\
 -                      //      <span style="font-size:120%;">yyy</span>;}-
 +                      //      <span style="font-size:120%;">yyy</span>;}-
                        // we should split it as:
                        //  array(
 -                      //        [0] => 'zh-hans:<span style="font-size:120%;">xxx</span>'
 -                      //        [1] => 'zh-hant:<span style="font-size:120%;">yyy</span>'
 -                      //        [2] => ''
 -                      //       )
 +                      //        [0] => 'zh-hans:<span style="font-size:120%;">xxx</span>'
 +                      //        [1] => 'zh-hant:<span style="font-size:120%;">yyy</span>'
 +                      //        [2] => ''
 +                      //       )
                        $pat = '/;\s*(?=';
                        foreach ( $this->mVariants as $variant ) {
                                // zh-hans:xxx;zh-hant:yyy