Merge "Expose iw_trans in siteinfo API interwikimap prop"

diff --combined includes/api/ApiQuerySiteinfo.php
index ac9e85a,464693a..ebd3fc0
--- 1/includes/api/ApiQuerySiteinfo.php
--- 2/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@@ -153,12 -153,8 +153,12 @@@ class ApiQuerySiteinfo extends ApiQuery
                }
  
                if ( $wgContLang->linkPrefixExtension() ) {
 -                      $data['linkprefix'] = wfMessage( 'linkprefix' )->inContentLanguage()->text();
 +                      $linkPrefixCharset = $wgContLang->linkPrefixCharset();
 +                      $data['linkprefixcharset'] = $linkPrefixCharset;
 +                      // For backwards compatability
 +                      $data['linkprefix'] = "/^((?>.*[^$linkPrefixCharset]|))(.+)$/sDu";
                } else {
 +                      $data['linkprefixcharset'] = '';
                        $data['linkprefix'] = '';
                }
  
@@@ -361,7 -357,9 +361,9 @@@
                        if ( $row['iw_local'] == '1' ) {
                                $val['local'] = '';
                        }
-                       // $val['trans'] = intval( $row['iw_trans'] ); // should this be exposed?
+                       if ( $row['iw_trans'] == '1' ) {
+                               $val['trans'] = '';
+                       }
                        if ( isset( $langNames[$prefix] ) ) {
                                $val['language'] = $langNames[$prefix];
                        }