Added support for JSON translations (#66)

Alexwijn · andywer · commit 64868399cc35 · 2019-09-05T17:57:51.000+02:00
diff --git a/src/Caching/MessageCachingService.php b/src/Caching/MessageCachingService.php
@@ -122,7 +122,7 @@ protected function getTranslatedMessages(array $messageKeys, $locale)
         $translatedMessages = [];
 
         foreach ($messageKeys as $key) {
-            $translation = Lang::get($key, [], $locale);
+            $translation = __($key, [], $locale);
 
             if (is_array($translation)) {
                 $flattened = $this->flattenTranslations($translation, $key.'.');
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -80,9 +80,9 @@ protected function mockLang($locale = "en")
         $lang->shouldReceive('locale')->andReturn($locale);
 
         foreach ($this->testMessages[$locale] as $key=>$message) {
-            $lang->shouldReceive('get')
+            $lang->shouldReceive('getFromJson')
                 ->with($key)->andReturn($message);
-            $lang->shouldReceive('get')
+            $lang->shouldReceive('getFromJson')
                 ->with($key, m::any(), $locale)->andReturn($message);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ protected function mockLang($locale = "en")`
`80`	`80`	`$lang->shouldReceive('locale')->andReturn($locale);`
`81`	`81`
`82`	`82`	`foreach ($this->testMessages[$locale] as $key=>$message) {`
`83`		`- $lang->shouldReceive('get')`
	`83`	`+ $lang->shouldReceive('getFromJson')`
`84`	`84`	`->with($key)->andReturn($message);`
`85`		`- $lang->shouldReceive('get')`
	`85`	`+ $lang->shouldReceive('getFromJson')`
`86`	`86`	`->with($key, m::any(), $locale)->andReturn($message);`
`87`	`87`	`}`
`88`	`88`	`}`