summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-08-19 18:19:00 +0200
committerChristian Grothoff <christian@grothoff.org>2020-08-19 18:19:00 +0200
commit46dde9368f75013b2383c24d4c8a11763ac8e31e (patch)
tree7971e4bdd18a951521e4317b1619ecbabbc15a8c
parenta84c61dd82b17bc42593e5fd358cd0917d195f4f (diff)
downloadexchange-46dde9368f75013b2383c24d4c8a11763ac8e31e.tar.gz
exchange-46dde9368f75013b2383c24d4c8a11763ac8e31e.tar.bz2
exchange-46dde9368f75013b2383c24d4c8a11763ac8e31e.zip
implement i18n lookup logic for #6458
-rw-r--r--src/include/taler_json_lib.h31
-rw-r--r--src/include/taler_mhd_lib.h16
-rw-r--r--src/include/taler_util.h16
-rw-r--r--src/json/Makefile.am1
-rw-r--r--src/json/i18n.c95
-rw-r--r--src/mhd/mhd_legal.c54
-rw-r--r--src/util/Makefile.am1
-rw-r--r--src/util/lang.c71
8 files changed, 219 insertions, 66 deletions
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index 171b3d00..a1e4d883 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -294,6 +294,37 @@ TALER_JSON_exchange_wire_signature_make (
/**
+ * Extract a string from @a object under the field @a field, but respecting
+ * the Taler i18n rules and the language preferences expressed in @a
+ * language_pattern.
+ *
+ * Basically, the @a object may optionally contain a sub-object
+ * "${field}_i18n" with a map from IETF BCP 47 language tags to a localized
+ * version of the string. If this map exists and contains an entry that
+ * matches the @a language pattern, that object (usually a string) is
+ * returned. If the @a language_pattern does not match any entry, or if the
+ * i18n sub-object does not exist, we simply return @a field of @a object
+ * (also usually a string).
+ *
+ * If @a object does not have a member @a field we return NULL (error).
+ *
+ * @param object the object to extract internationalized
+ * content from
+ * @param language_pattern a language preferences string
+ * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1", following
+ * https://tools.ietf.org/html/rfc7231#section-5.3.1
+ * @param field name of the field to extract
+ * @return NULL on error, otherwise the member from
+ * @a object. Note that the reference counter is
+ * NOT incremented.
+ */
+const json_t *
+TALER_JSON_extract_i18n (const json_t *object,
+ const char *language_pattern,
+ const char *field);
+
+
+/**
* Obtain the wire method associated with the given
* wire account details. @a wire_s must contain a payto://-URL
* under 'url'.
diff --git a/src/include/taler_mhd_lib.h b/src/include/taler_mhd_lib.h
index 7d281662..4b34f41d 100644
--- a/src/include/taler_mhd_lib.h
+++ b/src/include/taler_mhd_lib.h
@@ -97,22 +97,6 @@ TALER_MHD_can_compress (struct MHD_Connection *connection);
/**
- * Check if @a lang matches the @a language_pattern, and if so with
- * which preference.
- * See also: https://tools.ietf.org/html/rfc7231#section-5.3.1
- *
- * @param language_pattern a language preferences string
- * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1"
- * @param lang the 2-digit language to match
- * @return q-weight given for @a lang in @a language_pattern, 1.0 if no weights are given;
- * 0 if @a lang is not in @a language_pattern
- */
-double
-TALER_MHD_language_matches (const char *language_pattern,
- const char *lang);
-
-
-/**
* Send JSON object as response.
*
* @param connection the MHD connection
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 1d1c01ea..2a64fe8e 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -185,6 +185,22 @@ TALER_urlencode (const char *s);
/**
+ * Check if @a lang matches the @a language_pattern, and if so with
+ * which preference.
+ * See also: https://tools.ietf.org/html/rfc7231#section-5.3.1
+ *
+ * @param language_pattern a language preferences string
+ * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1"
+ * @param lang the 2-digit language to match
+ * @return q-weight given for @a lang in @a language_pattern, 1.0 if no weights are given;
+ * 0 if @a lang is not in @a language_pattern
+ */
+double
+TALER_language_matches (const char *language_pattern,
+ const char *lang);
+
+
+/**
* Find out if an MHD connection is using HTTPS (either
* directly or via proxy).
*
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 2910d077..d7c569d6 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -10,6 +10,7 @@ lib_LTLIBRARIES = \
libtalerjson.la
libtalerjson_la_SOURCES = \
+ i18n.c \
json.c \
json_helper.c \
json_wire.c
diff --git a/src/json/i18n.c b/src/json/i18n.c
new file mode 100644
index 00000000..b92d63ed
--- /dev/null
+++ b/src/json/i18n.c
@@ -0,0 +1,95 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2020 Taler Systems SA
+
+ TALER is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file json/i18n.c
+ * @brief helper functions for i18n in JSON processing
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_util.h"
+#include "taler_json_lib.h"
+
+
+/**
+ * Extract a string from @a object under the field @a field, but respecting
+ * the Taler i18n rules and the language preferences expressed in @a
+ * language_pattern.
+ *
+ * Basically, the @a object may optionally contain a sub-object
+ * "${field}_i18n" with a map from IETF BCP 47 language tags to a localized
+ * version of the string. If this map exists and contains an entry that
+ * matches the @a language pattern, that object (usually a string) is
+ * returned. If the @a language_pattern does not match any entry, or if the
+ * i18n sub-object does not exist, we simply return @a field of @a object
+ * (also usually a string).
+ *
+ * If @a object does not have a member @a field we return NULL (error).
+ *
+ * @param object the object to extract internationalized
+ * content from
+ * @param language_pattern a language preferences string
+ * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1", following
+ * https://tools.ietf.org/html/rfc7231#section-5.3.1
+ * @param field name of the field to extract
+ * @return NULL on error, otherwise the member from
+ * @a object. Note that the reference counter is
+ * NOT incremented.
+ */
+const json_t *
+TALER_JSON_extract_i18n (const json_t *object,
+ const char *language_pattern,
+ const char *field)
+{
+ const json_t *ret;
+ json_t *i18n;
+ double quality = -1;
+
+ ret = json_object_get (object,
+ field);
+ if (NULL == ret)
+ return NULL; /* field MUST exist in object */
+ {
+ char *name;
+
+ GNUNET_asprintf (&name,
+ "%s_i18n",
+ field);
+ i18n = json_object_get (object,
+ name);
+ GNUNET_free (name);
+ }
+ if (NULL == i18n)
+ return ret;
+ {
+ const char *key;
+ json_t *value;
+
+ json_object_foreach (i18n, key, value) {
+ double q = TALER_language_matches (language_pattern,
+ key);
+ if (q > quality)
+ {
+ quality = q;
+ ret = value;
+ }
+ }
+ }
+ return ret;
+}
+
+
+/* end of i18n.c */
diff --git a/src/mhd/mhd_legal.c b/src/mhd/mhd_legal.c
index 7de189cc..0f2433c2 100644
--- a/src/mhd/mhd_legal.c
+++ b/src/mhd/mhd_legal.c
@@ -155,52 +155,6 @@ xmime_matches (const char *accept_pattern,
/**
- * Check if @a lang matches the @a language_pattern, and if so with
- * which preference.
- * See also: https://tools.ietf.org/html/rfc7231#section-5.3.1
- *
- * @param language_pattern a language preferences string
- * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1"
- * @param lang the 2-digit language to match
- * @return q-weight given for @a lang in @a language_pattern, 1.0 if no weights are given;
- * 0 if @a lang is not in @a language_pattern
- */
-double
-TALER_MHD_language_matches (const char *language_pattern,
- const char *lang)
-{
- char *p = GNUNET_strdup (language_pattern);
- char *sptr;
- double r = 0.0;
-
- for (char *tok = strtok_r (p, ",", &sptr);
- NULL != tok;
- tok = strtok_r (NULL, ",", &sptr))
- {
- char *sptr2;
- char *lp = strtok_r (tok, ";", &sptr2);
- char *qp = strtok_r (NULL, ";", &sptr2);
- double q = 1.0;
-
- while (isspace ((int) *lp))
- lp++;
- if (NULL != qp)
- while (isspace ((int) *qp))
- qp++;
- GNUNET_break_op ( (NULL == qp) ||
- (1 == sscanf (qp,
- "q=%lf",
- &q)) );
- if (0 == strcasecmp (lang,
- lp))
- r = GNUNET_MAX (r, q);
- }
- GNUNET_free (p);
- return r;
-}
-
-
-/**
* Generate a response with a legal document in the format and language of the
* user's choosing.
*
@@ -271,10 +225,10 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
if ( (NULL == t) ||
(! xmime_matches (mime,
t->mime_type)) ||
- (TALER_MHD_language_matches (lang,
- p->language) >
- TALER_MHD_language_matches (lang,
- t->language) ) )
+ (TALER_language_matches (lang,
+ p->language) >
+ TALER_language_matches (lang,
+ t->language) ) )
t = p;
}
}
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3831dd3f..c25e5700 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -38,6 +38,7 @@ libtalerutil_la_SOURCES = \
crypto.c \
crypto_wire.c \
getopt.c \
+ lang.c \
mhd.c \
payto.c \
taler_error_codes.c \
diff --git a/src/util/lang.c b/src/util/lang.c
new file mode 100644
index 00000000..3f6a4291
--- /dev/null
+++ b/src/util/lang.c
@@ -0,0 +1,71 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2020 Taler Systems SA
+
+ TALER is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file lang.c
+ * @brief Utility functions for parsing and matching RFC 7231 language strings.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_util.h"
+
+
+/**
+ * Check if @a lang matches the @a language_pattern, and if so with
+ * which preference.
+ * See also: https://tools.ietf.org/html/rfc7231#section-5.3.1
+ *
+ * @param language_pattern a language preferences string
+ * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1"
+ * @param lang the 2-digit language to match
+ * @return q-weight given for @a lang in @a language_pattern, 1.0 if no weights are given;
+ * 0 if @a lang is not in @a language_pattern
+ */
+double
+TALER_language_matches (const char *language_pattern,
+ const char *lang)
+{
+ char *p = GNUNET_strdup (language_pattern);
+ char *sptr;
+ double r = 0.0;
+
+ for (char *tok = strtok_r (p, ",", &sptr);
+ NULL != tok;
+ tok = strtok_r (NULL, ",", &sptr))
+ {
+ char *sptr2;
+ char *lp = strtok_r (tok, ";", &sptr2);
+ char *qp = strtok_r (NULL, ";", &sptr2);
+ double q = 1.0;
+
+ while (isspace ((int) *lp))
+ lp++;
+ if (NULL != qp)
+ while (isspace ((int) *qp))
+ qp++;
+ GNUNET_break_op ( (NULL == qp) ||
+ (1 == sscanf (qp,
+ "q=%lf",
+ &q)) );
+ if (0 == strcasecmp (lang,
+ lp))
+ r = GNUNET_MAX (r, q);
+ }
+ GNUNET_free (p);
+ return r;
+}
+
+
+/* end of lang.c */