Merge pull request #84 from wit-ai/language-fix

Language fix

README.md

@@ -17,7 +17,7 @@ The SDK can capture intents and entities from:
 
 Add the following dependency to your Podfile:
 ```ruby
-pod 'Wit', '~> 4.2.0'
+pod 'Wit', '~> 4.2.1'
 ```
 
 And then run the following command in your project home directory:
@@ -84,7 +84,9 @@ Sends an NSString to wit.ai for interpretation. Will call delegate methods for e
 
 
 ##### Recording audio
-**The audio part of the API currently only supports the legacy GET /message API. If you are using stories (POST /converse) then this will not work, use ConverseString instead.
+If you provide a WitSession to the WitMicButton.session then Wit-iOS-SDK will use the /converse endpoint (stories), else the /message endpoint will be used
+
+Make sure to set Wit's speechRecognitionLocale to the same language as your Wit model. The default value is en-US (American English)
 
 ```objc
 Starts a new recording session. [self.delegate witDidGraspIntent:…] will be called once completed.

Wit.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "Wit"
-  s.version      = "4.2.0"
+  s.version      = "4.2.1"
   s.summary      = "Wit.AI Official SDK"
   s.description  = <<-DESC
                      Official Wit SDK, https://wit.ai/docs/ios-tutorial/
                    DESC
   s.homepage     = "https://github.com/wit-ai/wit-ios-sdk"
   s.author       = { "Willy Blandin" => "willy@wit.ai" }
-  s.source       = { :git => "https://github.com/wit-ai/wit-ios-sdk.git", :tag => "4.2.0" }
+  s.source       = { :git => "https://github.com/wit-ai/wit-ios-sdk.git", :tag => "4.2.1" }
 
   s.platform = :ios, '7.0'
   s.ios.deployment_target = "7.0"

Wit/WITMicButton.m

@@ -299,7 +299,6 @@ - (void)initialize {
 }
 
 - (void)dealloc {
-    [self removeObserver:self forKeyPath:@"frame"];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [self removeTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside];
 }

Wit/WITSFSpeechRecordingSession.h

@@ -10,5 +10,5 @@
 #import "WITRecordingSession.h"
 
 @interface WITSFSpeechRecordingSession : WITRecordingSession
--(instancetype)initWithWitContext:(NSDictionary *)upContext vadEnabled:(WITVadConfig)vadEnabled withWitToken:(NSString *)witToken customData: (id) customData withDelegate:(id<WITRecordingSessionDelegate>)delegate;
+-(instancetype)initWithWitContext:(NSDictionary *)upContext locale: (NSString *) locale vadEnabled:(WITVadConfig)vadEnabled withWitToken:(NSString *)witToken customData: (id) customData withDelegate:(id<WITRecordingSessionDelegate>)delegate;
 @end

Wit/WITSFSpeechRecordingSession.m

@@ -28,7 +28,7 @@ @implementation WITSFSpeechRecordingSession {
 }
 
 
--(instancetype)initWithWitContext:(NSDictionary *)upContext vadEnabled:(WITVadConfig)vadEnabled withWitToken:(NSString *)witToken customData: (id) customData withDelegate:(id<WITRecordingSessionDelegate>)delegate {
+-(instancetype)initWithWitContext:(NSDictionary *)upContext locale: (NSString *) locale vadEnabled:(WITVadConfig)vadEnabled withWitToken:(NSString *)witToken customData: (id) customData withDelegate:(id<WITRecordingSessionDelegate>)delegate {
     self = [super init];
     if (self) {
         self.customData = customData;
@@ -38,7 +38,7 @@ -(instancetype)initWithWitContext:(NSDictionary *)upContext vadEnabled:(WITVadCo
         //self.vad = [[WITVad alloc] init];
 
 
-        speechRecognizer = [[SFSpeechRecognizer alloc] initWithLocale:[NSLocale localeWithLocaleIdentifier:@"de-AT"]];
+        speechRecognizer = [[SFSpeechRecognizer alloc] initWithLocale:[NSLocale localeWithLocaleIdentifier:locale]];
         audioEngine = [[AVAudioEngine alloc] init];
         average1 = 0.0;
         average2 = 0.0;

Wit/Wit.h

@@ -32,6 +32,15 @@
  */
 @property (nonatomic, copy) NSString *accessToken;
 
+/**
+ On iOS 10 and above wit-ios-sdk uses Apple's speech recognition. The speech recognition
+ needs to know which locale to use for recognition. A list of supported locales can be found via:
+ https://developer.apple.com/documentation/speech/sfspeechrecognizer/1649889-supportedlocales
+ Note that this locale must match the language of your wit model.
+ The default value is @"en_US"
+ */
+@property (nonatomic, copy) NSString *speechRecognitionLocale;
+
 /**
  * Configure the voice activity detection algorithm:
  * - WITVadConfigDisabled

Wit/Wit.m

@@ -43,6 +43,7 @@ - (void)start {
 - (void)start: (id)customData {
     if ([SFSpeechRecognizer class]) {
         self.recordingSession = [[WITSFSpeechRecordingSession alloc] initWithWitContext:self.state.context
+                                                                                 locale: self.speechRecognitionLocale
                                                                      vadEnabled:[Wit sharedInstance].detectSpeechStop withWitToken:[WITState sharedInstance].accessToken
                                                                              customData: customData withDelegate:self];
     } else {
@@ -285,6 +286,7 @@ - (void)initialize {
     self.detectSpeechStop = WITVadConfigDetectSpeechStop;
     self.vadTimeout = 7000;
     self.vadSensitivity = 0;
+    self.speechRecognitionLocale = @"en-US";
 }
 
 - (instancetype)init {