Also updating the new __x() function

cakephp · Jul 26, 2014 · 3eb4345 · 3eb4345
1 parent 447ca25
commit 3eb4345
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/basics.php b/src/basics.php
@@ -703,9 +703,8 @@ function __x($context, $singular, $args = null) {
 			return;
 		}
 
-		$translated = I18n::translate($singular, null, null, null, null, null, $context);
-		$arguments = func_get_args();
-		return I18n::insertArgs($translated, array_slice($arguments, 1));
+		$arguments = func_num_args() === 2 ? (array)$args : array_slice(func_get_args(), 1);
+		return I18n::translator()->translate($singular, $arguments);
 	}
 
 }