Translate "and" in the sentence_list modifier. Closes #2463

jasonvarga · jasonvarga · commit 916ad7a4f882 · 2020-09-18T11:06:24.000-04:00
diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
@@ -1688,7 +1688,7 @@ public function sentenceList($value, $params)
             return $value;
         }
 
-        $glue = Arr::get($params, 0, 'and');
+        $glue = Arr::get($params, 0, __('and'));
         $oxford_comma = Arr::get($params, 1, true);
 
         return Str::makeSentenceList($value, $glue, $oxford_comma);

Original file line number	Diff line number	Diff line change
`@@ -1688,7 +1688,7 @@ public function sentenceList($value, $params)`
`1688`	`1688`	`return $value;`
`1689`	`1689`	`}`
`1690`	`1690`
`1691`		`- $glue = Arr::get($params, 0, 'and');`
	`1691`	`+ $glue = Arr::get($params, 0, __('and'));`
`1692`	`1692`	`$oxford_comma = Arr::get($params, 1, true);`
`1693`	`1693`
`1694`	`1694`	`return Str::makeSentenceList($value, $glue, $oxford_comma);`