Skip to content

Commit beeee99

Browse files
ertanturanertanturan
committed
language indexing system change initiated.
1 parent 387d28e commit beeee99

6 files changed

Lines changed: 173 additions & 53 deletions

File tree

‎Assets/Resources/Data/Localization/AlphabetFontMatrix.meta‎

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

‎Assets/Resources/Data/Localization/AlphabetFontMatrix/Matrix.asset‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d5e7f14dfb5da4e4aac92e798bec7ff3, type: 3}
13+
m_Name: Matrix
14+
m_EditorClassIdentifier:
15+
FontColumns:
16+
- LatinFont: {fileID: 11400000, guid: 3bb4cc3e07c859d4b8bc04d74d99edc0, type: 2}
17+
AlphabetFonts:
18+
- Alphabet: {fileID: 11400000, guid: 01898916dc90bbb4fad920679ff378e3, type: 2}
19+
Font: {fileID: 11400000, guid: 3bb4cc3e07c859d4b8bc04d74d99edc0, type: 2}
20+
- Alphabet: {fileID: 11400000, guid: c6480a0a0af344041b0d39b43411a51a, type: 2}
21+
Font: {fileID: 11400000, guid: 3bb4cc3e07c859d4b8bc04d74d99edc0, type: 2}

‎Assets/Resources/Data/Localization/AlphabetFontMatrix/Matrix.asset.meta‎

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

‎Assets/Scenes/SampleScene.unity‎

Lines changed: 83 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ RectTransform:
525525
m_LocalPosition: {x: 0, y: 0, z: 0}
526526
m_LocalScale: {x: 0, y: 0, z: 0}
527527
m_Children:
528+
- {fileID: 1538577789}
528529
- {fileID: 1144755439}
529530
- {fileID: 922202708}
530531
- {fileID: 1204922353}
@@ -549,7 +550,7 @@ GameObject:
549550
- component: {fileID: 922202710}
550551
- component: {fileID: 922202709}
551552
m_Layer: 0
552-
m_Name: Text - RTLTMP (1)
553+
m_Name: Text - RTLTMP - Insufficient Funds
553554
m_TagString: Untagged
554555
m_Icon: {fileID: 0}
555556
m_NavMeshLayer: 0
@@ -567,12 +568,12 @@ RectTransform:
567568
m_LocalScale: {x: 1, y: 1, z: 1}
568569
m_Children: []
569570
m_Father: {fileID: 698443953}
570-
m_RootOrder: 1
571+
m_RootOrder: 2
571572
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
572573
m_AnchorMin: {x: 0.5, y: 0.5}
573574
m_AnchorMax: {x: 0.5, y: 0.5}
574575
m_AnchoredPosition: {x: 0, y: 0}
575-
m_SizeDelta: {x: 400, y: 100}
576+
m_SizeDelta: {x: 200, y: 50}
576577
m_Pivot: {x: 0.5, y: 0.5}
577578
--- !u!114 &922202709
578579
MonoBehaviour:
@@ -726,7 +727,7 @@ GameObject:
726727
- component: {fileID: 1144755441}
727728
- component: {fileID: 1144755440}
728729
m_Layer: 0
729-
m_Name: Text - RTLTMP
730+
m_Name: Text - RTLTMP - Accept
730731
m_TagString: Untagged
731732
m_Icon: {fileID: 0}
732733
m_NavMeshLayer: 0
@@ -744,7 +745,7 @@ RectTransform:
744745
m_LocalScale: {x: 1, y: 1, z: 1}
745746
m_Children: []
746747
m_Father: {fileID: 698443953}
747-
m_RootOrder: 0
748+
m_RootOrder: 1
748749
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
749750
m_AnchorMin: {x: 0.5, y: 0.5}
750751
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -922,7 +923,7 @@ RectTransform:
922923
m_LocalScale: {x: 1, y: 1, z: 1}
923924
m_Children: []
924925
m_Father: {fileID: 698443953}
925-
m_RootOrder: 2
926+
m_RootOrder: 3
926927
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
927928
m_AnchorMin: {x: 0, y: 1}
928929
m_AnchorMax: {x: 0, y: 1}
@@ -971,18 +972,7 @@ MonoBehaviour:
971972
m_TargetGraphic: {fileID: 1204922355}
972973
m_OnClick:
973974
m_PersistentCalls:
974-
m_Calls:
975-
- m_Target: {fileID: 421621269}
976-
m_MethodName: ToggleLanguage
977-
m_Mode: 1
978-
m_Arguments:
979-
m_ObjectArgument: {fileID: 0}
980-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
981-
m_IntArgument: 0
982-
m_FloatArgument: 0
983-
m_StringArgument:
984-
m_BoolArgument: 0
985-
m_CallState: 2
975+
m_Calls: []
986976
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
987977
Culture=neutral, PublicKeyToken=null
988978
--- !u!114 &1204922355
@@ -1036,6 +1026,80 @@ MonoBehaviour:
10361026
m_EditorClassIdentifier:
10371027
_languageManager: {fileID: 421621269}
10381028
_langSprites:
1039-
- {fileID: 21300000, guid: b5b8fd12b775f2141a6c319e3ae8fd3e, type: 3}
10401029
- {fileID: 21300000, guid: 897687dd29f493b46892de8b45a6044b, type: 3}
10411030
- {fileID: 21300000, guid: fbcc348ae10ca1e40aa86fe8d265deab, type: 3}
1031+
- {fileID: 21300000, guid: b5b8fd12b775f2141a6c319e3ae8fd3e, type: 3}
1032+
--- !u!1 &1538577788
1033+
GameObject:
1034+
m_ObjectHideFlags: 0
1035+
m_CorrespondingSourceObject: {fileID: 0}
1036+
m_PrefabInstance: {fileID: 0}
1037+
m_PrefabAsset: {fileID: 0}
1038+
serializedVersion: 6
1039+
m_Component:
1040+
- component: {fileID: 1538577789}
1041+
- component: {fileID: 1538577791}
1042+
- component: {fileID: 1538577790}
1043+
m_Layer: 0
1044+
m_Name: Image
1045+
m_TagString: Untagged
1046+
m_Icon: {fileID: 0}
1047+
m_NavMeshLayer: 0
1048+
m_StaticEditorFlags: 0
1049+
m_IsActive: 1
1050+
--- !u!224 &1538577789
1051+
RectTransform:
1052+
m_ObjectHideFlags: 0
1053+
m_CorrespondingSourceObject: {fileID: 0}
1054+
m_PrefabInstance: {fileID: 0}
1055+
m_PrefabAsset: {fileID: 0}
1056+
m_GameObject: {fileID: 1538577788}
1057+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1058+
m_LocalPosition: {x: 0, y: 0, z: 0}
1059+
m_LocalScale: {x: 1, y: 1, z: 1}
1060+
m_Children: []
1061+
m_Father: {fileID: 698443953}
1062+
m_RootOrder: 0
1063+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1064+
m_AnchorMin: {x: 0, y: 0}
1065+
m_AnchorMax: {x: 1, y: 1}
1066+
m_AnchoredPosition: {x: 0, y: 0}
1067+
m_SizeDelta: {x: 0, y: 0}
1068+
m_Pivot: {x: 0.5, y: 0.5}
1069+
--- !u!114 &1538577790
1070+
MonoBehaviour:
1071+
m_ObjectHideFlags: 0
1072+
m_CorrespondingSourceObject: {fileID: 0}
1073+
m_PrefabInstance: {fileID: 0}
1074+
m_PrefabAsset: {fileID: 0}
1075+
m_GameObject: {fileID: 1538577788}
1076+
m_Enabled: 1
1077+
m_EditorHideFlags: 0
1078+
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1079+
m_Name:
1080+
m_EditorClassIdentifier:
1081+
m_Material: {fileID: 0}
1082+
m_Color: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 1}
1083+
m_RaycastTarget: 1
1084+
m_OnCullStateChanged:
1085+
m_PersistentCalls:
1086+
m_Calls: []
1087+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1088+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1089+
m_Sprite: {fileID: 0}
1090+
m_Type: 0
1091+
m_PreserveAspect: 0
1092+
m_FillCenter: 1
1093+
m_FillMethod: 4
1094+
m_FillAmount: 1
1095+
m_FillClockwise: 1
1096+
m_FillOrigin: 0
1097+
m_UseSpriteMesh: 0
1098+
--- !u!222 &1538577791
1099+
CanvasRenderer:
1100+
m_ObjectHideFlags: 0
1101+
m_CorrespondingSourceObject: {fileID: 0}
1102+
m_PrefabInstance: {fileID: 0}
1103+
m_PrefabAsset: {fileID: 0}
1104+
m_GameObject: {fileID: 1538577788}
1105+
m_CullTransparentMesh: 0

‎Assets/Scripts/Language/LanguageManager.cs‎

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,40 @@ public class LanguageManager : MonoBehaviour
88

99
public static LanguageManager Instance;
1010

11-
private List<Language> _languages;
11+
private Dictionary<SystemLanguage, Language> _languageDictionary
12+
= new Dictionary<SystemLanguage, Language>();
1213

1314
public AlphabetFontMatrix AlphabetFontMatrix { get; private set; }
1415

1516
public Language SelectedLanguage { get; private set; }
1617

1718
public event Action<Language> OnLanguageChange;
18-
private Language _defaultLanguage;
1919

20-
public int LanguageIndex;
20+
private Language _defaultLanguage;
2121

2222
private void Awake()
2323
{
2424
Instance = this;
25-
_languages = new List<Language>(
26-
Resources.LoadAll<Language>("Data/Localization/Languages"));
27-
AlphabetFontMatrix = Resources.Load<AlphabetFontMatrix>(
28-
"Data/Localization/AlphabetFontMatrix");
29-
25+
Language[] temp = new List<Language>(
26+
Resources.LoadAll<Language>("Data/Localization/Languages")).ToArray();
27+
Debug.Log(temp.Length);
3028

31-
32-
33-
34-
switch (Application.systemLanguage)
29+
foreach (Language lang in temp)
3530
{
36-
case SystemLanguage.Turkish:
37-
_defaultLanguage = _languages[2];
38-
LanguageIndex = 2;
39-
break;
40-
case SystemLanguage.Arabic:
41-
_defaultLanguage = _languages[0];
42-
LanguageIndex = 0;
43-
break;
44-
default:
45-
_defaultLanguage = _languages[1];
46-
LanguageIndex = 1;
47-
break;
31+
_languageDictionary.Add(lang.systemLanguageType,lang);
4832
}
4933

34+
AlphabetFontMatrix = Resources.Load<AlphabetFontMatrix>(
35+
"Data/Localization/AlphabetFontMatrix");
36+
37+
5038
}
5139

52-
public void ToggleLanguage()
40+
public void ChangeLanguage()
5341
{
54-
SelectedLanguage = _languages
55-
[(_languages.IndexOf(SelectedLanguage) + 1) % _languages.Count];
56-
OnLanguageChange.Invoke(SelectedLanguage);
57-
58-
LanguageIndex = ( _languages.IndexOf(SelectedLanguage) + 1 ) % _languages.Count;
42+
//SelectedLanguage = _languages
43+
// [(_languages.IndexOf(SelectedLanguage) + 1) % _languages.Count];
44+
//OnLanguageChange.Invoke(SelectedLanguage);
5945

6046
}
6147

@@ -73,5 +59,35 @@ public static VideoClip GetVideoClip(LanguageDependentVideo videoClip)
7359
{
7460
return videoClip.GetVideoClip(Instance.SelectedLanguage);
7561
}
62+
63+
//public static Language GetCurrentLanguage()
64+
//{
65+
// foreach (var VARIABLE in COLLECTION)
66+
// {
67+
68+
// }
69+
//}
70+
71+
public static void SetCurrentLanguage(Language lang = null , SystemLanguage syslang = SystemLanguage.English)
72+
{
73+
if (lang == null && syslang==null)
74+
{
75+
Debug.Log("No language given to set ... Returning ..");
76+
return;
77+
}
78+
}
79+
80+
//private Language ChooseLanguage(SystemLanguage syslanguage)
81+
//{
82+
// foreach (Language lang in _languages)
83+
// {
84+
// if (lang.systemLanguageType== syslanguage)
85+
// {
86+
// return lang;
87+
// }
88+
// }
89+
90+
// return _defaultLanguage;
91+
//}
7692

7793
}

‎Assets/Scripts/UI/Button Scripts/LanguageButton.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ public override void Awake()
1818
{
1919
base.Awake();
2020
ToggleSprite();
21+
}
2122

22-
23+
private void Start()
24+
{
25+
ToggleSprite();
2326
}
2427

2528
public override void OnButtonClick()
@@ -28,15 +31,15 @@ public override void OnButtonClick()
2831
//_languageManager.ToggleLanguage();
2932

3033
ToggleSprite();
31-
34+
_languageManager.ChangeLanguage();
3235
Debug.Log("Language Change Button Clicked .. ");
3336

3437
}
3538

3639
private void ToggleSprite()
3740
{
38-
_button.image.sprite = _langSprites[_languageManager.LanguageIndex];
41+
//_button.image.sprite = _langSprites[_languageManager.LanguageIndex];
3942
}
4043

41-
44+
4245
}

0 commit comments

Comments
 (0)