From bea5b8526c80468c6412fa895e61d10735014b98 Mon Sep 17 00:00:00 2001 From: Reedy Date: Thu, 21 Jun 2018 11:50:27 +0100 Subject: [PATCH] Reduce indenting, remove else conditions Change-Id: If39ed94f12108dee231ff99dbe740418d192f349 --- languages/classes/LanguageEn.php | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/languages/classes/LanguageEn.php b/languages/classes/LanguageEn.php index 6d603f591b..58e3691502 100644 --- a/languages/classes/LanguageEn.php +++ b/languages/classes/LanguageEn.php @@ -43,28 +43,28 @@ class EnConverter extends LanguageConverter { * @return string */ function translate( $text, $toVariant ) { - if ( $toVariant === 'en-x-piglatin' ) { - // Only process words composed of standard English alphabet, leave the rest unchanged. - // This skips some English words like 'naïve' or 'résumé', but we can live with that. - // Ignore single letters and words which aren't lowercase or uppercase-first. - return preg_replace_callback( '/[A-Za-z][a-z\']+/', function ( $matches ) { - $word = $matches[0]; - if ( preg_match( '/^[aeiou]/i', $word ) ) { - return $word . 'way'; - } else { - return preg_replace_callback( '/^(s?qu|[^aeiou][^aeiouy]*)(.*)$/i', function ( $m ) { - $ucfirst = strtoupper( $m[1][0] ) === $m[1][0]; - if ( $ucfirst ) { - return ucfirst( $m[2] ) . lcfirst( $m[1] ) . 'ay'; - } else { - return $m[2] . $m[1] . 'ay'; - } - }, $word ); - } - }, $text ); - } else { + if ( $toVariant !== 'en-x-piglatin' ) { return $text; } + + // Only process words composed of standard English alphabet, leave the rest unchanged. + // This skips some English words like 'naïve' or 'résumé', but we can live with that. + // Ignore single letters and words which aren't lowercase or uppercase-first. + return preg_replace_callback( '/[A-Za-z][a-z\']+/', function ( $matches ) { + $word = $matches[0]; + if ( preg_match( '/^[aeiou]/i', $word ) ) { + return $word . 'way'; + } + + return preg_replace_callback( '/^(s?qu|[^aeiou][^aeiouy]*)(.*)$/i', function ( $m ) { + $ucfirst = strtoupper( $m[1][0] ) === $m[1][0]; + if ( $ucfirst ) { + return ucfirst( $m[2] ) . lcfirst( $m[1] ) . 'ay'; + } + + return $m[2] . $m[1] . 'ay'; + }, $word ); + }, $text ); } } -- 2.20.1