Fix bug in translator replacements for strings that have the same beg…

…inning. Fixes #1114.

readme.md

@@ -60,6 +60,7 @@
 - Arrays returned from routes / controllers are now turned into JSON.
 - Collection `map` and `filter` both return new `Collection` instances now.
 - Added support for wildcard event listeners. For example, `Event::listen('view.*', function() {})`.
+- Fix bug in translator replacements for strings that have the same beginning.
 
 ## Beta 4
 

src/Illuminate/Translation/Translator.php

@@ -1,5 +1,6 @@
 <?php namespace Illuminate\Translation;
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\NamespacedItemResolver;
 use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -109,6 +110,8 @@ protected function getLine($namespace, $group, $locale, $item, $replace)
 	 */
 	protected function makeReplacements($line, $replace)
 	{
+		$replace = $this->sortReplacements($replace);
+
 		foreach ($replace as $key => $value)
 		{
 			$line = str_replace(':'.$key, $value, $line);
@@ -117,6 +120,20 @@ protected function makeReplacements($line, $replace)
 		return $line;
 	}
 
+	/**
+	 * Sort the replacements array.
+	 *
+	 * @param  array  $replace
+	 * @return array
+	 */
+	protected function sortReplacements($replace)
+	{
+		return with(new Collection($replace))->sort(function($r)
+		{
+			return mb_strlen($r) * -1;
+		});
+	}
+
 	/**
 	 * Get a translation according to an integer value.
 	 *

tests/Translation/TranslationTranslatorTest.php

@@ -32,6 +32,15 @@ public function testGetMethodProperlyLoadsAndRetrievesItem()
 	}
 
 
+	public function testGetMethodProperlyLoadsAndRetrievesItemWithLongestReplacementsFirst()
+	{
+		$t = $this->getMock('Illuminate\Translation\Translator', null, array($this->getLoader(), 'en'));
+		$t->getLoader()->shouldReceive('load')->once()->with('en', 'bar', 'foo')->andReturn(array('foo' => 'foo', 'baz' => 'breeze :foo :foobar'));
+		$this->assertEquals('breeze bar taylor', $t->get('foo::bar.baz', array('foo' => 'bar', 'foobar' => 'taylor'), 'en'));
+		$this->assertEquals('foo', $t->get('foo::bar.foo'));
+	}
+
+
 	public function testGetMethodProperlyLoadsAndRetrievesItemForGlobalNamespace()
 	{
 		$t = $this->getMock('Illuminate\Translation\Translator', null, array($this->getLoader(), 'en'));