Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions Assets/EditorTests/Localization/TranslationServiceEditorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.IO;
using com.mapcolonies.core.Localization;
using com.mapcolonies.core.Localization.Constants;
using com.mapcolonies.core.Localization.Models;
using Cysharp.Threading.Tasks;
using NUnit.Framework;
using UnityEngine.Localization.Settings;
Expand Down Expand Up @@ -42,7 +43,12 @@ public IEnumerator Missing_File_Does_Not_Throw_And_Unknown_Key_Passthrough()

try
{
await svc.InitializeService(LocalizationConstants.EnglishLocaleIdentifier);
TranslationSettings settings = new TranslationSettings()
{
Locale = LocalizationConstants.EnglishLocaleIdentifier,
LocalFilePath = "Translations/Translations.json"
};
await svc.InitializeService(settings);
LocalizationSettings.SelectedLocale =
LocalizationSettings.AvailableLocales.GetLocale(LocalizationConstants.EnglishLocaleIdentifier);

Expand Down Expand Up @@ -88,7 +94,13 @@ public IEnumerator Runtime_Language_Switch_Reflects_In_Translate()

try
{
await svc.InitializeService(LocalizationConstants.EnglishLocaleIdentifier);
TranslationSettings settings = new TranslationSettings()
{
Locale = LocalizationConstants.EnglishLocaleIdentifier,
LocalFilePath = "Translations/Translations.json"
};

await svc.InitializeService(settings);

LocalizationSettings.SelectedLocale =
LocalizationSettings.AvailableLocales.GetLocale(LocalizationConstants.EnglishLocaleIdentifier);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using UnityEngine.TestTools;
using com.mapcolonies.core.Localization;
using com.mapcolonies.core.Localization.Constants;
using com.mapcolonies.core.Localization.Models;
using Cysharp.Threading.Tasks;

namespace PlayModeTests.Localization
Expand Down Expand Up @@ -42,7 +43,13 @@ public IEnumerator Missing_File_Does_Not_Throw_And_Unknown_Key_Passthrough()

try
{
await svc.InitializeService(LocalizationConstants.EnglishLocaleIdentifier);
TranslationSettings settings = new TranslationSettings()
{
Locale = LocalizationConstants.EnglishLocaleIdentifier,
LocalFilePath = "Translations/Translations.json"
};

await svc.InitializeService(settings);

LocalizationSettings.SelectedLocale =
LocalizationSettings.AvailableLocales.GetLocale(LocalizationConstants.EnglishLocaleIdentifier);
Expand Down Expand Up @@ -89,7 +96,13 @@ public IEnumerator Runtime_Language_Switch_Reflects_In_Translate()

try
{
await svc.InitializeService(LocalizationConstants.EnglishLocaleIdentifier);
TranslationSettings settings = new TranslationSettings()
{
Locale = LocalizationConstants.EnglishLocaleIdentifier,
LocalFilePath = "Translations/Translations.json"
};

await svc.InitializeService(settings);

LocalizationSettings.SelectedLocale =
LocalizationSettings.AvailableLocales.GetLocale(LocalizationConstants.EnglishLocaleIdentifier);
Expand Down
9 changes: 8 additions & 1 deletion Assets/StreamingAssets/DataManagement/app_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,12 @@
"userSettingsFile": "DataManagement/UserSettings/user_settings.json",
"offlineConfigurationFile": "DataManagement/offline_config.json",
"workspacesDirectory": "DataManagement/workspaces",
"remoteConfigurationUrl": "https://example.com/config/getConfig?v=10"
"remoteConfigurationUrl": "https://example.com/config/getConfig?v=10",
"translationSettings": {
"locale": "he-IL",
"localFilePath": "Translations/Translations.json",
"remoteConfigUrl": "",
"showTranslationWarnings": true,
"TargetStringTableName": "Yahalom_HardCoded_Translations"
}
}
145 changes: 72 additions & 73 deletions Assets/StreamingAssets/Translations/Translations.json
Original file line number Diff line number Diff line change
@@ -1,75 +1,74 @@
{
"showTranslationWarnings": true,
"words": [
{
"key": "yahalom.example",
"localizedValues": {
"en": "example",
"he-IL": "דוגמה"
}
},
{
"key": "yahalom.home",
"localizedValues": {
"en": "home",
"he-IL": "בית"
}
},
{
"key": "yahalom.hello",
"localizedValues": {
"en": "hello",
"he-IL": "שלום"
}
},
{
"key": "yahalom.welcome",
"localizedValues": {
"en": "welcome",
"he-IL": "ברוך הבא"
}
},
{
"key": "yahalom.exit",
"localizedValues": {
"en": "exit",
"he-IL": "יציאה"
}
},
{
"key": "yahalom.settings",
"localizedValues": {
"en": "settings",
"he-IL": "הגדרות"
}
},
{
"key": "yahalom.language",
"localizedValues": {
"en": "language",
"he-IL": "שפה"
}
},
{
"key": "yahalom.confirm",
"localizedValues": {
"en": "confirm",
"he-IL": "אישור"
}
},
{
"key": "yahalom.cancel",
"localizedValues": {
"en": "cancel",
"he-IL": "ביטול"
}
},
{
"key": "yahalom.error",
"localizedValues": {
"en": "error",
"he-IL": "שגיאה"
}
}
]
"words": [
{
"key": "yahalom.example",
"localizedValues": {
"en": "example",
"he-IL": "דוגמה"
}
},
{
"key": "yahalom.home",
"localizedValues": {
"en": "home",
"he-IL": "בית"
}
},
{
"key": "yahalom.hello",
"localizedValues": {
"en": "hello",
"he-IL": "שלום"
}
},
{
"key": "yahalom.welcome",
"localizedValues": {
"en": "welcome",
"he-IL": "ברוך הבא"
}
},
{
"key": "yahalom.exit",
"localizedValues": {
"en": "exit",
"he-IL": "יציאה"
}
},
{
"key": "yahalom.settings",
"localizedValues": {
"en": "settings",
"he-IL": "הגדרות"
}
},
{
"key": "yahalom.language",
"localizedValues": {
"en": "language",
"he-IL": "שפה"
}
},
{
"key": "yahalom.confirm",
"localizedValues": {
"en": "confirm",
"he-IL": "אישור"
}
},
{
"key": "yahalom.cancel",
"localizedValues": {
"en": "cancel",
"he-IL": "ביטול"
}
},
{
"key": "yahalom.error",
"localizedValues": {
"en": "error",
"he-IL": "שגיאה"
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using System;
using com.mapcolonies.core.Localization.Constants;

namespace com.mapcolonies.core.Localization.Models
{
[Serializable]
public record TranslationSettings
{
public string Locale
{
get;
set;
} = LocalizationConstants.HebrewLocaleIdentifier;

public string LocalFilePath
{
get;
set;
}

public string RemoteConfigUrl
{
get;
set;
}

public bool ShowTranslationWarnings
{
get;
set;
}

public string TargetStringTableName
{
get;
set;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading