Mercurial > gemma
changeset 1462:a54f9fbfb378
merge
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Mon, 03 Dec 2018 16:19:39 +0100 |
parents | 08036d9f0c67 (current diff) 3d5aea677345 (diff) |
children | a6dd2a8183a4 |
files | |
diffstat | 6 files changed, 38 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/admin/Importqueue.vue Mon Dec 03 16:19:14 2018 +0100 +++ b/client/src/components/admin/Importqueue.vue Mon Dec 03 16:19:39 2018 +0100 @@ -134,7 +134,7 @@ this.$store.dispatch("imports/getImports").catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); });
--- a/client/src/components/admin/Systemconfiguration.vue Mon Dec 03 16:19:14 2018 +0100 +++ b/client/src/components/admin/Systemconfiguration.vue Mon Dec 03 16:19:39 2018 +0100 @@ -128,7 +128,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -143,7 +143,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -162,7 +162,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -179,7 +179,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); });
--- a/client/src/components/admin/usermanagement/Userdetail.vue Mon Dec 03 16:19:14 2018 +0100 +++ b/client/src/components/admin/usermanagement/Userdetail.vue Mon Dec 03 16:19:39 2018 +0100 @@ -219,10 +219,10 @@ data() { return { mailsent: false, - passwordLabel: "Password", - passwordReLabel: "Repeat Password", - passwordPlaceholder: "password", - passwordRePlaceholder: "password again", + passwordLabel: this.$gettext("Password"), + passwordReLabel: this.$gettext("Repeat Password"), + passwordPlaceholder: this.$gettext("password"), + passwordRePlaceholder: this.$gettext("password again"), password: "", passwordre: "", currentUser: {}, @@ -288,7 +288,7 @@ this.submitted = false; const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -315,23 +315,29 @@ validateCountry() { this.errors.country = this.currentUser.country ? "" - : "Please choose a country"; + : this.$gettext("Please choose a country"); }, validateRole() { - this.errors.role = this.currentUser.role ? "" : "Please choose a role"; + this.errors.role = this.currentUser.role + ? "" + : this.$gettext("Please choose a role"); }, validatePassword() { this.errors.passwordre = - this.password === this.passwordre ? "" : "Passwords do not match!"; + this.password === this.passwordre + ? "" + : this.$gettext("Passwords do not match!"); this.errors.password = this.password === "" || !violatedPasswordRules(this.password) ? "" - : "Password should at least be 8 char long including 1 digit and 1 special char like $"; + : this.$gettext( + "Password should at least be 8 char long including 1 digit and 1 special char like $" + ); }, validateEmailaddress() { this.errors.email = isEmailValid(this.currentUser.email) ? "" - : "invalid email"; + : this.$gettext("invalid email"); }, validate() { this.validateCountry(); @@ -354,7 +360,7 @@ this.$store.dispatch("usermanagement/loadUsers").catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -363,7 +369,7 @@ this.submitted = false; const { status, data } = error.response; displayError({ - title: "Error while saving user", + title: this.$gettext("Error while saving user"), message: `${status}: ${data.message || data}` }); });
--- a/client/src/components/admin/usermanagement/Usermanagement.vue Mon Dec 03 16:19:14 2018 +0100 +++ b/client/src/components/admin/usermanagement/Usermanagement.vue Mon Dec 03 16:19:39 2018 +0100 @@ -263,7 +263,7 @@ this.$store.dispatch("usermanagement/loadUsers").catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -271,7 +271,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -297,7 +297,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data}` }); });
--- a/client/src/components/map/Identify.vue Mon Dec 03 16:19:14 2018 +0100 +++ b/client/src/components/map/Identify.vue Mon Dec 03 16:19:39 2018 +0100 @@ -35,22 +35,24 @@ </div> </div> <div class="versioninfo border-top p-3 text-left"> - <translate>This app uses</translate> - <i>gemma</i>, - <translate>which is Free Software under</translate> - <br>AGPL-3.0-or-later - <translate>without warranty, see docs for details.</translate> + <span v-translate="{license: 'AGPL-3.0-or-later'}"> + This app uses + <i>gemma</i>, which is Free Software under + <br> + %{ license } + without warranty, see docs for details. + </span> <br> - <a href="https://hg.intevation.de/gemma/file/tip"> <translate>source-code</translate> </a> {{ versionStr }} <br>© via donau. ⓔ Intevation. <br> - <translate>Some data</translate>© - <a href="https://www.openstreetmap.org/copyright">OpenSteetMap</a> - <span v-translate class="fix-trans-space">contributors.</span> + <span v-translate="{name: 'OpenSteetMap'}">Some data © + <a href="https://www.openstreetmap.org/copyright">%{ name }</a> + <span >contributors.</span> + </span> </div> </div> </div>
--- a/client/src/components/map/contextbox/Bottlenecks.vue Mon Dec 03 16:19:14 2018 +0100 +++ b/client/src/components/map/contextbox/Bottlenecks.vue Mon Dec 03 16:19:39 2018 +0100 @@ -218,7 +218,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); })