Skip to content

Fix Google translator obsolete code #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Google translator obsolete code #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions Packages/com.gametoolkit.localization/Runtime/Utilities/GoogleTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) H. Ibrahim Penekli. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System;
using System.Collections;
using UnityEngine;
Expand Down Expand Up @@ -99,7 +98,15 @@ private void ProcessResponse(GoogleTranslateRequest request, UnityWebRequest www
Action<TranslationCompletedEventArgs> onCompleted,
Action<TranslationErrorEventArgs> onError)
{
if (www.isNetworkError || www.isHttpError)
var hasError = false;
#if UNITY_2020_2_OR_NEWER
var requestResult = www.result;
hasError = requestResult != UnityWebRequest.Result.Success;
#else
hasError = www.isNetworkError || www.isHttpError;
#endif

if (hasError)
{
if (onError != null)
{
Expand All @@ -112,11 +119,11 @@ private void ProcessResponse(GoogleTranslateRequest request, UnityWebRequest www
if (response != null && response.data != null && response.data.translations != null &&
response.data.translations.Length > 0)
{
var requests = new GoogleTranslateRequest[] {request};
var requests = new GoogleTranslateRequest[] { request };

var translateResponse = new GoogleTranslateResponse();
translateResponse.TranslatedText = response.data.translations[0].translatedText;
var responses = new GoogleTranslateResponse[] {translateResponse};
var responses = new GoogleTranslateResponse[] { translateResponse };

if (onCompleted != null)
{
Expand Down Expand Up @@ -152,7 +159,7 @@ private class JsonData
{
public JsonTranslation[] translations = null;
}

[Serializable]
private class JsonError
{
Expand Down Expand Up @@ -202,7 +209,7 @@ public class TranslationErrorEventArgs : EventArgs
/// Error code.
/// </summary>
public long ResponseCode { get; private set; }

/// <summary>
/// Error message.
/// </summary>
Expand Down