From 2ac60684fae54b25ef4aac95f7643adae5a033c5 Mon Sep 17 00:00:00 2001 From: daboe01 Date: Fri, 8 Jun 2018 14:00:25 +0200 Subject: [PATCH] Fixed: CPDateFormatter was agnostic for the German language (#2724) --- Foundation/CPDateFormatter.j | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Foundation/CPDateFormatter.j b/Foundation/CPDateFormatter.j index 65526d738..2d24155b3 100644 --- a/Foundation/CPDateFormatter.j +++ b/Foundation/CPDateFormatter.j @@ -84,7 +84,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4, relativeDateFormating = @{ @"fr" : [@"demain", 1, @"apr" + String.fromCharCode(233) + @"s-demain", 2, @"apr" + String.fromCharCode(233) + @"s-apr" + String.fromCharCode(233) + @"s-demain", 3, @"hier", -1, @"avant-hier", -2, @"avant-avant-hier", -3], @"en" : [@"tomorrow", 1, @"yesterday", -1], - @"de" : [], + @"de" : [@"morgen", 1, @"gestern", -1, String.fromCharCode(129) + @"bermorgen", 2, @"vorgestern", -2], @"es" : [] }; @@ -559,7 +559,13 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4, if ([self _isAmericanFormat]) format = @"M/d/yy"; else - format = @"dd/MM/yy"; + { + if ([_locale objectForKey:CPLocaleLanguageCode] === 'de') + format = @"dd.MM.yy"; + else + format = @"dd/MM/yy"; + + } break;