From 46dde9368f75013b2383c24d4c8a11763ac8e31e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 19 Aug 2020 18:19:00 +0200
Subject: implement i18n lookup logic for #6458

---
 src/include/taler_json_lib.h | 31 +++++++++++++++++++++++++++++++
 src/include/taler_mhd_lib.h  | 16 ----------------
 src/include/taler_util.h     | 16 ++++++++++++++++
 3 files changed, 47 insertions(+), 16 deletions(-)

(limited to 'src/include')

diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index 171b3d009..a1e4d8830 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -293,6 +293,37 @@ TALER_JSON_exchange_wire_signature_make (
   const struct TALER_MasterPrivateKeyP *master_priv);
 
 
+/**
+ * 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
diff --git a/src/include/taler_mhd_lib.h b/src/include/taler_mhd_lib.h
index 7d281662d..4b34f41df 100644
--- a/src/include/taler_mhd_lib.h
+++ b/src/include/taler_mhd_lib.h
@@ -96,22 +96,6 @@ MHD_RESULT
 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.
  *
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 1d1c01eaf..2a64fe8e9 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -184,6 +184,22 @@ char *
 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).
-- 
cgit v1.2.3