Skip to content

Commit 79eedde

Browse files
mediumTajmediumTaj
authored
Merge pull request #108 from watson-developer-cloud/feature-105-languageTranslatorSplit
Feature 105 language translator split
2 parents bafd50e + 8134e0f commit 79eedde

18 files changed

+946
-109
lines changed

‎Config.json.enc‎

0 Bytes
Binary file not shown.

‎Examples/ServiceExamples/Scripts/ExampleLanguageTranslation.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/**
2+
* Copyright 2015 IBM Corp. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
18+
using UnityEngine;
19+
using IBM.Watson.DeveloperCloud.Services.LanguageTranslation.v1;
20+
21+
public class ExampleLanguageTranslation : MonoBehaviour {
22+
private LanguageTranslation m_Translate = new LanguageTranslation();
23+
private string m_PharseToTranslate = "How do I get to the disco?";
24+
25+
void Start ()
26+
{
27+
Debug.Log("English Phrase to translate: " + m_PharseToTranslate);
28+
m_Translate.GetTranslation(m_PharseToTranslate, "en", "es", OnGetTranslation);
29+
}
30+
31+
private void OnGetTranslation(Translations translation)
32+
{
33+
if (translation != null && translation.translations.Length > 0)
34+
Debug.Log("Spanish Translation: " + translation.translations[0].translation);
35+
}
36+
}

‎Examples/ServiceExamples/Scripts/ExampleLanguageTranslation.cs.meta‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/ServiceExamples/ServiceExamples.unity‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Transform:
124124
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
125125
m_Children: []
126126
m_Father: {fileID: 0}
127-
m_RootOrder: 9
127+
m_RootOrder: 10
128128
--- !u!1 &525603453
129129
GameObject:
130130
m_ObjectHideFlags: 0
@@ -149,7 +149,7 @@ MonoBehaviour:
149149
m_GameObject: {fileID: 525603453}
150150
m_Enabled: 1
151151
m_EditorHideFlags: 0
152-
m_Script: {fileID: 11500000, guid: d33458a9d3f434f2889ac182de6fa097, type: 3}
152+
m_Script: {fileID: 11500000, guid: d929f6bc1ee63ed4cb5fdbe0d2213414, type: 3}
153153
m_Name:
154154
m_EditorClassIdentifier:
155155
--- !u!4 &525603455
@@ -180,7 +180,7 @@ GameObject:
180180
m_Icon: {fileID: 0}
181181
m_NavMeshLayer: 0
182182
m_StaticEditorFlags: 0
183-
m_IsActive: 1
183+
m_IsActive: 0
184184
--- !u!114 &659829312
185185
MonoBehaviour:
186186
m_ObjectHideFlags: 0
@@ -204,7 +204,7 @@ Transform:
204204
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
205205
m_Children: []
206206
m_Father: {fileID: 0}
207-
m_RootOrder: 12
207+
m_RootOrder: 13
208208
--- !u!1 &725710367
209209
GameObject:
210210
m_ObjectHideFlags: 0
@@ -291,7 +291,7 @@ Transform:
291291
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
292292
m_Children: []
293293
m_Father: {fileID: 0}
294-
m_RootOrder: 6
294+
m_RootOrder: 7
295295
--- !u!1 &748186939
296296
GameObject:
297297
m_ObjectHideFlags: 0
@@ -331,7 +331,7 @@ Transform:
331331
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
332332
m_Children: []
333333
m_Father: {fileID: 0}
334-
m_RootOrder: 11
334+
m_RootOrder: 12
335335
--- !u!1 &859102722
336336
GameObject:
337337
m_ObjectHideFlags: 0
@@ -387,7 +387,7 @@ GameObject:
387387
m_Icon: {fileID: 0}
388388
m_NavMeshLayer: 0
389389
m_StaticEditorFlags: 0
390-
m_IsActive: 1
390+
m_IsActive: 0
391391
--- !u!114 &1053617510
392392
MonoBehaviour:
393393
m_ObjectHideFlags: 0
@@ -411,7 +411,7 @@ Transform:
411411
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
412412
m_Children: []
413413
m_Father: {fileID: 0}
414-
m_RootOrder: 12
414+
m_RootOrder: 14
415415
--- !u!1 &1073418922
416416
GameObject:
417417
m_ObjectHideFlags: 0
@@ -451,7 +451,7 @@ Transform:
451451
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
452452
m_Children: []
453453
m_Father: {fileID: 0}
454-
m_RootOrder: 7
454+
m_RootOrder: 8
455455
--- !u!1 &1160237478
456456
GameObject:
457457
m_ObjectHideFlags: 0
@@ -548,7 +548,7 @@ GameObject:
548548
m_Icon: {fileID: 0}
549549
m_NavMeshLayer: 0
550550
m_StaticEditorFlags: 0
551-
m_IsActive: 1
551+
m_IsActive: 0
552552
--- !u!114 &1310649319
553553
MonoBehaviour:
554554
m_ObjectHideFlags: 0
@@ -572,7 +572,7 @@ Transform:
572572
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
573573
m_Children: []
574574
m_Father: {fileID: 0}
575-
m_RootOrder: 12
575+
m_RootOrder: 15
576576
--- !u!1 &1713392457
577577
GameObject:
578578
m_ObjectHideFlags: 0
@@ -588,7 +588,7 @@ GameObject:
588588
m_Icon: {fileID: 0}
589589
m_NavMeshLayer: 0
590590
m_StaticEditorFlags: 0
591-
m_IsActive: 0
591+
m_IsActive: 1
592592
--- !u!114 &1713392458
593593
MonoBehaviour:
594594
m_ObjectHideFlags: 0
@@ -612,7 +612,7 @@ Transform:
612612
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
613613
m_Children: []
614614
m_Father: {fileID: 0}
615-
m_RootOrder: 8
615+
m_RootOrder: 9
616616
--- !u!1 &1740459831
617617
GameObject:
618618
m_ObjectHideFlags: 0
@@ -668,7 +668,7 @@ GameObject:
668668
m_Icon: {fileID: 0}
669669
m_NavMeshLayer: 0
670670
m_StaticEditorFlags: 0
671-
m_IsActive: 1
671+
m_IsActive: 0
672672
--- !u!114 &1937656528
673673
MonoBehaviour:
674674
m_ObjectHideFlags: 0
@@ -692,7 +692,7 @@ Transform:
692692
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
693693
m_Children: []
694694
m_Father: {fileID: 0}
695-
m_RootOrder: 5
695+
m_RootOrder: 6
696696
--- !u!1 &1979050314
697697
GameObject:
698698
m_ObjectHideFlags: 0
@@ -772,4 +772,4 @@ Transform:
772772
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
773773
m_Children: []
774774
m_Father: {fileID: 0}
775-
m_RootOrder: 10
775+
m_RootOrder: 11

‎Scripts/Connection/RESTConnector.cs‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,11 @@ private IEnumerator ProcessRequestQueue()
489489
}
490490
else
491491
{
492+
493+
#if ENABLE_DEBUGGING
494+
Log.Debug("RESTConnector", "Delete Request URL: {0}", url);
495+
#endif
496+
492497
#if UNITY_EDITOR
493498
float timeout = Mathf.Max(Config.Instance.TimeOut, req.Timeout);
494499

@@ -507,6 +512,7 @@ private IEnumerator ProcessRequestQueue()
507512
continue;
508513

509514
resp.Success = deleteReq.Success;
515+
510516
#else
511517
Log.Warning( "RESTConnector", "DELETE method is supported in the editor only." );
512518
resp.Success = false;
@@ -530,8 +536,13 @@ private class DeleteRequest
530536
public bool IsComplete { get; set; }
531537
public bool Success { get; set; }
532538

539+
private Thread m_Thread = null;
540+
533541
public bool Send(string url, Dictionary<string, string> headers)
534542
{
543+
#if ENABLE_DEBUGGING
544+
Log.Debug("RESTConnector", "DeleteRequest, Send: {0}, m_Thread:{1}", url, m_Thread);
545+
#endif
535546
if (m_Thread != null && m_Thread.IsAlive)
536547
return false;
537548

@@ -544,24 +555,37 @@ public bool Send(string url, Dictionary<string, string> headers)
544555
}
545556

546557
m_Thread = new Thread(ProcessRequest);
558+
547559
m_Thread.Start();
548560
return true;
549561
}
550-
551-
private Thread m_Thread = null;
552-
562+
553563
private void ProcessRequest()
554564
{
555565
// This fixes the exception thrown by self-signed certificates.
556566
ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
557567

568+
#if ENABLE_DEBUGGING
569+
Log.Debug("RESTConnector", "DeleteRequest, ProcessRequest {0}", URL);
570+
#endif
571+
558572
WebRequest deleteReq = WebRequest.Create(URL);
573+
559574
foreach (var kp in Headers)
560575
deleteReq.Headers.Add(kp.Key, kp.Value);
561576
deleteReq.Method = "DELETE";
562577

578+
#if ENABLE_DEBUGGING
579+
Log.Debug("RESTConnector", "DeleteRequest, sending deletereq {0}", deleteReq);
580+
#endif
563581
HttpWebResponse deleteResp = deleteReq.GetResponse() as HttpWebResponse;
582+
#if ENABLE_DEBUGGING
583+
Log.Debug("RESTConnector", "DELETE Request SENT: {0}", URL);
584+
#endif
564585
Success = deleteResp.StatusCode == HttpStatusCode.OK;
586+
#if ENABLE_DEBUGGING
587+
Log.Debug("RESTConnector", "DELETE Request COMPLETE: {0}", URL);
588+
#endif
565589
IsComplete = true;
566590
}
567591
};

‎Scripts/Editor/ConfigEditor.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ private class ServiceSetup
5454
URL ="https://console.ng.bluemix.net/catalog/text-to-speech/", ServiceID="TextToSpeechV1" },
5555
new ServiceSetup() { ServiceName = "Dialog", ServiceAPI = "dialog/api",
5656
URL ="https://console.ng.bluemix.net/catalog/dialog/", ServiceID="DialogV1" },
57-
new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translation/api",
58-
URL ="https://console.ng.bluemix.net/catalog/services/language-translation/", ServiceID="LanguageTranslatorV1" },
57+
new ServiceSetup() { ServiceName = "Language Translation (to be deprecated)", ServiceAPI = "language-translation/api",
58+
URL ="https://console.ng.bluemix.net/catalog/services/language-translation/", ServiceID="LanguageTranslationV1" },
59+
//new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translator/api",
60+
// URL ="https://console.ng.bluemix.net/catalog/services/language-translator/", ServiceID="LanguageTranslatorV1" },
5961
new ServiceSetup() { ServiceName = "Natural Language Classifier", ServiceAPI = "natural-language-classifier/api",
60-
URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
62+
URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
6163
new ServiceSetup() { ServiceName = "Tone Analyzer", ServiceAPI = "tone-analyzer/api",
6264
URL ="https://console.ng.bluemix.net/catalog/services/tone-analyzer/", ServiceID="ToneAnalyzerV3" },
6365
new ServiceSetup() { ServiceName = "Tradeoff Analytics", ServiceAPI = "tradeoff-analytics/api",

‎Scripts/Services/LanguageTranslation.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)