Merge pull request #33 from snipsco/release/0.6.0

Release/0.6.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-utils"
-version = "0.5.3"
+version = "0.6.0"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [dependencies]

LICENSE

@@ -0,0 +1,13 @@
+Copyright 2018 Snips
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

python/snips_nlu_utils/__version__

@@ -1 +1 @@
-0.5.3
+0.6.0

python/snips_nlu_utils_py/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "snips-nlu-utils-py"
-version = "0.5.3"
+version = "0.6.0"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [lib]
 name = "_snips_nlu_utils_py"
 crate-type = ["cdylib"]
 
 [dependencies]
-snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.5.3" }
+snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.6.0" }
 cpython = { version="0.1", default-features=false }

src/language.rs

@@ -21,17 +21,18 @@ macro_rules! language_enum {
     }
 }
 
-language_enum!([DE, EN, ES, FR, KO]);
+language_enum!([DE, EN, ES, FR, JA, KO]);
 
 impl FromStr for Language {
     type Err = String;
     fn from_str(it: &str) -> Result<Language, Self::Err> {
         match &*it.to_lowercase() {
+            "de" => Ok(Language::DE),
             "en" => Ok(Language::EN),
-            "fr" => Ok(Language::FR),
             "es" => Ok(Language::ES),
+            "fr" => Ok(Language::FR),
+            "ja" => Ok(Language::JA),
             "ko" => Ok(Language::KO),
-            "de" => Ok(Language::DE),
             _ => Err(format!("Unknown language {}", it)),
         }
     }
@@ -40,11 +41,12 @@ impl FromStr for Language {
 impl ToString for Language {
     fn to_string(&self) -> String {
         match *self {
+            Language::DE => "de".to_string(),
             Language::EN => "en".to_string(),
-            Language::FR => "fr".to_string(),
             Language::ES => "es".to_string(),
+            Language::FR => "fr".to_string(),
+            Language::JA => "ja".to_string(),
             Language::KO => "ko".to_string(),
-            Language::DE => "de".to_string(),
         }
     }
 }