[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: minor fixes
From: |
gnunet |
Subject: |
[taler-anastasis] branch master updated: minor fixes |
Date: |
Tue, 09 Mar 2021 21:13:44 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new 95c37e7 minor fixes
95c37e7 is described below
commit 95c37e79c3a520330708b60088f2953c8ee7512e
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Mar 9 21:13:42 2021 +0100
minor fixes
---
contrib/Makefile.am | 1 +
contrib/redux.ch.json | 4 ++--
contrib/{redux.ch.json => redux.xy.json} | 19 +++----------------
src/reducer/anastasis_api_redux.c | 3 ++-
4 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 4d6d5df..68b1372 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -16,6 +16,7 @@ pkgdata_DATA = \
redux.de.json \
redux.us.json \
redux.xx.json \
+ redux.xy.json \
redux.countries.json \
provider-list.json \
test_resources/test_reducer_stateBFSTATE \
diff --git a/contrib/redux.ch.json b/contrib/redux.ch.json
index 1e0c0ce..40aa259 100644
--- a/contrib/redux.ch.json
+++ b/contrib/redux.ch.json
@@ -6,7 +6,7 @@
"label": "Full name",
"label_i18n":{
"de_DE":"Vollstaendiger Name",
- "de_CH":"Vollstaendiger Name"
+ "de_CH":"Vollstaendiger Name",
"fr": "Nom complet",
"en": "Full name"
},
@@ -18,7 +18,7 @@
"name": "birthdate",
"label": "Birthdate",
"label_i18n":{
- "de_CH":"Geburtsdatum"
+ "de_CH":"Geburtsdatum",
"de_CH":"Geburtsdatum",
"fr":"Date de naissance",
"en":"Birthdate"
diff --git a/contrib/redux.ch.json b/contrib/redux.xy.json
similarity index 55%
copy from contrib/redux.ch.json
copy to contrib/redux.xy.json
index 1e0c0ce..db30eba 100644
--- a/contrib/redux.ch.json
+++ b/contrib/redux.xy.json
@@ -5,8 +5,8 @@
"name": "full_name",
"label": "Full name",
"label_i18n":{
- "de_DE":"Vollstaendiger Name",
- "de_CH":"Vollstaendiger Name"
+ "de_DE": "Vollständiger Name",
+ "de_CH": "Vollständiger Name",
"fr": "Nom complet",
"en": "Full name"
},
@@ -18,7 +18,7 @@
"name": "birthdate",
"label": "Birthdate",
"label_i18n":{
- "de_CH":"Geburtsdatum"
+ "de_DE":"Geburtsdatum",
"de_CH":"Geburtsdatum",
"fr":"Date de naissance",
"en":"Birthdate"
@@ -26,18 +26,5 @@
"widget": "anastasis_gtk_ia_birthdate",
"uuid" : "83d655c7-bdb6-484d-904e-80c1058c8854"
},
- {
- "type": "string",
- "name": "ahv_number",
- "label": "AHV number",
- "label_i18n":{
- "de_DE":"AHV-Nummer",
- "de_CH":"AHV-Nummer"
- },
- "widget": "anastasis_gtk_ia_ahv",
- "uuid" : "1da87570-ba16-4f62-8a7e-cbda92f51591",
- "validation-regex":
"^(756).[0-9]{4}.[0-9]{4}.[0-9]{2}|(756)[0-9]{10}$",
- "validation-logic": "CH_AHV_check"
- }
]
}
diff --git a/src/reducer/anastasis_api_redux.c
b/src/reducer/anastasis_api_redux.c
index 84f9a8b..faecb29 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -1364,7 +1364,8 @@ add_provider (json_t *state,
"'urls' must be strings");
return NULL;
}
- GNUNET_assert (json_object_set_new (tlist,
+ GNUNET_assert (0 ==
+ json_object_set_new (tlist,
url_str,
json_object ()));
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: minor fixes,
gnunet <=