Skip to content

Commit

Permalink
Merge branch 'release/19.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Aug 7, 2024
2 parents 338405f + b6c1f99 commit a315d50
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import PackageDescription

struct ProjectSettings {
static let marketingVersion: String = "19.0.5"
static let marketingVersion: String = "19.0.6"
}

let package = Package(
Expand Down
1 change: 1 addition & 0 deletions Sources/SRGDataProviderModel/NSCalendar+SRGDataProvider.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ @implementation NSCalendar (PlaySRG)
+ (NSCalendar *)srg_defaultCalendar
{
NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
calendar.locale = NSLocale.currentLocale;
calendar.timeZone = NSTimeZone.srg_defaultTimeZone;
return calendar;
}
Expand Down
28 changes: 28 additions & 0 deletions Tests/SRGDataProviderModelTests/CalendarTestCase.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// Copyright (c) SRG SSR. All rights reserved.
//
// License information is available from the LICENSE file.
//

@import SRGDataProviderModel;
@import XCTest;

@interface CalendarTestCase : XCTestCase

@end

@implementation CalendarTestCase

- (void)testLocale
{
NSCalendar *calendar = NSCalendar.srg_defaultCalendar;
XCTAssertEqualObjects(calendar.locale, NSLocale.currentLocale);
}

- (void)testTimezone
{
NSCalendar *calendar = NSCalendar.srg_defaultCalendar;
XCTAssertEqualObjects(calendar.timeZone.name, @"Europe/Zurich");
}

@end

0 comments on commit a315d50

Please sign in to comment.