client: allow content-type parameters to initialize a page

3 files changed, 23 insertions, 20 deletions

diff --git a/po/disfluid.pot b/po/disfluid.pot
index 747a445..30c11d6 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -641,31 +641,32 @@ msgid ""
 "phrase) should be a string"
 msgstr ""
 
-#: src/scm/webid-oidc/client/application.scm:467
+#: src/scm/webid-oidc/client/application.scm:468
 msgid ""
 "the etag (#:etag) should be a string or #f, the links (#:links) should be a "
-"list of links, the content-type (#:content-type) should be a symbol, and the "
-"content (#:content) should be a string or a bytevector"
+"list of links, the content-type (#:content-type) should be a symbol or a "
+"list whose first item is a symbol, and the content (#:content) should be a "
+"string or a bytevector"
 msgstr ""
 
-#: src/scm/webid-oidc/client/application.scm:503
+#: src/scm/webid-oidc/client/application.scm:504
 msgid ""
 "the desired links (#:desired-links) should be an alist from URI to alists, "
 "the desired content-type (#:desired-content-type) should be a symbol, and "
 "the desired content (#:desired-content) should be a string or a bytevector"
 msgstr ""
 
-#: src/scm/webid-oidc/client/application.scm:587
+#: src/scm/webid-oidc/client/application.scm:588
 #, scheme-format
 msgid "Loading ~a..."
 msgstr ""
 
-#: src/scm/webid-oidc/client/application.scm:666
+#: src/scm/webid-oidc/client/application.scm:667
 #, scheme-format
 msgid "Updating ~a (expected ETag ~a)"
 msgstr ""
 
-#: src/scm/webid-oidc/client/application.scm:713
+#: src/scm/webid-oidc/client/application.scm:714
 #, scheme-format
 msgid "Deleting ~a (expected ETag ~a)"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 858809e..4ddc9a6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: webid-oidc 0.0.0\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
 "POT-Creation-Date: 2021-10-12 22:35+0200\n"
-"PO-Revision-Date: 2021-10-12 22:38+0200\n"
+"PO-Revision-Date: 2021-10-12 22:39+0200\n"
 "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
 "Language-Team: French <vivien@planete-kraus.eu>\n"
 "Language: fr\n"
@@ -696,18 +696,19 @@ msgstr ""
 "le code d’erreur (#:code) doit être un entier et l’explication (#:reason-"
 "phrase) doit être une chaîne de caractères"
 
-#: src/scm/webid-oidc/client/application.scm:467
+#: src/scm/webid-oidc/client/application.scm:468
 msgid ""
 "the etag (#:etag) should be a string or #f, the links (#:links) should be a "
-"list of links, the content-type (#:content-type) should be a symbol, and the "
-"content (#:content) should be a string or a bytevector"
+"list of links, the content-type (#:content-type) should be a symbol or a "
+"list whose first item is a symbol, and the content (#:content) should be a "
+"string or a bytevector"
 msgstr ""
 "l’etag (#:etag) doit être une chaîne de caractères ou #f, les liens (#:"
-"links) doivent être une liste de liens, le type de contenu (#:content-type) "
-"doit être un symbole, et le contenu (#:content) doit être une chaîne de "
-"caractères ou un vecteur d’octets"
+"links) doivent être liste de liens, le type de contenu (#:content-type) doit "
+"être un symbole ou une liste dont le premier élément est un symbole, et le "
+"contenu (#:content) doit être une chaîne de caractères ou un vecteur d’octets"
 
-#: src/scm/webid-oidc/client/application.scm:503
+#: src/scm/webid-oidc/client/application.scm:504
 msgid ""
 "the desired links (#:desired-links) should be an alist from URI to alists, "
 "the desired content-type (#:desired-content-type) should be a symbol, and "
@@ -718,17 +719,17 @@ msgstr ""
 "symbole, et le ccontenu désiré (#:desired-content-type) doit être unne "
 "chaîne de caractères ou un vecteur d’octets"
 
-#: src/scm/webid-oidc/client/application.scm:587
+#: src/scm/webid-oidc/client/application.scm:588
 #, scheme-format
 msgid "Loading ~a..."
 msgstr "Chargement de ~a…"
 
-#: src/scm/webid-oidc/client/application.scm:666
+#: src/scm/webid-oidc/client/application.scm:667
 #, scheme-format
 msgid "Updating ~a (expected ETag ~a)"
 msgstr "Mise à jour de ~a (ETag attendu ~a)"
 
-#: src/scm/webid-oidc/client/application.scm:713
+#: src/scm/webid-oidc/client/application.scm:714
 #, scheme-format
 msgid "Deleting ~a (expected ETag ~a)"
 msgstr "Suppression de ~a (ETag attendu ~a)"
diff --git a/src/scm/webid-oidc/client/application.scm b/src/scm/webid-oidc/client/application.scm
index e2bb4b6..2ce286d 100644
--- a/src/scm/webid-oidc/client/application.scm
+++ b/src/scm/webid-oidc/client/application.scm
@@ -455,7 +455,8 @@
        (((or (? not etag)
              (? string? etag))
          (? all-links? links)
-         (? symbol? content-type)
+         (or (? symbol? content-type)
+             ((? symbol? content-type) _ ...))
          (or (? string? content)
              (? bytevector? content)))
         (slot-set! page 'etag etag)
@@ -464,7 +465,7 @@
         (slot-set! page 'content content))
        (else
         (scm-error 'wrong-type-arg "make <error-page>"
-                   (G_ "the etag (#:etag) should be a string or #f, the links (#:links) should be a list of links, the content-type (#:content-type) should be a symbol, and the content (#:content) should be a string or a bytevector")
+                   (G_ "the etag (#:etag) should be a string or #f, the links (#:links) should be a list of links, the content-type (#:content-type) should be a symbol or a list whose first item is a symbol, and the content (#:content) should be a string or a bytevector")
                    '()
                    (list etag links content-type content)))))))