Run the identity provider as a script

2 files changed, 26 insertions, 87 deletions

diff --git a/po/fr.po b/po/fr.po
index 4713516..e9fdaa3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -750,77 +750,7 @@ msgid "comand-line|error-file"
 msgstr "fichier-erreur"
 
 #: src/scm/webid-oidc/identity-provider.scm:188
-#, fuzzy, scheme-format
-#| msgid ""
-#| "Usage: ~a [OPTIONS]...\n"
-#| "\n"
-#| "Run the Solid identity provider for a specific user.\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h, --~a:\n"
-#| "      display this help message and exit.\n"
-#| "  -v, --~a:\n"
-#| "      display the version information (~a) and exit.\n"
-#| "  -i URI, --~a=URI:\n"
-#| "      set the public server host name.\n"
-#| "  -k FILE, --~a=FILE.jwk:\n"
-#| "      set the file name of the key file. If it does not exist, a new\n"
-#| "      key is generated.\n"
-#| "  -s WEBID, --~a=WEBID:\n"
-#| "      set the identity of the subject.\n"
-#| "  -w PASSWORD, --~a=PASSWORD:\n"
-#| "      set the password to recognize the user.\n"
-#| "  -j URI, --~a=URI:\n"
-#| "      set the URI to query the key of the server.\n"
-#| "  -a URI, --~a=URI:\n"
-#| "      set the authorization endpoint of the issuer.\n"
-#| "  -t URI, --~a=URI:\n"
-#| "      set the token endpoint of the issuer.\n"
-#| "  -p PORT, --~a=PORT:\n"
-#| "      set the port to bind (instead of 8080).\n"
-#| "  -l FILE.log, --~a=FILE.log:\n"
-#| "      dump the standard output to that file.\n"
-#| "  -e FILE.err, --~a=FILE.err:\n"
-#| "      dump the standard error to that file.\n"
-#| "\n"
-#| "Environment variables:\n"
-#| "\n"
-#| "  LANG: set the locale of the sysadmin-facing interface (the user\n"
-#| "pages are translated according to the user agent’s Accept-language\n"
-#| "header), for log files and command-line interface. It is currently ~a.\n"
-#| "\n"
-#| "  XDG_DATA_HOME: where to store the refresh tokens (under the\n"
-#| "webid-oidc directory). For a system service, it is recommended to set\n"
-#| "it to /var/lib. Currently set to ~a.\n"
-#| "\n"
-#| "  XDG_CACHE_HOME: where to store and update the seed file for the\n"
-#| "random number generator. If you remove it, you need to restart the\n"
-#| "program to use a different seed. Currently set to ~a.\n"
-#| "\n"
-#| "  HOME: if XDG_DATA_HOME or XDG_CACHE_HOME is not set, they are\n"
-#| "computed from the value of the HOME environment variable. It is not\n"
-#| "used otherwise. Currently set to ~a.\n"
-#| "\n"
-#| "Example used in webid-oidc-demo.planete-kraus.eu (except it’s managed\n"
-#| "by shepherd in reality):\n"
-#| "\n"
-#| "    export LANG=C\n"
-#| "    export XDG_DATA_HOME=/var/lib\n"
-#| "    export XDG_CACHE_HOME=/var/cache\n"
-#| "    webid-oidc-issuer \\\n"
-#| "      --issuer https://webid-oidc-demo.planete-kraus.eu \\\n"
-#| "      --key-file /var/lib/webid-oidc/issuer/key.jwk \\\n"
-#| "      --subject https://webid-oidc-demo.planete-kraus.eu/profile/card#me "
-#| "\\\n"
-#| "      --password \"$PASSWORD\" \\\n"
-#| "      --jwks-uri https://webid-oidc-demo.planete-kraus.eu/keys \\\n"
-#| "      --authorization-endpoint-uri https://webid-oidc-demo.planete-kraus."
-#| "eu/authorize \\\n"
-#| "      --token-endpoint-uri https://webid-oidc-demo.planete-kraus.eu/token "
-#| "\\\n"
-#| "      --port $PORT\n"
-#| "\n"
-#| "If you find a bug, send a report to ~a.\n"
+#, scheme-format
 msgid ""
 "Usage: ~a [OPTIONS]...\n"
 "\n"
@@ -883,9 +813,10 @@ msgid ""
 "      --subject https://webid-oidc-demo.planete-kraus.eu/profile/card#me \\\n"
 "      --password \"$PASSWORD\" \\\n"
 "      --jwks-uri https://webid-oidc-demo.planete-kraus.eu/keys \\\n"
-"      --authorization-endpoint https://webid-oidc-demo.planete-kraus.eu/"
+"      --authorization-endpoint-uri https://webid-oidc-demo.planete-kraus.eu/"
 "authorize \\\n"
-"      --token-endpoint https://webid-oidc-demo.planete-kraus.eu/token \\\n"
+"      --token-endpoint-uri https://webid-oidc-demo.planete-kraus.eu/token "
+"\\\n"
 "      --port $PORT\n"
 "\n"
 "If you find a bug, send a report to ~a.\n"
@@ -1002,11 +933,19 @@ msgid "The port should be a number between 0 and 65535.\n"
 msgstr "Le port doit être un nombre entre 0 et 65535.\n"
 
 #: src/scm/webid-oidc/identity-provider.scm:346
-#, fuzzy, scheme-format
-#| msgid "~a: Internal server error: ~a\n"
-msgid "Internal server error: ~a\n"
+#, scheme-format
+msgid "~a: Internal server error: ~a\n"
 msgstr "~a : Erreur interne du serveur : ~a\n"
 
+#: src/scm/webid-oidc/identity-provider.scm:357
+#, scheme-format
+msgid ""
+"The client locale ~s can’t be approximated by system locale ~s (because ~a), "
+"using C.\n"
+msgstr ""
+"La locale du client ~s ne peut pas être approchée par la locale système ~s "
+"(parce que ~a), on utilise C.\n"
+
 #: src/scm/webid-oidc/authorization-page-unsafe.scm:29
 msgid "xml-lang|en"
 msgstr "fr"
@@ -1233,14 +1172,6 @@ msgstr ""
 #~ msgstr "il y a une erreur externe"
 
 #, scheme-format
-#~ msgid ""
-#~ "The client locale ~s can’t be approximated by system locale ~s (because "
-#~ "~a), using C.\n"
-#~ msgstr ""
-#~ "La locale du client ~s ne peut pas être approchée par la locale système "
-#~ "~s (parce que ~a), on utilise C.\n"
-
-#, scheme-format
 #~ msgid "~a: authentication failure: ~a\n"
 #~ msgstr "~a : échec d’authentificationn : ~a\n"
 
diff --git a/po/webid-oidc.pot b/po/webid-oidc.pot
index 1516073..9168393 100644
--- a/po/webid-oidc.pot
+++ b/po/webid-oidc.pot
@@ -796,9 +796,10 @@ msgid ""
 "      --subject https://webid-oidc-demo.planete-kraus.eu/profile/card#me \\\n"
 "      --password \"$PASSWORD\" \\\n"
 "      --jwks-uri https://webid-oidc-demo.planete-kraus.eu/keys \\\n"
-"      --authorization-endpoint https://webid-oidc-demo.planete-kraus.eu/"
+"      --authorization-endpoint-uri https://webid-oidc-demo.planete-kraus.eu/"
 "authorize \\\n"
-"      --token-endpoint https://webid-oidc-demo.planete-kraus.eu/token \\\n"
+"      --token-endpoint-uri https://webid-oidc-demo.planete-kraus.eu/token "
+"\\\n"
 "      --port $PORT\n"
 "\n"
 "If you find a bug, send a report to ~a.\n"
@@ -843,7 +844,14 @@ msgstr ""
 
 #: src/scm/webid-oidc/identity-provider.scm:346
 #, scheme-format
-msgid "Internal server error: ~a\n"
+msgid "~a: Internal server error: ~a\n"
+msgstr ""
+
+#: src/scm/webid-oidc/identity-provider.scm:357
+#, scheme-format
+msgid ""
+"The client locale ~s can’t be approximated by system locale ~s (because ~a), "
+"using C.\n"
 msgstr ""
 
 #: src/scm/webid-oidc/authorization-page-unsafe.scm:29