diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-03-03 16:03:28 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-03-03 16:03:28 +0100 |
commit | bb93581b8955e1cdf5c21bcbcfb342b87b0128f1 (patch) | |
tree | fe2a6c8943da827486227d0950748d4e21f88f44 | |
parent | 717ef7af8e38dcbfa06b36f9d44a0ca40a3da3bc (diff) | |
parent | 1cd31101036559e6a02c10ee2e6e60f283f925c7 (diff) | |
download | docs-bb93581b8955e1cdf5c21bcbcfb342b87b0128f1.tar.gz docs-bb93581b8955e1cdf5c21bcbcfb342b87b0128f1.tar.bz2 docs-bb93581b8955e1cdf5c21bcbcfb342b87b0128f1.zip |
Merge branch 'master' of git+ssh://git.taler.net/docs
-rw-r--r-- | core/api-merchant.rst | 12 | ||||
-rw-r--r-- | taler-merchant-pos-terminal.rst | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/core/api-merchant.rst b/core/api-merchant.rst index a02b895e..f6297ae1 100644 --- a/core/api-merchant.rst +++ b/core/api-merchant.rst @@ -736,6 +736,9 @@ The contract terms must have the following structure: // Human-readable description of the whole purchase summary: string; + // Map from IETF BCP 47 language tags to localized summaries + summary_i18n?: { [lang_tag: string]: string }; + // Unique, free-form identifier for the proposal. // Must be unique within a merchant instance. // For merchants that do not store proposals in their DB @@ -746,7 +749,7 @@ The contract terms must have the following structure: // Total price for the transaction. // The exchange will subtract deposit fees from that amount - // before transfering it to the merchant. + // before transferring it to the merchant. amount: Amount; // The URL for this purchase. Every time is is visited, the merchant @@ -846,8 +849,8 @@ The contract terms must have the following structure: extra?: any; } - The wallet must select a exchange that either the mechant accepts directly by - listing it in the exchanges arry, or for which the merchant accepts an auditor + The wallet must select a exchange that either the merchant accepts directly by + listing it in the exchanges array, or for which the merchant accepts an auditor that audits that exchange by listing it in the auditors array. The `Product` object describes the product being purchased from the merchant. It has the following structure: @@ -858,6 +861,9 @@ The contract terms must have the following structure: // Human-readable product description. description: string; + // Map from IETF BCP 47 language tags to localized descriptions + description_i18n?: { [lang_tag: string]: string }; + // The quantity of the product to deliver to the customer (optional, if applicable) quantity?: string; diff --git a/taler-merchant-pos-terminal.rst b/taler-merchant-pos-terminal.rst index 02cb64b7..b606461a 100644 --- a/taler-merchant-pos-terminal.rst +++ b/taler-merchant-pos-terminal.rst @@ -126,6 +126,9 @@ The elements of the JSON file are defined as follows: // The name of the category. This will be shown to users and used in the order summary. name: string; + + // Map from IETF BCP 47 language tags to localized names + name_i18n?: { [lang_tag: string]: string }; } @@ -139,6 +142,9 @@ The elements of the JSON file are defined as follows: // that will be shown to the user and used in contract terms description: string; + // Map from IETF BCP 47 language tags to localized descriptions + description_i18n?: { [lang_tag: string]: string }; + // The price of the product price: Amount; |