Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normalize message name in Allmessages

Browse source 
* Normalize the message name returned by allmessages
* Separate message key normalization into
  MessageCache::normalizeKey()

Bug: T63894
Change-Id: I1d89fc73fea705243d390bab91255a635d8f9eee
This commit is contained in:
Geoffrey Mon 2015-07-13 12:35:11 -04:00 committed by GEOFBOT
parent 958b8f1494
commit 47e0f0c34d
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/api/ApiQueryAllMessages.php
View file

@ -136,7 +136,11 @@ class ApiQueryAllMessages extends ApiQueryBase {
} }
if ( !$skip ) { if ( !$skip ) {
$a = array( 'name' => $message ); $a = array(
'name' => $message,
'normalizedname' => MessageCache::normalizeKey( $message ),
);
$args = array(); $args = array();
if ( isset( $params['args'] ) && count( $params['args'] ) != 0 ) { if ( isset( $params['args'] ) && count( $params['args'] ) != 0 ) {
$args = $params['args']; $args = $params['args'];

24
includes/cache/MessageCache.php vendored
View file

@ -130,6 +130,23 @@ class MessageCache {
self::$instance = null; self::$instance = null;
} }
/**
* Normalize message key input
*
* @param string $key Input message key to be normalized
* @return string Normalized message key
*/
public static function normalizeKey( $key ) {
$lckey = strtr( $key, ' ', '_' );
if ( ord( $lckey ) < 128 ) {
$lckey[0] = strtolower( $lckey[0] );
} else {
$lckey = $wgContLang->lcfirst( $lckey );
}
return $lckey;
}
/** /**
* @param BagOStuff $memCached A cache instance. If none, fall back to CACHE_NONE. * @param BagOStuff $memCached A cache instance. If none, fall back to CACHE_NONE.
* @param bool $useDB * @param bool $useDB
@ -784,12 +801,7 @@ class MessageCache {
} }
// Normalise title-case input (with some inlining) // Normalise title-case input (with some inlining)
$lckey = strtr( $key, ' ', '_' ); $lckey = MessageCache::normalizeKey( $key );
if ( ord( $lckey ) < 128 ) {
$lckey[0] = strtolower( $lckey[0] );
} else {
$lckey = $wgContLang->lcfirst( $lckey );
}
Hooks::run( 'MessageCache::get', array( &$lckey ) ); Hooks::run( 'MessageCache::get', array( &$lckey ) );