Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add language/locale #176

Merged
merged 6 commits into from
Oct 9, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions MapboxDirections/MBRouteOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ open class RouteOptions: NSObject, NSSecureCoding {
self.attributeOptions = attributeOptions

includesExitRoundaboutManeuver = decoder.decodeBool(forKey: "includesExitRoundaboutManeuver")

locale = Locale(identifier: decoder.decodeObject(of: NSString.self, forKey: "locale") as String? ?? "")
}

open static var supportsSecureCoding = true
Expand All @@ -195,6 +197,9 @@ open class RouteOptions: NSObject, NSSecureCoding {
coder.encode(routeShapeResolution.description, forKey: "routeShapeResolution")
coder.encode(attributeOptions.description, forKey: "attributeOptions")
coder.encode(includesExitRoundaboutManeuver, forKey: "includesExitRoundaboutManeuver")
if let locale = locale, let languageCode = (locale as NSLocale?)?.object(forKey: .languageCode) as? String {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The language code is only part of the locale. It omits the region and script, which are sometimes relevant (zh-Hans, pt-BR) and will become increasingly relevant in the future. Locale bridges cleanly to NSLocale, which conforms to NSSecureCoding, so cast locale to NSLocale and encode it directly.

coder.encode(languageCode, forKey: "locale")
}
}

// MARK: Specifying the Path of the Route
Expand Down Expand Up @@ -303,6 +308,13 @@ open class RouteOptions: NSObject, NSSecureCoding {
*/
open var includesExitRoundaboutManeuver = false

/**
If set, this `Locale` will be used to translate instructions.

See supported languages [here](https://www.mapbox.com/api-documentation/#instructions-languages).
Copy link
Contributor

@1ec5 1ec5 Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The locale in which the routes’ instructions are written.

If you use MapboxDirections.swift with the Mapbox Directions API, this property affects the sentence contained within the RouteStep.instructions property, but it does not affect any road names contained in that property or other properties such as RouteStep.name.

The Directions API can provide instructions in a number of languages. Set this property to Bundle.main.preferredLocalizations.first or Locale.autoupdatingCurrent to match the application’s language or the system language, respectively.

By default, this property is set to nil, causing instructions to be written in the default language, English.

*/
open var locale: Locale?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’d be nice to default to Locale.autoupdatingCurrent or Bundle.main.preferredLocalizations.first so the behavior is always what the user would expect, but that can happen as tail work, possibly at the same time that we set a default locale in MapboxGeocoder.swift.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this optional for now.


/**
An array of URL parameters to include in the request URL.
*/
Expand All @@ -319,6 +331,10 @@ open class RouteOptions: NSObject, NSSecureCoding {
params.append(URLQueryItem(name: "roundabout_exits", value: String(includesExitRoundaboutManeuver)))
}

if let locale = locale, let languageCode = (locale as NSLocale?)?.object(forKey: .languageCode) as? String {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The language code is only the two-letter ISO 369 code. It doesn’t ever include a region or script code; for that, you need the full locale identifier. Unfortunately, the Directions API currently lacks any sort of fallback mechanism. So this code will fail for Simplified Chinese (zh-Hant), yet if we were to pass in the full locale identifier, the code would break for a Spanish speaker in Mexico (es-MX) instead.

Until the Directions API gains basic language fallback capability, we’ll need to hard-code a whitelist of locales that the Directions API supports.

params.append(URLQueryItem(name: "language", value: languageCode))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once we implement fallback logic on the server side, we’ll want to pass in locale.localeIdentifier here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

}

// Include headings and heading accuracies if any waypoint has a nonnegative heading.
if !waypoints.filter({ $0.heading >= 0 }).isEmpty {
let headings = waypoints.map { $0.headingDescription }.joined(separator: ";")
Expand Down
2 changes: 2 additions & 0 deletions MapboxDirectionsTests/RouteOptionsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class RouteOptionsTests: XCTestCase {
]

let options = RouteOptions(coordinates: coordinates, profileIdentifier: .automobileAvoidingTraffic)
options.locale = Locale(identifier: "en")

let encodedData = NSMutableData()
let keyedArchiver = NSKeyedArchiver(forWritingWith: encodedData)
Expand All @@ -34,5 +35,6 @@ class RouteOptionsTests: XCTestCase {
XCTAssertEqual(unarchivedWaypoints[2].coordinate.longitude, coordinates[2].longitude)

XCTAssertEqual(unarchivedOptions.profileIdentifier, options.profileIdentifier)
XCTAssertEqual(unarchivedOptions.locale, options.locale)
}
}