Merge pull request #28 from voda/custom-translate-mcaro

LatteFilter: add support for custom macros and Nette 0.9 '!' noescape

Author: voda

src/Filters/LatteFilter.php

@@ -95,7 +95,17 @@ private function findMacroName(string $text, array $functions): ?string {
 	}
 
 	private function trimMacroValue(string $name, string $value): string {
-		$offset = strlen(ltrim($name, '!_'));
-		return substr($value, $offset);
+		if (strpos($name, '!') === 0) {
+			// exclamation mark is never removed
+			return trim(substr($value, strlen($name)));
+		}
+
+		if (strpos($name, '_') === 0) {
+			// only underscore is removed
+			$offset = strlen(ltrim($name, '_'));
+			return substr($value, $offset);
+		}
+
+		return $value;
 	}
 }

tests/unit/GettextExtractor/Filters/LatteFilterTest.php

@@ -41,6 +41,47 @@ public function testExtract(): void {
 			GE\Extractor::PLURAL => 'I see %d little indians!',
 			GE\Extractor::CONTEXT => 'context'
 		), $messages);
+
+		self::assertContains(array(
+			GE\Extractor::LINE => 8,
+			GE\Extractor::SINGULAR => 'A message!'
+		), $messages);
+
+		self::assertContains(array(
+			GE\Extractor::LINE => 9,
+			GE\Extractor::SINGULAR => 'Another message!',
+			GE\Extractor::CONTEXT => 'context'
+		), $messages);
+
+		self::assertContains(array(
+			GE\Extractor::LINE => 10,
+			GE\Extractor::SINGULAR => 'I see %d little indian!',
+			GE\Extractor::PLURAL => 'I see %d little indians!'
+		), $messages);
+
+		self::assertContains(array(
+			GE\Extractor::LINE => 11,
+			GE\Extractor::SINGULAR => 'I see %d little indian!',
+			GE\Extractor::PLURAL => 'I see %d little indians!',
+			GE\Extractor::CONTEXT => 'context'
+		), $messages);
+	}
+
+	public function testCustomMacros(): void {
+		$this->object->addFunction('custom', 1);
+		$this->object->addFunction('!custom', 1);
+
+		$messages = $this->object->extract(__DIR__ . '/../../data/latte/custom.latte');
+
+		self::assertContains(array(
+			GE\Extractor::LINE => 1,
+			GE\Extractor::SINGULAR => 'A custom message!'
+		), $messages);
+
+		self::assertContains(array(
+			GE\Extractor::LINE => 2,
+			GE\Extractor::SINGULAR => 'An unescaped custom message!'
+		), $messages);
 	}
 
 	public function testNoValidMessages(): void {

tests/unit/data/latte/custom.latte

@@ -0,0 +1,2 @@
+{custom 'A custom message!'}
+{!custom 'An unescaped custom message!'}

tests/unit/data/latte/default.latte

@@ -3,3 +3,9 @@
 {_p'context', 'Another message!'}
 {_n'I see %d little indian!', 'I see %d little indians!', 3|printf:3}
 {_np'context', 'I see %d little indian!', 'I see %d little indians!', $number |printf:$number}
+
+{* Nette 0.9 noescape format *}
+{!_'A message!'}
+{!_p'context', 'Another message!'}
+{!_n'I see %d little indian!', 'I see %d little indians!', 3|printf:3}
+{!_np'context', 'I see %d little indian!', 'I see %d little indians!', $number |printf:$number}