From 5c87d109a329346e6839b7d3c8025d230f58313e Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 19 Feb 2021 17:50:50 +0000 Subject: [PATCH] use descriptive variable names in email translations in preparation for an email editor. --- email.go | 12 ++++++------ go.sum | 36 ++++++++++++++++++++++++++++++++++++ lang.go | 9 +++++++++ lang/email/de-de.json | 8 ++++---- lang/email/el-gr.json | 10 +++++----- lang/email/en-us.json | 10 +++++----- lang/email/fr-fr.json | 10 +++++----- lang/email/id-id.json | 10 +++++----- lang/email/it-it.json | 8 ++++---- lang/email/nl-nl.json | 10 +++++----- lang/email/pt-br.json | 10 +++++----- package-lock.json | 6 +++--- package.json | 2 +- 13 files changed, 93 insertions(+), 48 deletions(-) diff --git a/email.go b/email.go index 97b91e5..ad98c27 100644 --- a/email.go +++ b/email.go @@ -221,7 +221,7 @@ func (emailer *Emailer) constructConfirmation(code, username, key string, app *a inviteLink = fmt.Sprintf("%s/%s?key=%s", inviteLink, code, key) var err error email.html, email.text, err = emailer.construct(app, "email_confirmation", "email_", map[string]interface{}{ - "helloUser": emailer.lang.Strings.format("helloUser", username), + "helloUser": emailer.lang.Strings.template("helloUser", tmpl{"username": username}), "clickBelow": emailer.lang.EmailConfirmation.get("clickBelow"), "ifItWasNotYou": emailer.lang.Strings.get("ifItWasNotYou"), "urlVal": inviteLink, @@ -266,7 +266,7 @@ func (emailer *Emailer) constructInvite(code string, invite Invite, app *appCont "hello": emailer.lang.InviteEmail.get("hello"), "youHaveBeenInvited": emailer.lang.InviteEmail.get("youHaveBeenInvited"), "toJoin": emailer.lang.InviteEmail.get("toJoin"), - "inviteExpiry": emailer.lang.InviteEmail.format("inviteExpiry", d, t, expiresIn), + "inviteExpiry": emailer.lang.InviteEmail.template("inviteExpiry", tmpl{"date": d, "time": t, "expiresInMinutes": expiresIn}), "linkButton": emailer.lang.InviteEmail.get("linkButton"), "invite_link": inviteLink, "message": message, @@ -285,7 +285,7 @@ func (emailer *Emailer) constructExpiry(code string, invite Invite, app *appCont var err error email.html, email.text, err = emailer.construct(app, "notifications", "expiry_", map[string]interface{}{ "inviteExpired": emailer.lang.InviteExpiry.get("inviteExpired"), - "expiredAt": emailer.lang.InviteExpiry.format("expiredAt", "\""+code+"\"", expiry), + "expiredAt": emailer.lang.InviteExpiry.template("expiredAt", tmpl{"code": "\"" + code + "\"", "time": expiry}), "notificationNotice": emailer.lang.InviteExpiry.get("notificationNotice"), }) if err != nil { @@ -307,7 +307,7 @@ func (emailer *Emailer) constructCreated(code, username, address string, invite } var err error email.html, email.text, err = emailer.construct(app, "notifications", "created_", map[string]interface{}{ - "aUserWasCreated": emailer.lang.UserCreated.format("aUserWasCreated", "\""+code+"\""), + "aUserWasCreated": emailer.lang.UserCreated.template("aUserWasCreated", tmpl{"code": "\"" + code + "\""}), "name": emailer.lang.Strings.get("name"), "address": emailer.lang.Strings.get("emailAddress"), "time": emailer.lang.UserCreated.get("time"), @@ -330,10 +330,10 @@ func (emailer *Emailer) constructReset(pwr PasswordReset, app *appContext) (*Ema message := app.config.Section("email").Key("message").String() var err error email.html, email.text, err = emailer.construct(app, "password_resets", "email_", map[string]interface{}{ - "helloUser": emailer.lang.Strings.format("helloUser", pwr.Username), + "helloUser": emailer.lang.Strings.template("helloUser", tmpl{"username": pwr.Username}), "someoneHasRequestedReset": emailer.lang.PasswordReset.get("someoneHasRequestedReset"), "ifItWasYou": emailer.lang.PasswordReset.get("ifItWasYou"), - "codeExpiry": emailer.lang.PasswordReset.format("codeExpiry", d, t, expiresIn), + "codeExpiry": emailer.lang.PasswordReset.template("codeExpiry", tmpl{"date": d, "time": t, "expiresInMinutes": expiresIn}), "ifItWasNotYou": emailer.lang.Strings.get("ifItWasNotYou"), "pin": emailer.lang.PasswordReset.get("pin"), "pinVal": pwr.Pin, diff --git a/go.sum b/go.sum index 25907ea..49e3bda 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ +cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= @@ -9,17 +11,24 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= @@ -31,6 +40,7 @@ github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/gzip v0.0.1 h1:ezvKOL6jH+jlzdHNE4h9h8q8uMpDQjyl0NN0Jd7jozc= github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w= @@ -85,7 +95,9 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -107,6 +119,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= @@ -127,8 +140,10 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/knz/strtime v0.0.0-20200924090105-187c67f2bf5e h1:ViPE0JEOvtw5I0EGUiFSr2VNKGNU+3oBT+oHbDXHbxk= github.com/knz/strtime v0.0.0-20200924090105-187c67f2bf5e/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -167,15 +182,20 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -203,12 +223,16 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY github.com/ugorji/go/codec v1.1.13/go.mod h1:oNVt3Dq+FO91WNQ/9JnHKQP2QJxTzoN7wCBFCq1OeuU= github.com/ugorji/go/codec v1.2.0 h1:As6RccOIlbm9wHuWYMlB30dErcI+4WiKWsYsmPkyrUw= github.com/ugorji/go/codec v1.2.0/go.mod h1:dXvG35r7zTX6QImXOSFhGMmKtX+wJ7VTWzGvYQGIjBs= +github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw= github.com/writeas/go-strip-markdown v2.0.1+incompatible/go.mod h1:Rsyu10ZhbEK9pXdk8V6MVnZmTzRG0alMNLMwa0J01fE= +github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/dl v0.0.0-20190829154251-82a15e2f2ead h1:jeP6FgaSLNTMP+Yri3qjlACywQLye+huGLmNGhBzm6k= golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -216,9 +240,11 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 h1:umElSU9WZirRdgu2yFHY0ayQkEnKiOC1TtM3fWXFnoU= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -238,11 +264,13 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -260,6 +288,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -286,12 +315,15 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -307,8 +339,11 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/go-playground/validator.v9 v9.29.1 h1:SvGtYmN60a5CVKTOzMSyfzWDeZRxRuGvRQyEAKbw1xc= gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -323,4 +358,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/lang.go b/lang.go index 392497c..3606e70 100644 --- a/lang.go +++ b/lang.go @@ -118,6 +118,15 @@ func (ls *setupLangs) getOptions() [][2]string { } type langSection map[string]string +type tmpl map[string]string + +func (el langSection) template(field string, vals tmpl) string { + text := el.get(field) + for key, val := range vals { + text = strings.ReplaceAll(text, "{"+key+"}", val) + } + return text +} func (el langSection) format(field string, vals ...string) string { text := el.get(field) diff --git a/lang/email/de-de.json b/lang/email/de-de.json index 681c778..2d04c49 100644 --- a/lang/email/de-de.json +++ b/lang/email/de-de.json @@ -4,7 +4,7 @@ }, "strings": { "ifItWasNotYou": "Wenn du das nicht warst, ignoriere bitte diese E-Mail.", - "helloUser": "Hallo {n}," + "helloUser": "Hallo {username}," }, "userCreated": { "title": "Mitteilung: Benutzer erstellt", @@ -15,14 +15,14 @@ "inviteExpiry": { "title": "Mitteilung: Invite abgelaufen", "inviteExpired": "Invite abgelaufen.", - "expiredAt": "Code {n} lief um {n} ab.", + "expiredAt": "Code {code} lief um {code} ab.", "notificationNotice": "Hinweis: Benachrichtigungs-E-Mails können auf dem Administrator-Dashboard umgeschalten werden." }, "passwordReset": { "title": "Passwortzurücksetzung angefordert - Jellyfin", "someoneHasRequestedReset": "Jemand hat vor kurzem eine Passwortzurücksetzung auf Jellyfin angefordert.", "ifItWasYou": "Wenn du das warst, gib die PIN unten in die Eingabeaufforderung ein.", - "codeExpiry": "Der Code wird am {n}, um [n} UTC ablaufen, was in {n} ist.", + "codeExpiry": "Der Code wird am {time}, um [n} UTC ablaufen, was in {date} ist.", "pin": "PIN" }, "userDeleted": { @@ -35,7 +35,7 @@ "hello": "Hallo", "youHaveBeenInvited": "Du wurdest zu Jellyfin eingeladen.", "toJoin": "Um beizutreten, folge dem untenstehenden Link.", - "inviteExpiry": "Dieser Invite wird am {n}; um {n} ablaufen, was in {n} ist, also handle schnell.", + "inviteExpiry": "Dieser Invite wird am {time}; um {expiresInMinutes} ablaufen, was in {date} ist, also handle schnell.", "linkButton": "Richte dein Konto ein" }, "welcomeEmail": { diff --git a/lang/email/el-gr.json b/lang/email/el-gr.json index a35acff..1417947 100644 --- a/lang/email/el-gr.json +++ b/lang/email/el-gr.json @@ -4,25 +4,25 @@ }, "strings": { "ifItWasNotYou": "Αν δεν ήσασταν εσείς, παρακαλώ αγνοήστε αυτό το email.", - "helloUser": "Γεία σου {n}," + "helloUser": "Γεία σου {username}," }, "userCreated": { "title": "Σημείωση: Δημιουργήθηκε χρήστης", - "aUserWasCreated": "Δημιουργήθηκε ένας χρήστης χρησιμοποιώντας τον κωδικό {n}.", + "aUserWasCreated": "Δημιουργήθηκε ένας χρήστης χρησιμοποιώντας τον κωδικό {code}.", "time": "Ώρα", "notificationNotice": "Σημείωση: Τα email ειδοποιήσεων μπορούν να ενεργοποιηθούν στον πίνακα ελέγχου διαχειριστή." }, "inviteExpiry": { "title": "Σημείωση: Η πρόσκληση έληξε", "inviteExpired": "Η πρόσκληση έληξε.", - "expiredAt": "Ο κωδικός {n} έληξε στις {n}.", + "expiredAt": "Ο κωδικός {code} έληξε στις {time}.", "notificationNotice": "Σημείωση: Τα email ειδοποιήσεων μπορούν να ενεργοποιηθούν στον πίνακα ελέγχου διαχειριστή." }, "passwordReset": { "title": "Ζητήθηκε επαναφορά κωδικού πρόσβασης - Jellyfin", "someoneHasRequestedReset": "Κάποιος ζήτησε πρόσφατα επαναφορά κωδικού πρόσβασης στο Jellyfin.", "ifItWasYou": "Εάν ήσασταν εσείς, εισαγάγετε το πιν στο πεδίο.", - "codeExpiry": "Ο κωδικός θα λήξει στις {n}, στις {n} UTC, το οποίο είναι σε {n}.", + "codeExpiry": "Ο κωδικός θα λήξει στις {date}, στις {time} UTC, το οποίο είναι σε {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { @@ -35,7 +35,7 @@ "hello": "Γειά", "youHaveBeenInvited": "Έχετε προσκληθεί στο Jellyfin.", "toJoin": "Για να συμμετέχετε, ακολουθήστε τον παρακάτω σύνδεσμο.", - "inviteExpiry": "Αυτή η πρόσκληση θα λήξει στις {n} στις {n}, που είναι σε {n}, οπότε ενεργήστε γρήγορα.", + "inviteExpiry": "Αυτή η πρόσκληση θα λήξει στις {date} στις {time}, που είναι σε {expiresInMinutes}, οπότε ενεργήστε γρήγορα.", "linkButton": "Ρυθμίστε τον λογαριασμό σας" }, "welcomeEmail": { diff --git a/lang/email/en-us.json b/lang/email/en-us.json index e2d4f89..0f5ae25 100644 --- a/lang/email/en-us.json +++ b/lang/email/en-us.json @@ -4,25 +4,25 @@ }, "strings": { "ifItWasNotYou": "If this wasn't you, please ignore this email.", - "helloUser": "Hi {n}," + "helloUser": "Hi {username}," }, "userCreated": { "title": "Notice: User created", - "aUserWasCreated": "A user was created using code {n}.", + "aUserWasCreated": "A user was created using code {code}.", "time": "Time", "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard." }, "inviteExpiry": { "title": "Notice: Invite expired", "inviteExpired": "Invite expired.", - "expiredAt": "Code {n} expired at {n}.", + "expiredAt": "Code {code} expired at {time}.", "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard." }, "passwordReset": { "title": "Password reset requested - Jellyfin", "someoneHasRequestedReset": "Someone has recently requested a password reset on Jellyfin.", "ifItWasYou": "If this was you, enter the pin below into the prompt.", - "codeExpiry": "The code will expire on {n}, at {n} UTC, which is in {n}.", + "codeExpiry": "The code will expire on {date}, at {time} UTC, which is in {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { @@ -35,7 +35,7 @@ "hello": "Hi", "youHaveBeenInvited": "You've been invited to Jellyfin.", "toJoin": "To join, follow the below link.", - "inviteExpiry": "This invite will expire on {n} at {n}, which is in {n}, so act quick.", + "inviteExpiry": "This invite will expire on {date} at {time}, which is in {expiresInMinutes}, so act quick.", "linkButton": "Setup your account" }, "welcomeEmail": { diff --git a/lang/email/fr-fr.json b/lang/email/fr-fr.json index 974adf1..eba89b7 100644 --- a/lang/email/fr-fr.json +++ b/lang/email/fr-fr.json @@ -5,25 +5,25 @@ }, "strings": { "ifItWasNotYou": "Si ce n'était pas toi, tu peux ignorer ce mail.", - "helloUser": "Salut {n}," + "helloUser": "Salut {username}," }, "userCreated": { "title": "Notification : Utilisateur créé", - "aUserWasCreated": "Un utilisateur a été créé avec ce code {n}.", + "aUserWasCreated": "Un utilisateur a été créé avec ce code {code}.", "time": "Date", "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur." }, "inviteExpiry": { "title": "Notification : Invitation expirée", "inviteExpired": "Invitation expirée.", - "expiredAt": "Le code {n} a expiré à {n}.", + "expiredAt": "Le code {code} a expiré à {time}.", "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur." }, "passwordReset": { "title": "Réinitialisation de mot du passe demandée - Jellyfin", "someoneHasRequestedReset": "Quelqu'un vient de demander une réinitialisation du mot de passe via Jellyfin.", "ifItWasYou": "Si c'était bien toi, renseigne le code PIN en dessous.", - "codeExpiry": "Ce code expirera le {n}, à {n} UTC, soit dans {n}.", + "codeExpiry": "Ce code expirera le {date}, à {time} UTC, soit dans {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { @@ -36,7 +36,7 @@ "hello": "Salut", "youHaveBeenInvited": "Tu as été invité à rejoindre Jellyfin.", "toJoin": "Pour continuer, suis le lien en dessous.", - "inviteExpiry": "L'invitation expirera le {n}, à {n}, soit dans {n}, alors fais vite !", + "inviteExpiry": "L'invitation expirera le {date}, à {time}, soit dans {expiresInMinutes}, alors fais vite !", "linkButton": "Lien" }, "welcomeEmail": { diff --git a/lang/email/id-id.json b/lang/email/id-id.json index 3ae2d93..0023ad7 100644 --- a/lang/email/id-id.json +++ b/lang/email/id-id.json @@ -4,25 +4,25 @@ }, "strings": { "ifItWasNotYou": "Jika ini bukan kamu, silahkan mengabaikan email ini.", - "helloUser": "Halo {n}," + "helloUser": "Halo {username}," }, "userCreated": { "title": "Perhatian: User telah dibuat", - "aUserWasCreated": "User telah dibuat menggunakan kode {n}.", + "aUserWasCreated": "User telah dibuat menggunakan kode {code}.", "time": "Waktu", "notificationNotice": "Catatan: Email notifikasi dapat diganti pada dasbor admin." }, "inviteExpiry": { "title": "Perhatian: Undangan telah kadaluarsa", "inviteExpired": "Undangan telah kadaluarsa.", - "expiredAt": "Kode {n} kadaluarsa pada {n}.", + "expiredAt": "Kode {code} kadaluarsa pada {time}.", "notificationNotice": "Catatan: Email notifikasi dapat diganti pada dasbor admin." }, "passwordReset": { "title": "Reset password telah di-request - Jellyfin", "someoneHasRequestedReset": "Seseorang baru saja me-request reset password pada Jellyfin.", "ifItWasYou": "Jika ini adalah benar anda, masukkan pin dibawah ke dalam tempat yang sudah disediakan.", - "codeExpiry": "Kode akan kadaluarsa pada {n}, pada waktu {n} UTC, yaitu dalam {n}.", + "codeExpiry": "Kode akan kadaluarsa pada {date}, pada waktu {time} UTC, yaitu dalam {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { @@ -35,7 +35,7 @@ "hello": "Halo", "youHaveBeenInvited": "Anda telah diundang ke Jellyfin.", "toJoin": "Untuk masuk, silahkan ikuti link dibawah ini.", - "inviteExpiry": "Undangan ini akan berakhir dalam {n} pada {n}, yaitu dalam {n}, jadi bergegaslah.", + "inviteExpiry": "Undangan ini akan berakhir dalam {date} pada {time}, yaitu dalam {expiresInMinutes}, jadi bergegaslah.", "linkButton": "Persiapkan akunmu" }, "welcomeEmail": { diff --git a/lang/email/it-it.json b/lang/email/it-it.json index ed980b0..cfeda1c 100644 --- a/lang/email/it-it.json +++ b/lang/email/it-it.json @@ -4,25 +4,25 @@ }, "strings": { "ifItWasNotYou": "Se non sei stato tu, puoi ignorare questa email.", - "helloUser": "Ciao {n}," + "helloUser": "Ciao {username}," }, "userCreated": { "title": "Nota: Utente creato", - "aUserWasCreated": "Un utente è stato creato usando il codice {n}.", + "aUserWasCreated": "Un utente è stato creato usando il codice {code}.", "time": "Tempo", "notificationNotice": "Nota: Le notifiche via email possono essere attivate nel pannello di admin." }, "inviteExpiry": { "title": "Nota: Invito scaduto", "inviteExpired": "Invito scaduto.", - "expiredAt": "Il codice {n} è scaduto il {n}.", + "expiredAt": "Il codice {code} è scaduto il {time}.", "notificationNotice": "Nota: le e-mail di notifica possono essere attivate dal pannello di admin." }, "passwordReset": { "title": "Richiesto un reset della password - Jellyfin", "someoneHasRequestedReset": "Qualcuno ha recentemente richiesto un reset della password su Jellyfin.", "ifItWasYou": "Se sei stato tu, scrivi il PIN sotto alla richiesta.", - "codeExpiry": "Il codice scadrà in {n}, alle {n} UTC, che è alle {n}.", + "codeExpiry": "Il codice scadrà in {date}, alle {time} UTC, che è alle {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { diff --git a/lang/email/nl-nl.json b/lang/email/nl-nl.json index 6cfc1bd..5fb713c 100644 --- a/lang/email/nl-nl.json +++ b/lang/email/nl-nl.json @@ -4,25 +4,25 @@ }, "strings": { "ifItWasNotYou": "Als jij dit niet was, negeer dan alsjeblieft deze email.", - "helloUser": "Hoi {n}," + "helloUser": "Hoi {username}," }, "userCreated": { "title": "Melding: Gebruiker aangemaakt", - "aUserWasCreated": "Er is een gebruiker aangemaakt door gebruik te maken van code {n}.", + "aUserWasCreated": "Er is een gebruiker aangemaakt door gebruik te maken van code {code}.", "time": "Tijdstip", "notificationNotice": "Opmerking: Meldingse-mails kunnen worden aan- of uitgezet via het beheerdersdashboard." }, "inviteExpiry": { "title": "Melding: Uitnodiging verlopen", "inviteExpired": "Uitnodiging verlopen.", - "expiredAt": "Code {n} is verlopen op {n}.", + "expiredAt": "Code {code} is verlopen op {time}.", "notificationNotice": "Opmerking: Meldingse-mails kunnen worden aan- of uitgezet via het beheerdersdashboard." }, "passwordReset": { "title": "Wachtwoordreset aangevraagd - Jellyfin", "someoneHasRequestedReset": "Iemand heeft recentelijk een wachtwoordreset aangevraagd in Jellyfin.", "ifItWasYou": "Als jij dit was, voor dan onderstaande PIN in.", - "codeExpiry": "De code verloopt op {n}, op {n} UTC, dat is over {n}.", + "codeExpiry": "De code verloopt op {date}, op {time} UTC, dat is over {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { @@ -35,7 +35,7 @@ "hello": "Hoi", "youHaveBeenInvited": "Je bent uitgenodigd voor Jellyfin.", "toJoin": "Volg onderstaande link om door te gaan.", - "inviteExpiry": "Deze uitnodiging verloopt op {n}, om {n}, dat is over {n}, dus wees er snel bij.", + "inviteExpiry": "Deze uitnodiging verloopt op {date}, om {time}, dat is over {expiresInMinutes}, dus wees er snel bij.", "linkButton": "Maak account aan" }, "welcomeEmail": { diff --git a/lang/email/pt-br.json b/lang/email/pt-br.json index dfab1be..ad797b3 100644 --- a/lang/email/pt-br.json +++ b/lang/email/pt-br.json @@ -4,25 +4,25 @@ }, "strings": { "ifItWasNotYou": "Se não foi você, ignore este e-mail.", - "helloUser": "Ola {n}," + "helloUser": "Ola {username}," }, "userCreated": { "title": "Aviso: Usuário criado", - "aUserWasCreated": "Um usuário foi criado usando o código {n}.", + "aUserWasCreated": "Um usuário foi criado usando o código {code}.", "time": "Tempo", "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador." }, "inviteExpiry": { "title": "Aviso: Convite expirado", "inviteExpired": "Convite expirado.", - "expiredAt": "O código {n} expirou em {n}.", + "expiredAt": "O código {code} expirou em {time}.", "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador." }, "passwordReset": { "title": "Redefinir senha foi solicitada - Jellyfin", "someoneHasRequestedReset": "Alguém recentemente solicitou uma redefinição de senha no Jellyfin.", "ifItWasYou": "Se foi você, insira o PIN abaixo.", - "codeExpiry": "O código irá expirar em {n}, ás {n}, que está em {n}.", + "codeExpiry": "O código irá expirar em {date}, ás {time}, que está em {expiresInMinutes}.", "pin": "PIN" }, "userDeleted": { @@ -35,7 +35,7 @@ "hello": "Ola", "youHaveBeenInvited": "Você recebeu um convite para o Jellyfin.", "toJoin": "Para participar, clique no link abaixo.", - "inviteExpiry": "Este convite expira em {n} às {n}, que é em {n}, então seja rápido.", + "inviteExpiry": "Este convite expira em {date} às {time}, que é em {expiresInMinutes}, então seja rápido.", "linkButton": "Crie sua conta" }, "welcomeEmail": { diff --git a/package-lock.json b/package-lock.json index c282b32..0c79482 100644 --- a/package-lock.json +++ b/package-lock.json @@ -228,9 +228,9 @@ "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY=" }, "esbuild": { - "version": "0.8.48", - "resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.48.tgz", - "integrity": "sha1-pX5N3oTsVtocbsrv7pfp2mxbALU=" + "version": "0.8.49", + "resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.49.tgz", + "integrity": "sha1-PTP3GzlmYR+CLPTIOBFfP70W3vI=" }, "escalade": { "version": "3.1.1", diff --git a/package.json b/package.json index 0fedb8c..70aedd8 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/hrfee/jfa-go#readme", "dependencies": { "a17t": "^0.4.0", - "esbuild": "^0.8.48", + "esbuild": "^0.8.49", "lodash": "^4.17.19", "mjml": "^4.8.0", "remixicon": "^2.5.0",