From 89290c03f910b471137c2638be490d407469a565 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 28 May 2024 18:01:32 +0200 Subject: [PATCH] =?UTF-8?q?Mehrsprachige=20Unterst=C3=BCtzung=20f=C3=BCr?= =?UTF-8?q?=20ShowEnvelope-Seite=20hinzugef=C3=BCgt;=20Aktualisierung=20de?= =?UTF-8?q?r=20resx-Dateien=20f=C3=BCr=20Deutsch=20und=20Englisch=20(US).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Resource.de-DE.resx | 17 ++++++++++++++++- .../Resources/Resource.en-US.resx | 16 ++++++++++++++-- .../Controllers/HomeController.cs | 4 +++- .../Views/Home/EnvelopeLocked.cshtml | 6 +++--- .../Views/Home/ShowEnvelope.cshtml | 19 +++++++++++++------ .../Views/Shared/_Layout.cshtml | 2 +- EnvelopeGenerator.Web/WebKey.cs | 9 ++++++++- EnvelopeGenerator.Web/wwwroot/js/app.js | 2 +- 8 files changed, 59 insertions(+), 16 deletions(-) diff --git a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx index 9e8c65a2..e4762ba4 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx @@ -117,12 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Abschließen + Deutch + + Dokument geschützt + Englisch + + Sie müssen {0} Vorgang unterzeichen. Bitte prüfen Sie die Seite {1}. + + + Erstellt am {0} von {1}. Sie können den Absender über <a href="mailto:{2}?subject={3}&body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A">{6}</a> kontaktieren. + Öffnen @@ -141,10 +153,13 @@ Dokument erfordert einen Zugriffscode + + Dokument unterschreiben + Ein unerwarteter Fehler ist aufgetreten. - Dokument unterschreiben + Ungültiger Zugangscode. \ 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 d1280969..cca662c4 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx @@ -117,12 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Complete + German + + Document protected + English + + You have to sign {0} process. Please check page {1}. + + + Created on {0} by {1}. You can contact the sender via <a href="mailto:{2}?subject={3}&body=Dear%20{4}%20{5},%0A%0A%0A">{6}</a>. + Open @@ -141,8 +153,8 @@ Document requires an access code - - Dokument unterschreiben + + Sign document An unexpected error has occurred. diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 584b80d3..c8827dd0 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Localization; using System.Text.Encodings.Web; using EnvelopeGenerator.Web.Models; using EnvelopeGenerator.Application.Resources; +using System.Text.RegularExpressions; namespace EnvelopeGenerator.Web.Controllers { @@ -92,7 +93,7 @@ namespace EnvelopeGenerator.Web.Controllers else if (UserLanguage is not null && culture is not null) return Redirect($"Locked"); - ViewData["UserLanguage"] = UserLanguage ?? culture; + ViewData["UserCulture"] = _cultures[UserLanguage ?? culture]; return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync( Success: isExisting => isExisting ? View().WithData("EnvelopeKey", envelopeReceiverId) : this.ViewEnvelopeNotFound(), @@ -175,6 +176,7 @@ namespace EnvelopeGenerator.Web.Controllers //add PSPDFKit licence key ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"]; + ViewData["UserCulture"] = _cultures[UserLanguage]; return View("ShowEnvelope", er); }, diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml index 392e1533..43c8315f 100644 --- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml @@ -2,8 +2,8 @@ var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string; } @{ - ViewData["Title"] = "Dokument geschützt"; - var userLanguage = ViewData["UserLanguage"] as string; + ViewData["Title"] = _localizer[WebKey.DocProtected]; + var userCulture = ViewData["UserCulture"] as Culture; }
@@ -39,7 +39,7 @@
    @foreach(var culture in _cultures) diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml index af5bb8b4..ae8fede4 100644 --- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml @@ -5,10 +5,11 @@ @using EnvelopeGenerator.Application.DTOs; @model EnvelopeReceiverDto; @{ - ViewData["Title"] = "Dokument unterschreiben"; + ViewData["Title"] = _localizer[WebKey.SignDoc]; } @{ + var userCulture = ViewData["UserCulture"] as Culture; var envelope = Model.Envelope; var document = Model.Envelope?.Documents?.FirstOrDefault(); var sender = Model.Envelope?.User; @@ -35,8 +36,15 @@
    @($"{envelope?.Title.TrySanitize(_sanitizer)}")
    -

    @($"Sie müssen {(pages.Count())} Vorgang unterzeichen. Bitte prüfen Sie die Seite {stPageIndexes.TrySanitize(_sanitizer)}.")

    -

    Erstellt am @envelope?.AddedWhen von @sender?.Prename.TrySanitize(_sanitizer) @sender?.Name.TrySanitize(_sanitizer). Sie können den Absender über @sender?.Email.TryEncode(_encoder) kontaktieren.

    +

    @(string.Format(_localizer[WebKey.EnvelopeInfo1], pages.Count(), stPageIndexes.TrySanitize(_sanitizer)))

    +

    @Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo2], + envelope?.AddedWhen.ToString(userCulture?.Info?.DateTimeFormat), + $"{sender?.Prename} {sender?.Name}".TrySanitize(_sanitizer), + sender?.Email.TryEncode(_encoder), + envelope?.Title.TryEncode(_encoder), + sender?.Prename.TryEncode(_encoder), + sender?.Name.TryEncode(_encoder), + sender?.Email.TryEncode(_encoder)))

@@ -49,7 +57,7 @@ - Abschließen + @_localizer[WebKey.Complete]