IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASC.Resource.Manager: support json

Browse Source
This commit is contained in:
pavelbannov 2019-07-02 12:06:00 +03:00
parent 299cfacb19
commit 54317d1af8
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/ASC.Resource.Manager/JsonManager.cs
View File

@ -118,16 +118,21 @@ namespace ASC.Resource.Manager
foreach (var fileWords in words) foreach (var fileWords in words)
{ {
var wordsDictionary = new Dictionary<string, string>(); var wordsDictionary = new Dictionary<string, object>();
foreach (var word in fileWords.OrderBy(x => x.Title).Where(word => !wordsDictionary.ContainsKey(word.Title))) foreach (var word in fileWords.OrderBy(x => x.Title).Where(word => !wordsDictionary.ContainsKey(word.Title)))
{ {
if (string.IsNullOrEmpty(word.ValueTo) && !withDefaultValue) continue; if (string.IsNullOrEmpty(word.ValueTo) && !withDefaultValue) continue;
wordsDictionary[word.Title] = word.ValueTo ?? word.ValueFrom; var newVal = word.ValueTo ?? word.ValueFrom;
if (!string.IsNullOrEmpty(wordsDictionary[word.Title]))
if (!string.IsNullOrEmpty(newVal))
{ {
wordsDictionary[word.Title] = wordsDictionary[word.Title].TrimEnd('\n').TrimEnd('\r'); newVal = newVal.TrimEnd('\n').TrimEnd('\r');
} }
var newKey = GetKey(word.Title, newVal);
wordsDictionary.Add(newKey.Keys.First(), newKey.Values.First());
} }
var firstWord = fileWords.FirstOrDefault(); var firstWord = fileWords.FirstOrDefault();
@ -169,7 +174,7 @@ namespace ASC.Resource.Manager
var child = data.CreateElement("string"); var child = data.CreateElement("string");
child.Attributes.Append(stringAttr); child.Attributes.Append(stringAttr);
child.InnerText = ind.Value; child.InnerText = ind.Value.ToString();
resources.AppendChild(child); resources.AppendChild(child);
} }
@ -205,5 +210,13 @@ namespace ASC.Resource.Manager
return culture; return culture;
} }
private static Dictionary<string, object> GetKey(string title, string val)
{
var splited = title.Split('.');
if (splited.Length == 1) return new Dictionary<string, object>() { { title, val } };
return new Dictionary<string, object>() { { splited[0], GetKey(title.Substring(title.IndexOf('.') + 1), val) } };
}
} }
} }