aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/renderer/MCDateFormatter.cc
diff options
context:
space:
mode:
authorGravatar Robert Widmann <devteam.codafi@gmail.com>2014-10-21 15:46:19 -0600
committerGravatar Robert Widmann <devteam.codafi@gmail.com>2014-10-21 15:46:19 -0600
commit53a1610d35f00301d933ea051b37b96fd30b0e93 (patch)
treebb2b4a0cdcac791365efc306feede072d347a9ba /src/core/renderer/MCDateFormatter.cc
parentf60b89b388389ee877e907819442b2e366238040 (diff)
parentdf800fed1079fb0b9f49681d7b1688c1d3b97539 (diff)
Merge remote-tracking branch 'upstream/master' into NNTP-Cleanup
Diffstat (limited to 'src/core/renderer/MCDateFormatter.cc')
-rw-r--r--src/core/renderer/MCDateFormatter.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/renderer/MCDateFormatter.cc b/src/core/renderer/MCDateFormatter.cc
index 2882977d..96d347d5 100644
--- a/src/core/renderer/MCDateFormatter.cc
+++ b/src/core/renderer/MCDateFormatter.cc
@@ -216,6 +216,12 @@ void DateFormatter::prepare()
localeRef = CFLocaleCopyCurrent();
}
mAppleDateFormatter = CFDateFormatterCreate(NULL, localeRef, toAppleStyle(mDateStyle), toAppleStyle(mTimeStyle));
+ if (mDateFormat != NULL) {
+ CFStringRef dateFormatCFString = CFStringCreateWithCharacters(NULL, (const UniChar *) mDateFormat->unicodeCharacters(),
+ mDateFormat->length());
+ CFDateFormatterSetFormat((CFDateFormatterRef) mAppleDateFormatter, dateFormatCFString);
+ CFRelease(dateFormatCFString);
+ }
if (localeIdentifier != NULL) {
CFRelease(localeIdentifier);
}