Index: includes/coder_i18n.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/includes/Attic/coder_i18n.inc,v retrieving revision 1.1.2.10 diff -u -p -r1.1.2.10 coder_i18n.inc --- includes/coder_i18n.inc 23 Sep 2008 13:53:36 -0000 1.1.2.10 +++ includes/coder_i18n.inc 27 Sep 2008 19:20:25 -0000 @@ -78,8 +78,8 @@ function coder_i18n_reviews() { ), array( '#type' => 'regex', - '#value' => '[\s\(]t\s*\(\s*[\'"](\s+|.*\s+[\'"]\s*[,\)])', - '#never' => '[\s\(]t\s*\(\s*[\'"][^\s].*([\'"]\s+[^,\)])*.*[^\s][\'"][,\)]', + '#value' => '[\s\(](t|st|get_t)\s*\(\s*[\'"](\s+|[^\)]*?\s+[\'"]\s*[,\)])', + '#not' => '[\s\(](t|st|get_t)\s*\(\s*[\'"][^\s].*?([\'"]\s+[^,\)])*.*[^\s][\'"][,\)]', '#source' => 'allphp', '#warning_callback' => '_coder_i18n_space_starts_or_ends_t', ), Index: tests/coder_i18n.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coder/tests/Attic/coder_i18n.test,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 coder_i18n.test --- tests/coder_i18n.test 25 Sep 2008 03:37:18 -0000 1.1.2.4 +++ tests/coder_i18n.test 27 Sep 2008 19:20:25 -0000 @@ -31,5 +31,17 @@ class CoderI18NTest extends CoderTestCas $this->assertCoderPass(" \$var = t('This is a false positive') . implode(', ', \$array);"); $this->assertCoderPass(" \$var = t('This is a \\'false\\\" positive');"); $this->assertCoderPass(" \$var = t('This is a \"false\" positive');"); + $this->assertCoderFail(" \$var = t('Your rating') . t(' fail');"); + $this->assertCoderFail(" \$var = t('Your rating') . t('fail ');"); + $this->assertCoderFail(" \$var = t('Your rating') . t(' fail ');"); + $this->assertCoderFail(" \$var = t(' Your rating ') . t(' fail ');"); + $this->assertCoderFail(" \$var = t(' Your rating') . t('fail');"); + $this->assertCoderFail(" \$var = t('Your rating ') . t('fail');"); + $this->assertCoderFail(" \$var = t(' Your rating ') . t('fail');"); + $this->assertCoderFail(" \$var = t('Your rating ') . t('fail ');"); + $this->assertCoderFail(" \$var = t(' Your rating ') . t('fail ');"); + $this->assertCoderFail(" \$var = t('Your rating ') . t(' fail');"); + $this->assertCoderFail(" \$description[] = t('until !until ', array('!until' => date_format_date(\$until, 'custom', \$format)));"); + $this->assertCoderFail(" \$description[] = t('except !dates ', array('!dates' => implode(', ', \$values)));"); } }