Updating comma

coduo · Oct 29, 2015 · 9aae131 · 9aae131
1 parent b7f9201
commit 9aae131
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/spec/Coduo/PHPHumanizer/CollectionSpec.php b/spec/Coduo/PHPHumanizer/CollectionSpec.php
@@ -12,9 +12,9 @@ function it_humanizes_collections()
         $examples = array(
             array(array("Michal"), null, 'Michal'),
             array(array("Michal", "Norbert"), null, 'Michal and Norbert'),
-            array(array("Michal", "Norbert", "Lukasz"), 2, 'Michal, Norbert and 1 other'),
-            array(array("Michal", "Norbert", "Lukasz", "Pawel"), 2, 'Michal, Norbert and 2 others'),
-            array(array("Michal", "Norbert", "Lukasz", "Pawel"), null, 'Michal, Norbert, Lukasz and Pawel'),
+            array(array("Michal", "Norbert", "Lukasz"), 2, 'Michal, Norbert, and 1 other'),
+            array(array("Michal", "Norbert", "Lukasz", "Pawel"), 2, 'Michal, Norbert, and 2 others'),
+            array(array("Michal", "Norbert", "Lukasz", "Pawel"), null, 'Michal, Norbert, Lukasz, and Pawel'),
         );
 
         foreach ($examples as $example) {

diff --git a/src/Coduo/PHPHumanizer/Resources/translations/oxford.en.yml b/src/Coduo/PHPHumanizer/Resources/translations/oxford.en.yml
@@ -1,3 +1,3 @@
 only_two: "%first% and %second%"
-comma_separated: "%list% and %last%"
-comma_separated_with_limit: "{1} %list% and 1 other|[2,Inf] %list% and %count% others"
+comma_separated: "%list%, and %last%"
+comma_separated_with_limit: "{1} %list%, and 1 other|[2,Inf] %list%, and %count% others"