summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Guerra <fabian.guerra@mapbox.com>2019-04-11 14:46:50 -0700
committerFabian Guerra <fabian.guerra@mapbox.com>2019-04-15 10:47:43 -0700
commit62add8df57e90529153c9f4eed6d8cedd6d5bdf3 (patch)
tree4ddd4dc68d86e702553554a5b7b7dfcb3c29fd9c
parent0ac95bd994b820f73811863bb744bf8f07459f08 (diff)
downloadqtlocation-mapboxgl-62add8df57e90529153c9f4eed6d8cedd6d5bdf3.tar.gz
[ios, macos] Fix a localization issue.
-rw-r--r--platform/darwin/src/NSExpression+MGLAdditions.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
index 4b1fdb818e..9dad00e56e 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.mm
+++ b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -1471,6 +1471,12 @@ NSDictionary<NSNumber *, NSExpression *> *MGLLocalizedStopDictionary(NSDictionar
if (localizedValues != self.constantValue) {
return [NSExpression expressionForConstantValue:localizedValues];
}
+ } else if ([self.constantValue isKindOfClass:[MGLAttributedExpression class]]) {
+ MGLAttributedExpression *attributedExpression = (MGLAttributedExpression *)self.constantValue;
+ NSExpression *localizedExpression = [attributedExpression.expression mgl_expressionLocalizedIntoLocale:locale];
+ MGLAttributedExpression *localizedAttributedExpression = [MGLAttributedExpression attributedExpression:localizedExpression attributes:attributedExpression.attributes];
+
+ return [NSExpression expressionForConstantValue:localizedAttributedExpression];
}
return self;
}