gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taldir] branch master updated (7374d2b -> 78790a5)


From: gnunet
Subject: [taldir] branch master updated (7374d2b -> 78790a5)
Date: Tue, 21 Jan 2025 22:59:08 +0100

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository taldir.

    from 7374d2b  Payment Address validation with regex
     new d513460  more text
     new 78790a5  fix error handling somewhat, WIP

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 locales/de-DE/taldir.yml         | 2 +-
 locales/en-US/taldir.yml         | 2 +-
 pkg/rest/taldir.go               | 6 +++++-
 web/templates/lookup_result.html | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/locales/de-DE/taldir.yml b/locales/de-DE/taldir.yml
index e7c3a7d..da227ad 100644
--- a/locales/de-DE/taldir.yml
+++ b/locales/de-DE/taldir.yml
@@ -6,7 +6,7 @@ selectAliasToLookupOrLink: "Bitte wähle einen Alias-Typ den Du 
suchen oder mit
 lookupOrRegister: "Suchen oder Verlinken"
 validationInitiated: "Alias-Validierung gestartet"
 pleaseCompleteValidation: "Bitte vervollständige die Alias-Validierung wie in 
der versendeten Nachricht beschrieben damit wir sicher sein können dass Du es 
wirklich bist!"
-notYetLinked: "`%s` ist noch nicht mit einer Bezahlsystemadresse verlinkt"
+notYetLinked: "`%s` ist noch nicht mit einer Bezahlsystemadresse verlinkt. Du 
kannst eine IBAN oder Taler wallet Adresse verlinken:"
 isLinked: "`%s` ist bereits mit einer Bezahlsystemadresse verlinkt"
 paymentSystemAddress: "Bezahlsystemadresse"
 linkIt: "Verlinken"
diff --git a/locales/en-US/taldir.yml b/locales/en-US/taldir.yml
index 8e7479c..70eb739 100644
--- a/locales/en-US/taldir.yml
+++ b/locales/en-US/taldir.yml
@@ -6,7 +6,7 @@ selectAliasToLookupOrLink: "Select a type of alias that you 
want to look up or l
 lookupOrRegister: "Look up or register"
 validationInitiated: "Alias validation initiated"
 pleaseCompleteValidation: "Please complete your alias validation according to 
the instructions sent to you so that we can be sure it is really you!"
-notYetLinked: "`%s` is not yet linked with any Payment System Address"
+notYetLinked: "`%s` is not yet linked with any Payment System Address. You may 
use an IBAN or a Taler wallet address:"
 isLinked: "`%s` is linked with a Payment System Address"
 paymentSystemAddress: "Payment System Address"
 linkIt: "Link it"
diff --git a/pkg/rest/taldir.go b/pkg/rest/taldir.go
index b76022d..85b02de 100644
--- a/pkg/rest/taldir.go
+++ b/pkg/rest/taldir.go
@@ -473,7 +473,11 @@ func (t *Taldir) registerRequest(w http.ResponseWriter, r 
*http.Request) {
 
        err = t.isPMSValid(req.TargetUri)
        if nil != err {
-               http.Redirect(w, r, fmt.Sprintf("/?error=%s", err), 
http.StatusSeeOther)
+               errDetail.Code = gana.GENERIC_JSON_INVALID
+               errDetail.Hint = err.Error()
+               resp, _ := json.Marshal(errDetail)
+               w.WriteHeader(400)
+               w.Write(resp)
                return
        }
 
diff --git a/web/templates/lookup_result.html b/web/templates/lookup_result.html
index 19a06dc..9bb9efe 100644
--- a/web/templates/lookup_result.html
+++ b/web/templates/lookup_result.html
@@ -95,7 +95,7 @@
             var sbanner = document.getElementById('sbanner');
             sbanner.hidden = false;
           } else {
-            window.location.href = "?error=Registration failed";
+            window.location.href = "/?error=Registration failed";
           }
         }
       }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]