From: C. Scott Ananian <cscott@cscott.net>
Date: Mon, 2 Apr 2018 03:50:58 +0000 (-0400)
Subject: LanguageConverter tweaks to Pig Latin converter
X-Git-Tag: 1.31.0-rc.0~223^2
X-Git-Url: http://git.cyclocoop.org/data/%27%20.%20mediabox_timestamp%28find_in_path%28%27javascript/%7B%24www_url%7Dadmin/compta/operations/%40%20%27info_etape_suivante_2%27%20=%3E%20%27You%20can%20move%20on%20to%20the%20next%20step.%27%2C%20%27info_exceptions_proxy%27%20=%3E%20%27Exceptions%20for%20the%20proxy%27%2C%20%27info_exportation_base%27%20=%3E%20%27export%20database%20to%20%40archive%40%27%2C-%27info_facilite_suivi_activite%27%20=%3E%20%27To%20simplify%20monitoring%20of%20the%20site/%27s%20editorial;-%20%20activities%2C%20SPIP%20can%20send%20rmail%20notifications%2C%20e.g.%20to%20an%20editors/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=2e7018e22c852e0710d42b10aedcd1a44c558876;p=lhc%2Fweb%2Fwiklou.git

LanguageConverter tweaks to Pig Latin converter

Add apostrophe to the set of valid word characters for the en-x-piglatin
converter, so that "don't" and "can't" are properly converted to Pig
Latin (eg, to "on'tday" and "an'tcay").

Add an optional `s` before `qu` so that "squish" is properly converted
to "ishsquay".

Change-Id: Ibc5cf2c007a42d9447688b857aa75f9a3d8ae152
---

diff --git a/languages/classes/LanguageEn.php b/languages/classes/LanguageEn.php
index 709ce1bacf..6d603f591b 100644
--- a/languages/classes/LanguageEn.php
+++ b/languages/classes/LanguageEn.php
@@ -47,12 +47,12 @@ class EnConverter extends LanguageConverter {
 			// 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 ) {
+			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( '/^(qu|[^aeiou][^aeiouy]*)(.*)$/i', function ( $m ) {
+					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';