Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218145
Change subject: Improved variable checks for EntryScape
......................................................................
Improved variable checks for EntryScape
Change-Id: I1a9874417bd510fd4d420a4258b2e1a8bd71c0b2
---
M groups/EntryScape/Checker.php
M groups/EntryScape/Suggester.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/45/218145/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 );
--
To view, visit https://gerrit.wikimedia.org/r/218145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a9874417bd510fd4d420a4258b2e1a8bd71c0b2
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
