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

Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0

Browse Source
This commit is contained in:
Maria Sukhova 2021-11-29 16:03:01 +03:00
commit b7676a5fef
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/Tests/Frontend.Translations.Tests/LocalesTest.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
@ -28,10 +29,13 @@ namespace Frontend.Translations.Tests
public List<ModuleFolder> ModuleFolders { get; set; }
public List<KeyValuePair<string, string>> NotTranslatedToasts { get; set; }
public List<LanguageItem> CommonTranslations { get; set; }
public List<ParseJsonError> ParseJsonErrors { get; set; }
[SetUp]
[OneTimeSetUp]
public void Setup()
{
ParseJsonErrors = new List<ParseJsonError>();
var packageJsonPath = Path.Combine(BasePath, @"package.json");
var jsonPackage = JObject.Parse(File.ReadAllText(packageJsonPath));
@ -57,23 +61,32 @@ namespace Frontend.Translations.Tests
foreach (var path in translationFiles)
{
var jsonTranslation = JObject.Parse(File.ReadAllText(path));
try
{
var translationFile = new TranslationFile(path, jsonTranslation.Properties()
.Select(p => new TranslationItem(p.Name, (string)p.Value))
.ToList());
var jsonTranslation = JObject.Parse(File.ReadAllText(path));
TranslationFiles.Add(translationFile);
var translationFile = new TranslationFile(path, jsonTranslation.Properties()
.Select(p => new TranslationItem(p.Name, (string)p.Value))
.ToList());
/* Re-write by order */
TranslationFiles.Add(translationFile);
//var orderedList = jsonTranslation.Properties().OrderBy(t => t.Name);
/* Re-write by order */
//var result = new JObject(orderedList);
//var orderedList = jsonTranslation.Properties().OrderBy(t => t.Name);
//var sortedJsonString = JsonConvert.SerializeObject(result, Formatting.Indented);
//var result = new JObject(orderedList);
//File.WriteAllText(path, sortedJsonString);
//var sortedJsonString = JsonConvert.SerializeObject(result, Formatting.Indented);
//File.WriteAllText(path, sortedJsonString);
}
catch(Exception ex)
{
ParseJsonErrors.Add(new ParseJsonError(path, ex));
Debug.WriteLine($"File path = {path} failed to parse with error: {ex.Message}");
}
}
var javascriptFiles = (from wsPath in Workspaces
@ -203,6 +216,12 @@ namespace Frontend.Translations.Tests
}).ToList();
}
[Test]
public void ParseJsonTest()
{
Assert.AreEqual(0, ParseJsonErrors.Count, string.Join("\r\n", ParseJsonErrors.Select(e => $"File path = '{e.Path}' failed to parse with error: '{e.Exception.Message}'")));
}
[Test]
public void FullDublicatesTest()
{

17
common/Tests/Frontend.Translations.Tests/Models/ParseJsonError.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
namespace Frontend.Translations.Tests
{
public class ParseJsonError
{
public Exception Exception { get; }
public string Path { get; }
public ParseJsonError(string path, Exception ex)
{
Path = path;
Exception = ex;
}
}
}