taldir

commit 7573397c1dfebbfe0b72e24eec1afebed4399b63
parent a4021444e62c103b5831f044999ffa0a1cbe3822
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Fri, 23 Oct 2026 17:15:47 +0200

correctly print string regarding deletion or registration

Diffstat:
M
locales/de-DE/taldir.yml
 | 
4
++--
M
locales/en-US/taldir.yml
 | 
4
++--
M
pkg/taldir/taldir.go
 | 
1
+
M
web/templates/validation_landing.html
 | 
8
++++++--

4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/locales/de-DE/taldir.yml b/locales/de-DE/taldir.yml
@@ -19,8 +19,8 @@ deleteIt: "Löschen"
 aliasInvalid: "Alias '%s´ ist ungültig."
 confirmation: "Validierung abschliessen"
 confirm: "Bestätigen"
-confirmReg: "Bestätige, dass \"<i>%s</i>\" mit \"<i>%s</i>\" assoziiert werden soll."
-confirmDelete: "Bestätige, dass das Alias \"<i>%s</i>\" gelöscht werden soll."
+confirmRegistration: "Bestätige, dass \"<i>%s</i>\" mit \"<i>%s</i>\" assoziiert werden soll."
+confirmDeletion: "Bestätige, dass das Alias \"<i>%s</i>\" gelöscht werden soll."
 lookup: "Suchen"
 lookupEmail: "E-Mail-Adresse nachschlagen"
 lookupEmailDescription: "Gib eine E-Mail-Adresse (z.B. `jdoe@example.com`) ein um die dazugehörige Taler Mailbox-Adresse nachzuschlagen. Wenn diese noch nicht verlinkt ist, und das Alias Dir gehört, hast du dann die Chance dieses mit einer Bazahlsystemadresse zu verlinken oder zu modifizieren."
diff --git a/locales/en-US/taldir.yml b/locales/en-US/taldir.yml
@@ -19,8 +19,8 @@ deleteIt: "Unlink it"
 aliasInvalid: "Alias '%s´ is invalid."
 confirmation: "Confirm Validation"
 confirm: "Confirm"
-confirmReg: "Click to confirm that you want to associate \"<i>%s</i>\" with \"<i>%s</i>\"."
-confirmDelete: "Click to confirm that you want to delete the alias \"<i>%s</i>\"."
+confirmRegigration: "Click to confirm that you want to associate \"<i>%s</i>\" with \"<i>%s</i>\"."
+confirmDeletion: "Click to confirm that you want to delete the alias \"<i>%s</i>\"."
 lookup: "Look up"
 lookupEmail: "Look up Email address"
 lookupEmailDescription: "Enter an email address (e.g. `jdoe@example.com`) to look up the associated Taler Mailbox Address. If it is still unlinked and under your control you will be given the option to link it with a Taler Mailbox Address after lookup."
diff --git a/pkg/taldir/taldir.go b/pkg/taldir/taldir.go
@@ -785,6 +785,7 @@ func (t *Taldir) validationPage(w http.ResponseWriter, r *http.Request) {
 			"alias":                         template.URL(alias),
 			"halias":                        template.URL(validation.HAlias),
 			"solution":                      template.URL(expectedSolution),
+			"isDeletion":                    validation.TargetURI == "",
 			"confirmDeletionOrRegistration": template.HTML(confirmDeletionOrRegistration),
 			"productDisclaimerShort":        template.HTML(t.I18n.GetLocale(r).GetMessage("productDisclaimerShort")),
 			"tr":                            t.I18n.GetLocale(r).GetMessage,
diff --git a/web/templates/validation_landing.html b/web/templates/validation_landing.html
@@ -23,7 +23,7 @@
     {{end}}
     <div class="container">
       <div id="sbanner"  class="alert alert-success" role="alert" hidden>
-        <h4 class="alert-heading">Registration successful!</h4>
+        <h4 class="alert-heading">Validation successful!</h4>
         <hr>
         You may now <a href="/">go back to the front page</a>.
       </div>
@@ -49,7 +49,11 @@
           <div id="regcontainer" class="card">
             <div class="card-body">
               <h4 class="card-title">{{ call .tr "confirmation" }}</h4>
-              <p class="card-text">{{ .confirmDeletionOrRegistration }}</p>
+              {{if .target_uri}}
+              <p class="card-text">{{ .confirmRegistration }}</p>
+              {{else}}
+              <p class="card-text">{{ .confirmDeletion }}</p>
+              {{end}}
               <div class="row mt-2">
                 <div class="col-lg-6 offset-lg-3 text-center">
                   <form id="regform">