mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-20 13:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Edit dictionary should be in JSON format (#6203)

Browse source
This commit is contained in:
Nicolas Dorier 2024-09-09 11:25:36 +09:00 • committed by GitHub
parent 841f41da2f
commit 7de05700e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BTCPayServer.Tests/LanguageServiceTests.cs
View file

@ -50,10 +50,8 @@ namespace BTCPayServer.Tests
tester.Driver.FindElement(By.Name("Name")).SendKeys("English (Custom)");
tester.ClickPagePrimary();
var translations = tester.Driver.FindElement(By.Name("Translations"));
var text = translations.Text;
text = text.Replace("Password => Password", "Password => Mot de passe");
translations.Clear();
translations.SendKeys("Password => Mot de passe");
translations.SendKeys("{ \"Password\": \"Mot de passe\" }");
tester.ClickPagePrimary();
// Check English (Custom) can be selected
@ -64,7 +62,7 @@ namespace BTCPayServer.Tests
// Check if we can remove English (Custom)
tester.LogIn();
tester.GoToServer(Views.Server.ServerNavPages.Translations);
text = tester.Driver.PageSource;
var text = tester.Driver.PageSource;
Assert.Contains("Select-Cypherpunk", text);
Assert.DoesNotContain("Select-English (Custom)", text);
// Cypherpunk is loaded from file, can't edit

4
BTCPayServer/Controllers/UIServerController.Translations.cs
View file

@ -88,11 +88,11 @@ namespace BTCPayServer.Controllers
{
prop.Value = "OK";
}
viewModel.Translations = Translations.CreateFromJson(jobj.ToString()).ToTextFormat();
viewModel.Translations = Translations.CreateFromJson(jobj.ToString()).ToJsonFormat();
}
if (!Translations.TryCreateFromText(viewModel.Translations, out var translations))
if (!Translations.TryCreateFromJson(viewModel.Translations, out var translations))
{
ModelState.AddModelError(nameof(viewModel.Translations), "Syntax error");
return View(viewModel);

2
BTCPayServer/Hosting/LoadTranslationsStartupTask.cs
View file

@ -65,7 +65,7 @@ namespace BTCPayServer.Hosting
}
var savedHash = dictionary.Metadata.ToObject<DictionaryFileMetadata>().Hash;
var translations = Translations.CreateFromText(File.ReadAllText(file));
var currentHash = new uint256(SHA256.HashData(Encoding.UTF8.GetBytes(translations.ToTextFormat())));
var currentHash = new uint256(SHA256.HashData(Encoding.UTF8.GetBytes(translations.ToJsonFormat())));
if (savedHash != currentHash)
{

2
BTCPayServer/Models/ServerViewModels/EditDictionaryViewModel.cs
View file

@ -10,7 +10,7 @@ public class EditDictionaryViewModel
internal EditDictionaryViewModel SetTranslations(Translations translations)
{
Translations = translations.ToTextFormat();
Translations = translations.ToJsonFormat();
Lines = translations.Records.Count;
return this;
}

8
BTCPayServer/Services/Translations.cs
View file

@ -24,12 +24,12 @@ namespace BTCPayServer.Services
public record Added(string Key, string Value) : Diff(Key);
public record Modified(string Key, string NewValue, string OldValue) : Diff(Key);
}
public static bool TryCreateFromText(string text, [MaybeNullWhen(false)] out Translations translations)
public static bool TryCreateFromJson(string text, [MaybeNullWhen(false)] out Translations translations)
{
translations = null;
try
{
translations = CreateFromText(text);
translations = CreateFromJson(text);
return true;
}
catch
@ -144,9 +144,5 @@ namespace BTCPayServer.Services
}
return obj.ToString(Newtonsoft.Json.Formatting.Indented);
}
public string ToTextFormat()
{
return string.Join('\n', Records.OrderBy(r => r.Key).Select(r => $"{r.Key} => {r.Value}").ToArray());
}
}
}

2
BTCPayServer/Views/UIServer/EditDictionary.cshtml
View file

@ -27,7 +27,7 @@
<div class="flex-fill">
<p>
Translations are formatted as <b>KEY => TRANSLATION</b>; for example, <b>Welcome => Bienvenue</b> translates <b>Welcome</b> to <b>Bienvenue</b>.
Translations are formatted as JSON <b>{ "Key": "Translation", "Key2": "Translation2" }</b>; for example, <b>{ "Welcome": "Bienvenue" }</b> translates <b>Welcome</b> to <b>Bienvenue</b>.
</p>
<p class="mb-0">
To use the translation from this dictionary's fallback, you can: