提交
This commit is contained in:
@@ -97,7 +97,7 @@ namespace Rewired.Localization {
|
||||
_dictionary.Clear();
|
||||
if (_localizedStringsFile != null) {
|
||||
try {
|
||||
_dictionary = Utils.Libraries.TinyJson.JsonParser.FromJson<Dictionary<string, string>>(_localizedStringsFile.text);
|
||||
_dictionary = Rewired.Utils.Libraries.TinyJson.JsonParser.FromJson<Dictionary<string, string>>(_localizedStringsFile.text);
|
||||
} catch (Exception ex) {
|
||||
UnityEngine.Debug.LogError(ex);
|
||||
}
|
||||
@@ -122,7 +122,7 @@ namespace Rewired.Localization {
|
||||
#if UNITY_EDITOR
|
||||
private Rewired.Utils.Classes.Data.InspectorValue<UnityEngine.TextAsset>_inspector_localizedStringsFile = new Rewired.Utils.Classes.Data.InspectorValue<UnityEngine.TextAsset>();
|
||||
|
||||
protected override void CheckInspectorValues(ref Action actions) {
|
||||
protected override void CheckInspectorValues(ref System.Action actions) {
|
||||
base.CheckInspectorValues(ref actions);
|
||||
if(_inspector_localizedStringsFile.SetIfChanged(_localizedStringsFile)) {
|
||||
actions += () => localizedStringsFile = _localizedStringsFile;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
namespace Rewired.Localization {
|
||||
using Rewired;
|
||||
using Interfaces;
|
||||
using Rewired.Interfaces;
|
||||
|
||||
/// <summary>
|
||||
/// Base class for management of localized strings.
|
||||
@@ -93,7 +93,7 @@ namespace Rewired.Localization {
|
||||
ReInput.InitializedEvent -= TrySetLocalizedStringProvider;
|
||||
ReInput.InitializedEvent += TrySetLocalizedStringProvider;
|
||||
if (!ReInput.isReady) return;
|
||||
if (!Utils.UnityTools.IsNullOrDestroyed(ReInput.localization.localizedStringProvider)) {
|
||||
if (!Rewired.Utils.UnityTools.IsNullOrDestroyed(ReInput.localization.localizedStringProvider)) {
|
||||
UnityEngine.Debug.LogWarning("A localized string provider is already set. Only one localized string provider can exist at a time.");
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user