Merge 329e774 into b842ccb

jenssegers · Oct 31, 2016 · 2b5402c · 2b5402c
2 parents b842ccb + 329e774
commit 2b5402c
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 7 deletions.
diff --git a/src/Date.php b/src/Date.php
@@ -243,7 +243,16 @@ public function format($format)
 
                 // Short notations.
                 if (in_array($character, ['D', 'M'])) {
-                    $translated = mb_substr($translated, 0, 3);
+                    $toTranslate     = strtolower($original);
+                    $shortTranslated = $lang->trans($toTranslate);
+
+                    if ($shortTranslated === $toTranslate) {
+                        // use the first 3 characters as short notation
+                        $translated = mb_substr($translated, 0, 3);
+                    } else {
+                        // use translated version
+                        $translated = $shortTranslated;
+                    }
                 }
 
                 // Add to replace list.

diff --git a/src/Lang/de.php b/src/Lang/de.php
@@ -37,6 +37,19 @@
     'november'  => 'November',
     'december'  => 'Dezember',
 
+    'jan'       => 'Jan',
+    'feb'       => 'Feb',
+    'mar'       => 'Mär',
+    'apr'       => 'Apr',
+    'may'       => 'Mai',
+    'jun'       => 'Jun',
+    'jul'       => 'Jul',
+    'aug'       => 'Aug',
+    'sep'       => 'Sep',
+    'oct'       => 'Okt',
+    'nov'       => 'Nov',
+    'dec'       => 'Dez',
+
     'monday'    => 'Montag',
     'tuesday'   => 'Dienstag',
     'wednesday' => 'Mittwoch',
@@ -45,6 +58,14 @@
     'saturday'  => 'Samstag',
     'sunday'    => 'Sonntag',
 
+    'mon'       => 'Mo',
+    'tue'       => 'Di',
+    'wed'       => 'Mi',
+    'thu'       => 'Do',
+    'fri'       => 'Fr',
+    'sat'       => 'Sa',
+    'sun'       => 'So',
+
     'year_diff'      => '1 Jahr|:count Jahren',
     'month_diff'     => '1 Monat|:count Monaten',
     'week_diff'      => '1 Woche|:count Wochen',

diff --git a/src/Lang/nl.php b/src/Lang/nl.php
@@ -37,6 +37,19 @@
     'november'  => 'november',
     'december'  => 'december',
 
+    'jan'       => 'jan',
+    'feb'       => 'feb',
+    'mar'       => 'mrt',
+    'apr'       => 'apr',
+    'may'       => 'mei',
+    'jun'       => 'jun',
+    'jul'       => 'jul',
+    'aug'       => 'aug',
+    'sep'       => 'sep',
+    'oct'       => 'okt',
+    'nov'       => 'nov',
+    'dec'       => 'dec',
+
     'monday'    => 'maandag',
     'tuesday'   => 'dinsdag',
     'wednesday' => 'woensdag',
@@ -45,4 +58,12 @@
     'saturday'  => 'zaterdag',
     'sunday'    => 'zondag',
 
+    'mon'       => 'ma',
+    'tue'       => 'di',
+    'wed'       => 'wo',
+    'thu'       => 'do',
+    'fri'       => 'vr',
+    'sat'       => 'za',
+    'sun'       => 'zo',
+
 ];
diff --git a/tests/AutomaticTest.php b/tests/AutomaticTest.php
@@ -37,11 +37,18 @@ public function testTranslatesMonths()
                 $date = new Date("1 $month");
                 $date->setLocale($language);
 
+                // Full
                 $translation = $selector->choose($translations[$month], 0, $language);
-
                 $this->assertTrue(isset($translation));
-                $this->assertEquals($translation, $date->format('F'), "Language: $language"); // Full
-                $this->assertEquals(mb_substr($translation, 0, 3), $date->format('M'), "Language: $language"); // Short
+                $this->assertEquals($translation, $date->format('F'), "Language: $language");
+
+                // Short
+                $monthShortEnglish = mb_substr($month, 0, 3);
+                if (isset($translations[$monthShortEnglish])) {
+                    $this->assertEquals($translations[$monthShortEnglish], $date->format('M'), "Language: $language");
+                } else {
+                    $this->assertEquals(mb_substr($translation, 0, 3), $date->format('M'), "Language: $language");
+                }
             }
         }
     }
@@ -66,9 +73,17 @@ public function testTranslatesDays()
                 $date = new Date($day);
                 $date->setLocale($language);
 
+                // Full
                 $this->assertTrue(isset($translations[$day]));
-                $this->assertEquals($translations[$day], $date->format('l'), "Language: $language"); // Full
-                $this->assertEquals(mb_substr($translations[$day], 0, 3), $date->format('D'), "Language: $language"); // Short
+                $this->assertEquals($translations[$day], $date->format('l'), "Language: $language");
+
+                // Short
+                $dayShortEnglish = mb_substr($day, 0, 3);
+                if (isset($translations[$dayShortEnglish])) {
+                    $this->assertEquals($translations[$dayShortEnglish], $date->format('D'), "Language: $language");
+                } else {
+                    $this->assertEquals(mb_substr($translations[$day], 0, 3), $date->format('D'), "Language: $language");
+                }
             }
         }
     }

diff --git a/tests/TranslationTest.php b/tests/TranslationTest.php
@@ -159,7 +159,7 @@ public function testFormatTranslated()
         $this->assertSame('l 28 F 2013 21:58:16', $date->format('\l j \F Y H:i:s'));
 
         $date = new Date(1367186296);
-        $this->assertSame('zon 28 apr 2013 21:58:16', $date->format('D j M Y H:i:s'));
+        $this->assertSame('zo 28 apr 2013 21:58:16', $date->format('D j M Y H:i:s'));
     }
 
     public function testFormatDeclensions()