Merge pull request #92 from cakephp/2.x-merge

LordSimal · web-flow · commit 33dfcda36a7e · 2023-07-30T09:14:05.000+02:00
merge 1.x =&gt; 2.x
diff --git a/src/Twig/Extension/I18nExtension.php b/src/Twig/Extension/I18nExtension.php
@@ -35,10 +35,13 @@ public function getFunctions(): array
     {
         return [
             new TwigFunction('__', 'Cake\I18n\__'),
-            new TwigFunction('__d', 'Cake\I18n\__d'),
             new TwigFunction('__n', 'Cake\I18n\__n'),
-            new TwigFunction('__x', 'Cake\I18n\__x'),
+            new TwigFunction('__d', 'Cake\I18n\__d'),
             new TwigFunction('__dn', 'Cake\I18n\__dn'),
+            new TwigFunction('__x', 'Cake\I18n\__x'),
+            new TwigFunction('__xn', 'Cake\I18n\__xn'),
+            new TwigFunction('__dx', 'Cake\I18n\__dx'),
+            new TwigFunction('__dxn', 'Cake\I18n\__dxn'),
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,13 @@ public function getFunctions(): array`
`35`	`35`	`{`
`36`	`36`	`return [`
`37`	`37`	`new TwigFunction('__', 'Cake\I18n\__'),`
`38`		`- new TwigFunction('__d', 'Cake\I18n\__d'),`
`39`	`38`	`new TwigFunction('__n', 'Cake\I18n\__n'),`
`40`		`- new TwigFunction('__x', 'Cake\I18n\__x'),`
	`39`	`+ new TwigFunction('__d', 'Cake\I18n\__d'),`
`41`	`40`	`new TwigFunction('__dn', 'Cake\I18n\__dn'),`
	`41`	`+ new TwigFunction('__x', 'Cake\I18n\__x'),`
	`42`	`+ new TwigFunction('__xn', 'Cake\I18n\__xn'),`
	`43`	`+ new TwigFunction('__dx', 'Cake\I18n\__dx'),`
	`44`	`+ new TwigFunction('__dxn', 'Cake\I18n\__dxn'),`
`42`	`45`	`];`
`43`	`46`	`}`
`44`	`47`	`}`