aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2019-03-13 08:15:10 -0700
committerChristine Dodrill <me@christine.website>2019-03-13 08:15:10 -0700
commit8ba8fbebb4bbd0d4d01f1ff6c08ef56bfa5b8d06 (patch)
tree0ff45a1e01c09da0ba7c739aa5f466fd168fc14b
parent2616635c4fd9bb6385e1a108d47502a02b7ad2a4 (diff)
downloadx-8ba8fbebb4bbd0d4d01f1ff6c08ef56bfa5b8d06.tar.xz
x-8ba8fbebb4bbd0d4d01f1ff6c08ef56bfa5b8d06.zip
idp: i18n
Diffstat
-rw-r--r--idp/main.go66
-rw-r--r--idp/translations/en_US.json3
-rw-r--r--idp/translations/jbo_latn.json7
3 files changed, 55 insertions, 21 deletions
diff --git a/idp/main.go b/idp/main.go
index 349bd5c..c22206f 100644
--- a/idp/main.go
+++ b/idp/main.go
@@ -10,6 +10,7 @@ import (
"text/template"
"time"
+ "github.com/Xe/x/i18n"
"github.com/Xe/x/idp/idpmiddleware"
"github.com/Xe/x/internal"
"github.com/pborman/uuid"
@@ -19,11 +20,13 @@ import (
)
var (
- domain = flag.String("domain", "idp.christine.website", "domain to be hosted from")
- otpSecret = flag.String("otp-secret", "", "OTP secret")
- port = flag.String("port", "5484", "TCP port to listen on for HTTP")
- owner = flag.String("owner", "https://christine.website/", "the me=that is required")
- secretGen = flag.Int("secret-gen", 0, "generate a secret of len if set")
+ domain = flag.String("domain", "idp.christine.website", "domain to be hosted from")
+ otpSecret = flag.String("otp-secret", "", "OTP secret")
+ port = flag.String("port", "5484", "TCP port to listen on for HTTP")
+ owner = flag.String("owner", "https://christine.website/", "the me=that is required")
+ secretGen = flag.Int("secret-gen", 0, "generate a secret of len if set")
+ defaultLang = flag.String("default-language", "en_US", "default language if none is set")
+ gitRev = flag.String("git-rev", "", "git revision of runtime (used for dokku detection)")
)
func main() {
@@ -33,8 +36,16 @@ func main() {
log.Fatal(gotp.RandomSecret(*secretGen))
}
+ translationPath := "./translations"
+ if *gitRev != "" {
+ translationPath = "/app/translations"
+ }
+
+ l := i18n.New(*defaultLang, translationPath)
+
i := &idp{
t: gotp.NewDefaultTOTP(*otpSecret),
+ l: l,
bearer2me: map[string]string{},
}
@@ -42,15 +53,30 @@ func main() {
def := idpmiddleware.XeProtect("https://" + *domain + "/")(http.DefaultServeMux)
mux := http.NewServeMux()
+ mux.HandleFunc("/lang", func(w http.ResponseWriter, r *http.Request) {
+ locales := i18n.GetLocales(r)
+
+ json.NewEncoder(w).Encode(locales)
+ })
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
- if r.URL.Path == "/auth/challenge" {
- r.URL.Path = "/.within/x/idpmiddleware/challenge"
- http.Redirect(w, r, r.URL.String(), http.StatusPermanentRedirect)
+ tr := i.l.TranslationsForRequest(r)
+ fm := template.FuncMap{
+ "T": tr.Value,
+ }
+
+ t, err := template.New("root").Funcs(fm).Parse(rootPageTemplate)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "text/html")
- w.Write([]byte(rootPageTemplate))
+ err = t.Execute(w, nil)
+ if err != nil {
+ log.Printf("%v", err)
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
})
mux.HandleFunc("/auth", i.auth)
mux.HandleFunc("/challenge", i.challenge)
@@ -62,6 +88,7 @@ func main() {
type idp struct {
t *gotp.TOTP
+ l *i18n.L
sync.Mutex
bearer2me map[string]string
}
@@ -126,7 +153,12 @@ func (i *idp) auth(w http.ResponseWriter, r *http.Request) {
return
}
- t, err := template.New("auth").Parse(authPageTemplate)
+ tr := i.l.TranslationsForRequest(r)
+ fm := template.FuncMap{
+ "T": tr.Value,
+ }
+
+ t, err := template.New("auth").Funcs(fm).Parse(authPageTemplate)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@@ -202,7 +234,7 @@ func (i *idp) challenge(w http.ResponseWriter, r *http.Request) {
const rootPageTemplate = `<html>
<head>
<link rel="stylesheet" href="https://unpkg.com/chota@0.5.2/dist/chota.min.css">
-<title>Forbidden</title>
+<title>{{ T "errors.forbidden" }}</title>
<meta name=viewport content="width=400">
<style>
:root {
@@ -215,10 +247,10 @@ const rootPageTemplate = `<html>
<div class="container">
<div class="card">
<header>
- <h4>Forbidden</h4>
+ <h4>{{ T "errors.forbidden" }}</h4>
</header>
- <p>This is a private identity provider supporting <a href="https://indieauth.net">IndieAuth</a> for the use of <a href="https://christine.website">Christine Dodrill</a> only. Unauthorized access is forbidden.</p>
+ <p>{{ T "prose.index" }}</p>
</div>
</div>
</body>
@@ -227,7 +259,7 @@ const rootPageTemplate = `<html>
const authPageTemplate = `<html>
<head>
<link rel="stylesheet" href="https://unpkg.com/chota@0.5.2/dist/chota.min.css">
-<title>Auth</title>
+<title>{{ T "auth_title" }}</title>
<meta name=viewport content="width=400">
<style>
:root {
@@ -240,17 +272,17 @@ const authPageTemplate = `<html>
<div class="container">
<div class="card">
<header>
- <h4>Log in to {{ .ClientID }} as {{ .Me }}</h4>
+ <h4>{{ T "prose.auth" .ClientID .Me }}</h4>
</header>
<p><form action="/challenge" method="GET">
- Code: <br>
+ {{ T "code" }} <br>
<input type="text" name="code" value="" autofocus><br><br>
<input type="hidden" name="me" value="{{ .Me }}">
<input type="hidden" name="state" value="{{ .State }}">
<input type="hidden" name="client_id" value="{{ .ClientID }}">
<input type="hidden" name="response_type" value="{{ .ResponseType }}">
<input type="hidden" name="redirect_uri" value="{{ .RedirectURI }}">
- <input class="button primary" type="submit" value="Submit">
+ <input class="button primary" type="submit" value="{{ T "submit_button" }}">
</form></p>
</div>
</div>
diff --git a/idp/translations/en_US.json b/idp/translations/en_US.json
index ae7d293..05c11de 100644
--- a/idp/translations/en_US.json
+++ b/idp/translations/en_US.json
@@ -11,5 +11,6 @@
},
"auth_title": "Auth",
- "submit_button": "Submit"
+ "submit_button": "Submit",
+ "code": "Code:"
}
diff --git a/idp/translations/jbo_latn.json b/idp/translations/jbo_latn.json
index 3356371..d431db6 100644
--- a/idp/translations/jbo_latn.json
+++ b/idp/translations/jbo_latn.json
@@ -2,14 +2,15 @@
"errors": {
"not_allowed": "na e'akne",
"forbidden": "narplicru",
- "url_error": "na jimpe lo urli"
+ "url_error": "urli srejvo"
},
"prose": {
- "index": "ni'o ti samse'u fi lo nu e'ande po la kristin.dadril .i lo narplicru pilno cu na e'akne",
+ "index": "ni'o ti samse'u fi lo nu e'ande po la .kristin.dadril. .i le pilno narcru cu na e'akne",
"auth": ".i tolna'e fa zoi .uy. {1} .uy. be zoi .uy. {0} .uy."
},
"auth_title": "dubju'o",
- "submit_button": "dudydatni"
+ "submit_button": "benji",
+ "code": "selmifra"
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-05 21:34:58 +0000