Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed language file loading to Android resource format

Browse Source
This commit is contained in:
Stephan Sundermann committed 2013-01-06 13:35:11 +01:00
1 parent 662d953dce
commit 8ea3b63499
2 files changed
+33 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CLanguage.cs
+6 -6
View File
@@ -266,7 +266,7 @@ namespace Vocaluxe.Base
if (loaded) if (loaded)
{ {
string value = string.Empty; string value = string.Empty;
if (loaded == CHelper.GetValueFromXML("//root/Info/Name", navigator, ref value, value)) if (loaded == CHelper.GetValueFromXML("//resources/string[@name='language']", navigator, ref value, value))
{ {
int nr = GetLanguageNr(value); int nr = GetLanguageNr(value);
@@ -277,10 +277,10 @@ namespace Vocaluxe.Base
lang.PartyModeID = PartyModeID; lang.PartyModeID = PartyModeID;
lang.Texts = new Hashtable(); lang.Texts = new Hashtable();
List<string> texts = CHelper.GetValuesFromXML("Texts", navigator); List<string> texts = CHelper.GetAttributesFromXML("resources", navigator, "name");
for (int i = 0; i < texts.Count; i++) for (int i = 0; i < texts.Count; i++)
{ {
if (CHelper.GetValueFromXML("//root/Texts/" + texts[i], navigator, ref value, value)) if (CHelper.GetValueFromXML("//resources/string[@name='" + texts[i] + "']", navigator, ref value, value))
{ {
try try
{ {
@@ -331,7 +331,7 @@ namespace Vocaluxe.Base
if (loaded) if (loaded)
{ {
string value = string.Empty; string value = string.Empty;
if (CHelper.GetValueFromXML("//root/Info/Name", navigator, ref value, value)) if (CHelper.GetValueFromXML("//resources/string[@name='language']", navigator, ref value, value))
{ {
lang.Name = value; lang.Name = value;
@@ -341,10 +341,10 @@ namespace Vocaluxe.Base
lang.Texts = new Hashtable(); lang.Texts = new Hashtable();
lang.PartyModeTexts = new List<SPartyLanguage>(); lang.PartyModeTexts = new List<SPartyLanguage>();
List<string> texts = CHelper.GetValuesFromXML("Texts", navigator); List<string> texts = CHelper.GetAttributesFromXML("resources", navigator, "name");
for (int i = 0; i < texts.Count; i++) for (int i = 0; i < texts.Count; i++)
{ {
if (CHelper.GetValueFromXML("//root/Texts/" + texts[i], navigator, ref value, value)) if (CHelper.GetValueFromXML("//resources/string[@name='" + texts[i] + "']", navigator, ref value, value))
{ {
try try
{ {
VocaluxeLib/Menu/CHelper.cs
+27
View File
@@ -232,6 +232,33 @@ namespace Vocaluxe.Menu
return values; return values;
} }
public static List<string> GetAttributesFromXML(string Cast, XPathNavigator Navigator, string attribute)
{
List<string> values = new List<string>();
try
{
Navigator.MoveToRoot();
Navigator.MoveToFirstChild();
while (Navigator.Name != Cast)
Navigator.MoveToNext();
Navigator.MoveToFirstChild();
values.Add(Navigator.LocalName);
while (Navigator.MoveToNext())
values.Add(Navigator.GetAttribute(attribute, ""));
}
catch (Exception)
{
}
return values;
}
public static bool GetInnerValuesFromXML(string Cast, XPathNavigator Navigator, ref List<string> Values) public static bool GetInnerValuesFromXML(string Cast, XPathNavigator Navigator, ref List<string> Values)
{ {
try try