Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/218154
Change subject: Make it optional for Google AdSense ...................................................................... Make it optional for Google AdSense Requires first https://gerrit.wikimedia.org/r/#/c/218152/ be approved. Change-Id: I5b6715adefec32708137621a6a4f712a4d3d1950 --- M groups/EntryScape/Checker.php M groups/EntryScape/Suggester.php M groups/MediaWiki/mediawiki-extensions.txt 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/54/218154/1 diff --git a/groups/EntryScape/Checker.php b/groups/EntryScape/Checker.php index f48d5f4..c1fc23a 100644 --- a/groups/EntryScape/Checker.php +++ b/groups/EntryScape/Checker.php @@ -7,6 +7,6 @@ class EntryScapeMessageChecker extends MessageChecker { protected function EntryScapeVariablesCheck( $messages, $code, &$warnings ) { - return parent::parameterCheck( $messages, $code, $warnings, '/\$?{[^}]+}|%s/' ); + return parent::parameterCheck( $messages, $code, $warnings, '/\$?{[a-z]+}|%s/' ); } } diff --git a/groups/EntryScape/Suggester.php b/groups/EntryScape/Suggester.php index 684c987..d44a007 100644 --- a/groups/EntryScape/Suggester.php +++ b/groups/EntryScape/Suggester.php @@ -5,13 +5,13 @@ * @license GPL-2.0+ */ -class EntyScapeInsertablesSuggester { +class EntryScapeInsertablesSuggester { public function getInsertables( $text ) { $insertables = array(); - // ${app}, {user}, %s + // ${app}, {user}, %s, NOT {{PLURAL}} $matches = array(); - preg_match_all( '/\$?{[^}]+}|%s/', $text, $matches, PREG_SET_ORDER ); + preg_match_all( '/\$?{[a-z]+}|%s/', $text, $matches, PREG_SET_ORDER ); $new = array_map( function( $match ) { return new Insertable( $match[0], $match[0] ); }, $matches ); diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index ad39556..6ccdd33 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1073,7 +1073,7 @@ #Go To Shell Google AdSense -ignored = googleadsense +optional = googleadsense google Analytics -- To view, visit https://gerrit.wikimedia.org/r/218154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b6715adefec32708137621a6a4f712a4d3d1950 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
