From 3b27260b1436e2d49c5386187430707661ec0566 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 28 May 2024 16:19:01 +0200 Subject: [PATCH] =?UTF-8?q?CultureInfo=20zur=20Culture=20hinzugef=C3=BCgt?= =?UTF-8?q?=20und=20die=20Benutzeroberfl=C3=A4che=20aktualisiert,=20um=20d?= =?UTF-8?q?en=20NativeName=20f=C3=BCr=20eine=20verbesserte=20Lokalisierung?= =?UTF-8?q?=20anzuzeigen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Resource.de-DE.resx | 2 +- .../Resources/Resource.en-US.resx | 3 +++ .../Controllers/Test/TestLocalizerController.cs | 11 +++++++++-- EnvelopeGenerator.Web/Models/Culture.cs | 14 ++++++++++++-- EnvelopeGenerator.Web/Models/Cultures.cs | 6 ++---- .../Views/Home/EnvelopeLocked.cshtml | 10 ++++++---- EnvelopeGenerator.Web/appsettings.json | 2 +- EnvelopeGenerator.Web/wwwroot/js/app.js | 3 ++- EnvelopeGenerator.Web/wwwroot/js/ui.js | 3 ++- 9 files changed, 38 insertions(+), 16 deletions(-) diff --git a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx index ece65ad1..9e8c65a2 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx @@ -145,6 +145,6 @@ Ein unerwarteter Fehler ist aufgetreten. - Ungültiger Zugangscode. + Dokument unterschreiben \ No newline at end of file diff --git a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx index 87e3bae3..d1280969 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx @@ -141,6 +141,9 @@ Document requires an access code + + Dokument unterschreiben + An unexpected error has occurred. diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs index 31c641a6..4c50d6e9 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs @@ -1,4 +1,5 @@ using AngleSharp.Common; +using DigitalData.Core.API; using EnvelopeGenerator.Application.Resources; using EnvelopeGenerator.Web.Models; using Microsoft.AspNetCore.Mvc; @@ -23,9 +24,15 @@ namespace EnvelopeGenerator.Web.Controllers.Test public IActionResult Localize([FromQuery] string key = "de_DE") => Ok(_localizer[key]); [HttpGet("fi-class")] - public IActionResult GetFIClass(string? lang = null) => lang is null ? Ok(_cultures.FIClasses) : Ok(_cultures.FIClassOf(lang)); + public IActionResult GetFIClass(string? lang = null) => lang is null ? Ok(_cultures.FIClasses) : Ok(_cultures[lang]?.FIClass); [HttpGet("culture")] - public IActionResult GetCultures(string? lang = null) => lang is null ? Ok(_cultures) : Ok(_cultures.CultureOf(lang)); + public IActionResult GetCultures(string? lang = null) => lang is null ? Ok(_cultures) : Ok(_cultures[lang]); + + [HttpGet("to-culture-info")] + public IActionResult ToCultureInfo(string locale) => Ok(locale.ToCultureInfo()); + + [HttpGet("two-letter-iso-language-name")] + public IActionResult TwoLetterISOLanguageName(string locale) => Ok(locale.TwoLetterISOLanguageName()); } } diff --git a/EnvelopeGenerator.Web/Models/Culture.cs b/EnvelopeGenerator.Web/Models/Culture.cs index 8ffbdee4..4838838e 100644 --- a/EnvelopeGenerator.Web/Models/Culture.cs +++ b/EnvelopeGenerator.Web/Models/Culture.cs @@ -1,8 +1,18 @@ -namespace EnvelopeGenerator.Web.Models +using System.Globalization; + +namespace EnvelopeGenerator.Web.Models { public class Culture { - public string Language { get; init; } = string.Empty; + private string _language = string.Empty; + public string Language { get => _language; + init { + _language = value; + Info = new(value); + } + } public string FIClass { get; init; } = string.Empty; + + public CultureInfo? Info { get; init; } } } diff --git a/EnvelopeGenerator.Web/Models/Cultures.cs b/EnvelopeGenerator.Web/Models/Cultures.cs index 680efab0..826fcef6 100644 --- a/EnvelopeGenerator.Web/Models/Cultures.cs +++ b/EnvelopeGenerator.Web/Models/Cultures.cs @@ -6,10 +6,8 @@ public IEnumerable FIClasses => this.Select(c => c.FIClass); - public Culture? CultureOf(string? language) => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault(); - public Culture Default => this.First(); - - public string FIClassOf(string? language) => language is null ? string.Empty : CultureOf(language)?.FIClass ?? string.Empty; + + public Culture? this[string? language] => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault(); } } \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml index 64884978..392e1533 100644 --- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml @@ -39,14 +39,16 @@
    - @foreach(var lang in _cultures.Languages) + @foreach(var culture in _cultures) { + var lang = culture.Language; + var info = culture.Info;
  • - - @_localizer[lang].Value.TrySanitize(_sanitizer) + + @info?.Parent.NativeName
    • } diff --git a/EnvelopeGenerator.Web/appsettings.json b/EnvelopeGenerator.Web/appsettings.json index bbe280a0..eecaa27b 100644 --- a/EnvelopeGenerator.Web/appsettings.json +++ b/EnvelopeGenerator.Web/appsettings.json @@ -16,7 +16,7 @@ }, "AdminPassword": "dd", "PSPDFKitLicenseKey_SignFlow": "y8VgCpBgUfNlpKJZC-GwjpPs-S-KFBHv4RywfHbqpBAbO0XxRuWDaMGZtIaMrXBDlndlJLk---Ve93xjI_ZR4sbFymf4Ot97yTYUMeDdL2LYXhspkEnSAtkXf9zqepNL1v_0DMibjpqXFQMkVB1y3D5xdnOg-iJuCCZEMhZ780qg04_H_nmx63uSgxjN0GJxC8YvsbnRcUZ2l_idImMvWL0HMqB5B7oEpNenasA0RK0uapFRTa7NIQok0phpTHZYKB4qvj7od2yxlytGB7qBl4-lwT70DSQ9mrLkCWbuzZ9cV9D8fDzdFXr6WoZdOYpkrUadRbsy2bhPq_ukxszDWN4JGhebo0XKUK_YfgvSlS7lFOxHNblHeC9B7gZ8T-VuQ_z1QA2JYRf1dmhSuclnW00diShIg-N0I79PWGsQE4j40XtVpyWcN9uT9hMuiRpL0LzHV4YgsgBrgKgs_moqL7f0L4-MwaS25Dx4Wcz4ttKaerLavwMM4CJHI3DNqTC5UUEG6EViFxBQtrmuAS7kiw2nWjvXO7kUA24NARtsRCphjWE4l6wSMdh7kpqhfbV7_hdb5xXYGALNPkv8En6zPpFIew8DDcOH9dgxfKMI34LLhkEWqovZW_7fXNJTEIHVpR0DSPbZrmyEwkECnbDcNzjyFk2M1fzstJj_dSotyZvS57XJK2DgojbRgXL9pncs", - "UseCSPInDev": true, + "UseCSPInDev": false, "Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value. "default-src 'self'", "script-src 'self' 'nonce-{0}' 'unsafe-inline' 'unsafe-eval' blob: data:", diff --git a/EnvelopeGenerator.Web/wwwroot/js/app.js b/EnvelopeGenerator.Web/wwwroot/js/app.js index ed83d568..1f5dac16 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/app.js +++ b/EnvelopeGenerator.Web/wwwroot/js/app.js @@ -10,7 +10,7 @@ const ActionType = { } class App { - constructor(envelopeKey, envelopeReceiver, documentBytes, licenseKey, container) { + constructor(envelopeKey, envelopeReceiver, documentBytes, licenseKey, locale, container) { this.container = container ?? `#${this.constructor.name.toLowerCase()}`; this.envelopeKey = envelopeKey @@ -25,6 +25,7 @@ class App { this.envelopeReceiver = envelopeReceiver; this.documentBytes = documentBytes; this.licenseKey = licenseKey; + this.locale = locale; } // This function will be called from the ShowEnvelope.razor page diff --git a/EnvelopeGenerator.Web/wwwroot/js/ui.js b/EnvelopeGenerator.Web/wwwroot/js/ui.js index 4f5af53b..bf5ce19e 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/ui.js +++ b/EnvelopeGenerator.Web/wwwroot/js/ui.js @@ -14,8 +14,9 @@ // Load the PSPDFKit UI by setting a target element as the container to render in // and a arraybuffer which represents the document that should be displayed. - loadPSPDFKit(arrayBuffer, container, licenseKey) { + loadPSPDFKit(arrayBuffer, container, licenseKey, locale) { return PSPDFKit.load({ + locale: locale, licenseKey: licenseKey, styleSheets: ['/css/site.css'], container: container,