1 files changed, 9 insertions, 1 deletions
diff --git a/SwifTools/MacOSXChecker.mm b/SwifTools/MacOSXChecker.mm
index 3e687d1..0c73427 100644
--- a/SwifTools/MacOSXChecker.mm
+++ b/SwifTools/MacOSXChecker.mm
@@ -2,20 +2,28 @@
 * Copyright (c) 2013 Tobias Markmann
 * Licensed under the Simplified BSD license.
 * See Documentation/Licenses/BSD-simplified.txt for more information.
 */
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 #include <SwifTools/MacOSXChecker.h>
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 #include <AppKit/AppKit.h>
 namespace Swift {
 MacOSXChecker::MacOSXChecker() {
+        NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
+        [spellChecker setAutomaticallyIdentifiesLanguages:YES];
 }
 MacOSXChecker::~MacOSXChecker() {
 }
@@ -25,11 +33,11 @@ bool MacOSXChecker::isCorrect(const std::string& /*word*/) {
 }
 void MacOSXChecker::getSuggestions(const std::string& word, std::vector<std::string>& list) {
        NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
        NSString* wordString = [[NSString alloc] initWithUTF8String: word.c_str()];
-        NSArray* suggestions = [spellChecker guessesForWord: wordString];
+        NSArray* suggestions = [spellChecker guessesForWordRange:NSMakeRange(0, [wordString length]) inString:wordString language:nil inSpellDocumentWithTag:0];
        for(unsigned int i = 0; i < [suggestions count]; ++i) {
                list.push_back(std::string([[suggestions objectAtIndex:i] UTF8String]));
        }
        [wordString release];
 }