- Activation
-
- {activationSuccess ? successAlert : undefined}
- {activationFailure ? failureAlert : undefined}
-
-
+ Activation
+
+ {props.activationSuccess ? successAlert : undefined}
+ {props.activationFailure ? failureAlert : undefined}
+
+ Reset password
-
+ Reset password
+
+ Password for {account.login}
-
+
+ Password for {props.account.login}
+
+
+
- Registration
-
-
- -
- Administrator (login="admin" and password="admin") -
- User (login="user" and password="user"). -
+ Registration
+
+
+ +
- Administrator (login="admin" and password="admin") +
- User (login="user" and password="user"). +
- User settings for {account.login}
-
-
+
+ User settings for {props.account.login}
+
+
+ Audits
-Audits
+ +|
- |
-
- |
-
- |
-
- |
-
|---|---|---|---|
|
+ |
+
+ |
+
+ |
+
+ |
+
- Configuration
-
-
- |
- |
-
- |
- ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {property['prefix']} | -
- {Object.keys(property['properties']).map((propKey, index) => (
-
+
+
+
+ |
|
+ |
+
+ |
+
|---|---|
| {property['prefix']} | +
+ {Object.keys(property['properties']).map((propKey, index) => (
+ |
+
+ {envKey.name} +
+| Property | +Value | +
|---|---|
| {propKey} | ++ {envKey.properties[propKey].value} + | +
- {envKey.name} -
-| Property | -Value | -
|---|---|
| {propKey} | -- {envKey.properties[propKey].value} - | -
Health Checks
-- -
-| Service Name | -Status | -Details | -
|---|
| Service Name | +Status | +Details | +
|---|---|---|
| {configPropKey} |
- |
{data[configPropKey].details ? (
-
- |
Logs
- | {logger.name} | -- - - - - - - | -
+ Logs
+
+
+
|
+
+ |
+
+
+ |
+
|---|---|
| + {logger.name} + | ++ + + + + + + | +
Application Metrics
-- -
-+ }; + const { metrics, threadDump, isFetching } = props; + + return ( +
Application Metrics
++ +
++ +
JVM Metrics
+JVM Metrics
-
- User [{user.login}]
-
- -
-
Login
- -
- {user.login}
+ const { user } = props;
+
+ return (
+ +- ); - } -} + ))) : null + } + +
+
+User [{user.login}] ++
- --
+
Login
+ -
+ {user.login}
+ {
+ user.activated ? (
+
Activated Deactivated
+ First Name
+ - {user.firstName} +
Last Name
+ - {user.lastName} +
Email
+ - {user.email} + <%_ if (enableTranslation) { _%> +
Lang Key
+ - {user.langKey ? languages[user.langKey].name : undefined} + <%_ } _%> +
Created By
+ - {user.createdBy} +
Created Date
+ Last Modified By
+ - {user.lastModifiedBy} +
Last Modified Date
+ Profiles
+ -
+
-
{
- user.activated ? (
-
Activated Deactivated
- First Name
- - {user.firstName} -
Last Name
- - {user.lastName} -
Email
- - {user.email} - <%_ if (enableTranslation) { _%> -
Lang Key
- - {user.langKey ? languages[user.langKey].name : undefined} - <%_ } _%> -
Created By
- - {user.createdBy} -
Created Date
- Last Modified By
- - {user.lastModifiedBy} -
Last Modified Date
- Profiles
- -
-
-
- {
- user.authorities ? (
- user.authorities.map((authority, i) => (
+ user.authorities ? (
+ user.authorities.map((authority, i) => (
-
{authority}
- ))) : null
- }
-
- -
+
- Create or edit a User
-
-
- Loading...
- :
+ Create or edit a User
+
+
+ Loading...
+ :Welcome, Java Hipster!
- - Administrator (login="admin" and password="admin") -
- User (login="user" and password="user"). -
Welcome, Java Hipster!
+
-
-
-
-
-
-
JHipster homepage - -
- -
-
-
JHipster on Stack Overflow - -
- -
-
-
JHipster bug tracker - -
- -
-
-
JHipster public chat room - -
- -
-
-
follow @java_hipster on Twitter - -
-
-
- Administrator (login="admin" and password="admin") +
- User (login="user" and password="user"). +
+
-
+
-
+
+
JHipster homepage + +
+ -
+
+
JHipster on Stack Overflow + +
+ -
+
+
JHipster bug tracker + +
+ -
+
+
JHipster public chat room + +
+ -
+
+
follow @java_hipster on Twitter + +
+
+
Create or edit a <%= entityClassHumanized %>
-
| - | |||
|---|---|---|---|
| - - | - <%_ for (idx in fields) { - const fieldType = fields[idx].fieldType; - const fieldName = fields[idx].fieldName; - const fieldIsEnum = fields[idx].fieldIsEnum; - _%> -
- <%_ if (fieldType === 'Boolean') { _%>
- {<%= entityInstance %>.<%=fields[idx].fieldName%> ? 'true' : 'false'}
- <%_ } else if (fieldType === 'Instant' || fieldType === 'ZonedDateTime') { _%>
-
- .<%= fieldName %>ContentType, <%= entityInstance %>.<%= fieldName %>)}>
- <%_ if (fieldBlobType === 'image') { _%>
-
- ) : null}
- <%_ } else { _%>
- {<%= entityInstance %>.<%= fieldName %>}
+ <%_ for (idx in relationships) { _%>
+ <%_ if (relationships[idx].relationshipType === 'many-to-one'
+ || (relationships[idx].relationshipType === 'one-to-one' && relationships[idx].ownerSide === true)
+ || (relationships[idx].relationshipType === 'many-to-many' && relationships[idx].ownerSide === true && pagination === 'no')) {
+ const fieldName = dto === 'no' ? "." + relationships[idx].otherEntityField : relationships[idx].otherEntityFieldCapitalized;_%>
+ |
- <%_ } _%>
- <%_ for (idx in relationships) {
- const relationshipType = relationships[idx].relationshipType;
- const ownerSide = relationships[idx].ownerSide;
- const relationshipFieldName = relationships[idx].relationshipFieldName;
- const relationshipFieldNamePlural = relationships[idx].relationshipFieldNamePlural;
- const otherEntityName = relationships[idx].otherEntityName;
- const otherEntityStateName = relationships[idx].otherEntityStateName;
- const otherEntityField = relationships[idx].otherEntityField;
- const otherEntityFieldCapitalized = relationships[idx].otherEntityFieldCapitalized; _%>
- <%_ if (relationshipType === 'many-to-one'
- || (relationshipType === 'one-to-one' && ownerSide === true)
- || (relationshipType === 'many-to-many' && ownerSide === true && pagination === 'no')) { _%>
- - <%_ if (otherEntityName === 'user') { _%> - <%_ if (relationshipType === 'many-to-many') { _%> - { - (<%= entityInstance %>.<%= relationshipFieldNamePlural %>) ? - (<%= entityInstance %>.<%= relationshipFieldNamePlural %>.map((val, j) => - {val.<%= otherEntityField %>}{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '} - ) - ) : null - } - <%_ } else { _%> - <%_ if (dto === 'no') { _%> - {<%= entityInstance + "." + relationshipFieldName %> ? <%= entityInstance + "." + relationshipFieldName + "." + otherEntityField %> : ''} + | + |
| + + | + <%_ for (idx in fields) { + const fieldType = fields[idx].fieldType; + const fieldName = fields[idx].fieldName; + const fieldIsEnum = fields[idx].fieldIsEnum; + _%> +
+ <%_ if (fieldType === 'Boolean') { _%>
+ {<%= entityInstance %>.<%=fields[idx].fieldName%> ? 'true' : 'false'}
+ <%_ } else if (fieldType === 'Instant' || fieldType === 'ZonedDateTime') { _%>
+
+ .<%= fieldName %>ContentType, <%= entityInstance %>.<%= fieldName %>)}>
+ <%_ if (fieldBlobType === 'image') { _%>
+
+ ) : null}
<%_ } else { _%>
- {<%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %> ? <%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %> : ''}
- <%_ } _%>
- <%_ } _%>
+ {<%= entityInstance %>.<%= fieldName %>}
+ <%_ } _%>
<%_ } else { _%>
- <%_ if (relationshipType === 'many-to-many') { _%>
- {
- (<%= entityInstance %>.<%= relationshipFieldNamePlural %>) ?
- (<%= entityInstance %>.<%= relationshipFieldNamePlural %>.map((val, j) =>
- /${val.id}`}>{val.<%= otherEntityField %>}{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '}
- )
- ) : null
- }
- <%_ } else { _%>
+ {<%= entityInstance %>.<%= fieldName %>}
+ <%_ } _%>
+ |
+ <%_ } _%>
+ <%_ for (idx in relationships) {
+ const relationshipType = relationships[idx].relationshipType;
+ const ownerSide = relationships[idx].ownerSide;
+ const relationshipFieldName = relationships[idx].relationshipFieldName;
+ const relationshipFieldNamePlural = relationships[idx].relationshipFieldNamePlural;
+ const otherEntityName = relationships[idx].otherEntityName;
+ const otherEntityStateName = relationships[idx].otherEntityStateName;
+ const otherEntityField = relationships[idx].otherEntityField;
+ const otherEntityFieldCapitalized = relationships[idx].otherEntityFieldCapitalized; _%>
+ <%_ if (relationshipType === 'many-to-one'
+ || (relationshipType === 'one-to-one' && ownerSide === true)
+ || (relationshipType === 'many-to-many' && ownerSide === true && pagination === 'no')) { _%>
+ + <%_ if (otherEntityName === 'user') { _%> + <%_ if (relationshipType === 'many-to-many') { _%> + { + (<%= entityInstance %>.<%= relationshipFieldNamePlural %>) ? + (<%= entityInstance %>.<%= relationshipFieldNamePlural %>.map((val, j) => + {val.<%= otherEntityField %>}{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '} + ) + ) : null + } + <%_ } else { _%> <%_ if (dto === 'no') { _%> - {<%= entityInstance + "." + relationshipFieldName %> ? - /${<%= entityInstance + "." + relationshipFieldName + ".id}" %>`}> - {<%= entityInstance + "." + relationshipFieldName + "." + otherEntityField %>} - : ''} + {<%= entityInstance + "." + relationshipFieldName %> ? <%= entityInstance + "." + relationshipFieldName + "." + otherEntityField %> : ''} <%_ } else { _%> - {<%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %> ? - /${<%= entityInstance + "." + relationshipFieldName + "Id}" %>`}> - {<%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %>} - : ''} + {<%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %> ? <%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %> : ''} + <%_ } _%> + <%_ } _%> + <%_ } else { _%> + <%_ if (relationshipType === 'many-to-many') { _%> + { + (<%= entityInstance %>.<%= relationshipFieldNamePlural %>) ? + (<%= entityInstance %>.<%= relationshipFieldNamePlural %>.map((val, j) => + /${val.id}`}>{val.<%= otherEntityField %>}{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '} + ) + ) : null + } + <%_ } else { _%> + <%_ if (dto === 'no') { _%> + {<%= entityInstance + "." + relationshipFieldName %> ? + /${<%= entityInstance + "." + relationshipFieldName + ".id}" %>`}> + {<%= entityInstance + "." + relationshipFieldName + "." + otherEntityField %>} + : ''} + <%_ } else { _%> + {<%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %> ? + /${<%= entityInstance + "." + relationshipFieldName + "Id}" %>`}> + {<%= entityInstance + "." + relationshipFieldName + otherEntityFieldCapitalized %>} + : ''} + <%_ } _%> <%_ } _%> + <%_ } _%> + | <%_ } _%> - <%_ } _%> - - <%_ } _%> - <%_ } _%> -
-
-
-
-
-
- |
-
- Administrator (usuario=\"admin\" y contraseña=\"admin\")
- Usuario (usuario=\"user\" y contraseña=\"user\")." + "link": "iniciar sesión", + "suffix": ", puede intentar con las cuentas predeterminadas:
- Administrador (usuario=\"admin\" y contraseña=\"admin\")
- Usuario (usuario=\"user\" y contraseña=\"user\")." }, "register": { - "noaccount": "¿No tienes una cuenta todavía?", + "noaccount": "¿Aún no tienes una cuenta?", "link": "Crea una cuenta" } }, @@ -109,7 +109,7 @@ "ribbon": { "dev": "Development" }, - "item-count": "Monstrando {{first}} - {{second}} de {{total}} artículos." + "item-count": "Monstrando {{first}} - {{second}} de {{total}} elementos." }, "entity": { "action": { @@ -119,7 +119,7 @@ "cancel": "Cancelar", "delete": "Eliminar", "edit": "Editar", - "open": "Open", + "open": "Abrir", "save": "Guardar", "view": "Vista" }, @@ -144,15 +144,15 @@ } }, "error": { - "internalServerError": "Internal server error", + "internalServerError": "Error interno en el servidor", "server.not.reachable": "Servidor no accesible", - "url.not.found": "Not found", + "url.not.found": "No existe", "NotNull": "¡El campo {{fieldName}} no puede estar vacío!", "Size": "¡El campo {{fieldName}} no cumple con los requisitos de tamaño mínimo/máximo!", - "userexists": "Login name already used!", - "emailexists": "Email is already in use!", - "idexists": "A new {{entityName}} cannot already have an ID", - "idnull": "Invalid ID" + "userexists": "¡El nombre de usuario ya estiste!", + "emailexists": "¡La cuenta de correo ya está en uso!", + "idexists": "Un/a nuevo/a {{entityName}} no puede tener ID", + "idnull": "ID inválido" }, - "footer": "pie de página" + "footer": "Pie de página" } diff --git a/generators/languages/templates/src/main/webapp/i18n/es/user-management.json b/generators/languages/templates/src/main/webapp/i18n/es/user-management.json index 66db478dd1c8..cdb57bb7ac9f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/es/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/es/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "Crear o editar un usuario" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "¿Seguro que quieres eliminar el usuario {{ login }}?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/et/audits.json b/generators/languages/templates/src/main/webapp/i18n/et/audits.json index 9e2b6f89e547..845ce1c2dfa0 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/et/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "IP aadress:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs index a36c8d9c45be..95392746f015 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs @@ -47,7 +47,7 @@ "health": "Tervis", "configuration": "Konfiguratsioon", "logs": "Logid", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audit", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/fa/audits.json b/generators/languages/templates/src/main/webapp/i18n/fa/audits.json index 30e9eadcf4ff..b1236f5fc219 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/fa/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "آدرس ریموت:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs index f822674d7e89..d1cbcbb6d8b1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs @@ -47,7 +47,7 @@ "health": "سلامتی", "configuration": "پیکربندی", "logs": "وقایع ثبت شده", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "وقایع بازرسی", <%_ } _%> "apidocs": "ایپیآی", diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/activate.json.ejs new file mode 100644 index 000000000000..24f58cf3ef64 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/activate.json.ejs @@ -0,0 +1,27 @@ +<%# + Copyright 2013-2019 the original author or authors from the JHipster project. + + This file is part of the JHipster project, see https://www.jhipster.tech/ + for more information. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +{ + "activate": { + "title": "Aktivoi", + "messages": { + "success": "Käyttäjätilisi on aktivoitu. Ole hyvä ", + "error": "Käyttäjätilisi ei voitu aktivoida. Ole hyvä ja rekisteröidy sovellukseen." + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/audits.json b/generators/languages/templates/src/main/webapp/i18n/fi/audits.json new file mode 100644 index 000000000000..9690465357d0 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/audits.json @@ -0,0 +1,27 @@ +{ + "audits": { + "title": "Audit loki", + "filter": { + "title": "Suodata pvm mukaan", + "from": "alkaen", + "to": "päättyen", + "button": { + "weeks": "viikkoja", + "today": "tänään", + "clear": "putsaa", + "close": "sulje" + } + }, + "table": { + "header": { + "principal": "Käyttäjä", + "date": "Pvm", + "status": "Tila", + "data": "Lisätiedot" + }, + "data": { + "remoteAddress": "Kutsujan osoite:" + } + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/configuration.json b/generators/languages/templates/src/main/webapp/i18n/fi/configuration.json new file mode 100644 index 000000000000..8bc1784c1351 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/configuration.json @@ -0,0 +1,10 @@ +{ + "configuration": { + "title": "Asetukset", + "filter": "Suodatus (by prefix)", + "table": { + "prefix": "Prefix", + "properties": "Asetukset" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/error.json b/generators/languages/templates/src/main/webapp/i18n/fi/error.json new file mode 100644 index 000000000000..462f87a89294 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/error.json @@ -0,0 +1,14 @@ +{ + "error": { + "title": "Virhe!", + "http": { + "400": "Virheellinen pyyntö.", + "403": "Sinulla ei ole oikeuksia tähän sivuun.", + "404": "Pyytämääsi sivua ei ole.", + "405": "Käyttämäsi toiminto ei sovellu pyytämääsi URL-osoitteeseen.", + "500": "Palvelimella tapahtui virhe." + }, + "concurrencyFailure": "Toinen käyttäjä muokkasi samaa sivua samaan aikaan. Tekemäsi muutokset hylättiin.", + "validation": "Palvelimella tapahtui tarkistusvirhe." + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/gateway.json b/generators/languages/templates/src/main/webapp/i18n/fi/gateway.json new file mode 100644 index 000000000000..b857f2211e96 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/gateway.json @@ -0,0 +1,15 @@ +{ + "gateway": { + "title": "Gateway", + "routes": { + "title": "Nykyiset reitit", + "url": "URL", + "service": "Palvelu", + "servers": "Aktiiviset palvelimet", + "error": "Varoitus: palvelimia ei saatavilla!" + }, + "refresh": { + "button": "Päivitä" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs new file mode 100644 index 000000000000..f95f2d865b04 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs @@ -0,0 +1,159 @@ +<%# + Copyright 2013-2019 the original author or authors from the JHipster project. + + This file is part of the JHipster project, see https://www.jhipster.tech/ + for more information. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +{ + "global": { + "title": "<%= capitalizedBaseName %>", + "browsehappy": "Käytät vanhentunutta selainta. Ole hyvä ja päivitä selaimesi parempaa käyttökokemusta varten.", + "menu": { + "home": "Etusivu", + "jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)", + "entities": { + "main": "Entiteetit", + "jhipster-needle-menu-add-entry": "JHipster will add additional entities here (do not translate!)" + }, + "account": { + "main": "Tili", + "settings": "Asetukset", + "password": "Salasanat", + "sessions": "Sessiot", + "login": "Kirjaudu sisään", + "logout": "Kirjaudu ulos", + "register": "Rekisteröidy" + }, + "admin": { + "main": "Hallinto", + <%_ if (applicationType === 'gateway') { _%> + "gateway": "Gateway", + <%_ } _%> + "userManagement": "Käyttäjähallinta", + "tracker": "User tracker", + "metrics": "Metriikat", + "health": "Terveys", + "configuration": "Konfiguraatio", + "logs": "Logit", + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> + "audits": "Audit logit", + <%_ } _%> + "apidocs": "API", + "database": "Tietokanta", + "jhipster-needle-menu-add-admin-element": "JHipster will add additional menu entries here (do not translate!)" + }, + "language": "Kieli" + }, + "form": { + "username.label": "Käyttäjänimi", + "username.placeholder": "Käyttäjänimesi", + "currentpassword.label": "Nykyinen salasana", + "currentpassword.placeholder": "Nykyinen salasana", + "newpassword.label": "Uusi salasana", + "newpassword.placeholder": "Uusi salasana", + "confirmpassword.label": "Uuden salasanan vahvistus", + "confirmpassword.placeholder": "Vahvista uusi salasana", + "email.label": "Sähköposti", + "email.placeholder": "Sähköpostisi" + }, + "messages": { + "info": { + "authenticated": { + "prefix": "Jos haluat ", + "link": "kirjaudu sisään", + "suffix": ", voit koittaa käyttää oletustilejä:
- Administrator (login=\"admin\" ja salasana=\"admin\")
- User (login=\"user\" ja salasana=\"user\")." + }, + "register": { + "noaccount": "Eikö sinulla ole vielä tiliä?", + "link": "Rekisteröi uusi tili" + } + }, + "error": { + "dontmatch": "Salasana ja sen vahvistus eivät ole samoja!" + }, + "validate": { + "newpassword": { + "required": "Salasana on pakollinen.", + "minlength": "Salasanan tulee olla vähintään 4 merkin pituinen.", + "maxlength": "Salasana ei voi olla pitempi kuin 50 merkkiä.", + "strength": "Salasanan vahvuus:" + }, + "confirmpassword": { + "required": "Salasana on pakollinen.", + "minlength": "Salasanan tulee olla vähintään 4 merkin pituinen.", + "maxlength": "Salasana ei voi olla pitempi kuin 50 merkkiä." + }, + "email": { + "required": "Sähköposti on pakollinen.", + "invalid": "Sähköpostisi ei ole validi.", + "minlength": "Sähköpostisi tulee olla vähintään 5 merkin pituinen.", + "maxlength": "Sähköpostisi ei voi olla pitempi kuin 50 merkkiä." + } + } + }, + "field": { + "id": "ID" + }, + "ribbon": { + "dev": "Kehitys" + }, + "item-count": "Näytetään {{first}} - {{second}} yhteensä {{total}}." + }, + "entity": { + "action": { + "addblob": "Lisää blob", + "addimage": "Lisää kuva", + "back": "Takaisin", + "cancel": "Peruuta", + "delete": "Poista", + "edit": "Muokkaa", + "open": "Avaa", + "save": "Tallenna", + "view": "Lue" + }, + "detail": { + "field": "Kenttä", + "value": "Arvo" + }, + "delete": { + "title": "Vahvista poistaminen" + }, + "validation": { + "required": "Tämä kenttä on pakollinen.", + "minlength": "Tämän kentän tulee olla vähintään {{ min }} merkin pituinen.", + "maxlength": "Tämä kenttä voi olla enintään {{ max }} merkkiä.", + "min": "Tämän kentän tulee olla vähintään {{ min }}.", + "max": "Tämä kenttä voi olla enintään {{ max }}.", + "minbytes": "Tämän kentän tulee olla vähintään {{ min }} tavua.", + "maxbytes": "Tämä kenttä voi olla enintään {{ max }} tavua.", + "pattern": "Tämän kentän tulee olla muotoa {{ pattern }}.", + "number": "Tämän kentän tulee olla numero.", + "datetimelocal": "Tämän kentän tulee olla pvm ja aika.", + "patternLogin": "Tämä kenttä voi sisältää kirjaimia, numeroita ja sähköpostiosoitteita." + } + }, + "error": { + "internalServerError": "Palvelinvirhe", + "server.not.reachable": "Palvelinta ei voida tavoittaa", + "url.not.found": "Ei löytynyt", + "NotNull": "Kenttä {{ fieldName }} ei voi olla tyhjä!", + "Size": "Kenttä {{ fieldName }} ei täytä minimi ja maksimi kokorajoituksia!", + "userexists": "Käyttäjänimi on jo käytössä!", + "emailexists": "Sähköposti on jo käytössä!", + "idexists": "Uusi {{ entityName }} ei voi sisältää ID:tä", + "idnull": "ID virheellinen" + }, + "footer": "Tämä on footer teksti" +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs new file mode 100644 index 000000000000..3c88801bb9c1 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs @@ -0,0 +1,60 @@ +<%# + Copyright 2013-2019 the original author or authors from the JHipster project. + + This file is part of the JHipster project, see https://www.jhipster.tech/ + for more information. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +{ + "health": { + "title": "Health Checks", + "refresh.button": "Päivitä", + "stacktrace": "Stacktrace", + "details": { + "details": "Tiedot", + "properties": "Properties", + "name": "Nimi", + "value": "Arvo", + "error": "Virhe" + }, + "indicator": { + <%_ if (messageBroker === 'kafka') { _%> + "binders": "Sanomajono", + <%_ } _%> + <%_ if (applicationType === 'gateway' || serviceDiscoveryType) { _%> + "discoveryComposite": "Discovery Composite", + "refreshScope": "Microservice Refresh Scope", + "configServer": "Microservice Config Server", + "hystrix": "Hystrix",<% if (serviceDiscoveryType === 'consul') { %> + "consul": "Consul",<% } %> + <%_ } _%> + "diskSpace": "Levytila", + "mail": "Sähköposti"<% if (searchEngine === 'elasticsearch') { %>, + "elasticsearch": "Elasticsearch"<% } %><% if (databaseType === 'sql') { %>, + "db": "Database"<% } %><% if (databaseType === 'mongodb') { %>, + "mongo": "MongoDB"<% } %><% if (databaseType === 'cassandra') { %>, + "cassandra": "Cassandra"<% } %><% if (databaseType === 'couchbase') { %>, + "couchbase": "Couchbase"<% } %> + }, + "table": { + "service": "Palvelun nimi", + "status": "Tila" + }, + "status": { + "UNKNOWN": "Tuntematon", + "UP": "Käynnissä", + "DOWN": "sammunut" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/home.json b/generators/languages/templates/src/main/webapp/i18n/fi/home.json new file mode 100644 index 000000000000..8f03945bb664 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/home.json @@ -0,0 +1,19 @@ +{ + "home": { + "title": "Tervetuloa, Java Hipsteri!", + "subtitle": "Tämä on kotisivusi", + "logged": { + "message": "Olet kirjautnut käyttäjänä \"{{username}}\"." + }, + "question": "Jos sinulla on kysymyksiä JHipsteristä:", + "link": { + "homepage": "JHipster kotisivu", + "stackoverflow": "JHipster Stack Overflow", + "bugtracker": "JHipster bug trakkeri", + "chat": "JHipster julkinen chat room", + "follow": "seuraa @java_hipster Twitterissä" + }, + "like": "Jos pidät JHipsteristä, anna meille tähti ", + "github": "GitHubissa" + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/login.json b/generators/languages/templates/src/main/webapp/i18n/fi/login.json new file mode 100644 index 000000000000..fc458e3bde05 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/login.json @@ -0,0 +1,19 @@ +{ + "login": { + "title": "Kirjaudu sisään", + "form": { + "password": "Salasana", + "password.placeholder": "Salasanasi", + "rememberme": "Muista minut", + "button": "Kirjaudu sisään" + }, + "messages": { + "error": { + "authentication": "Kirjautuminen epäonnistui! Tarkista tunnuksesi ja yritä uudelleen." + } + }, + "password": { + "forgot": "Unohditko salasanasi?" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/logs.json b/generators/languages/templates/src/main/webapp/i18n/fi/logs.json new file mode 100644 index 000000000000..c1f0f08ae830 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/logs.json @@ -0,0 +1,11 @@ +{ + "logs": { + "title": "Logit", + "nbloggers": "Yhteensä {{ total }} logittajaa.", + "filter": "Suodatin", + "table": { + "name": "Nimi", + "level": "Taso" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/metrics.json b/generators/languages/templates/src/main/webapp/i18n/fi/metrics.json new file mode 100644 index 000000000000..4312172b3557 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/metrics.json @@ -0,0 +1,102 @@ +{ + "metrics": { + "title": "Sovellusmetriikka", + "refresh.button": "Päivitä", + "updating": "Päivitetään...", + "jvm": { + "title": "JVM metriikka", + "memory": { + "title": "Muisti", + "total": "Total Memory", + "heap": "Heap Memory", + "nonheap": "Non-Heap Memory" + }, + "threads": { + "title": "Säikeet", + "all": "Kaikki", + "runnable": "Runnable", + "timedwaiting": "Timed waiting", + "waiting": "Waiting", + "blocked": "Blocked", + "dump": { + "title": "Threads dump", + "id": "Id: ", + "blockedtime": "Blocked Time", + "blockedcount": "Blocked Count", + "waitedtime": "Waited Time", + "waitedcount": "Waited Count", + "lockname": "Lock name", + "stacktrace": "Stacktrace", + "show": "Show Stacktrace", + "hide": "Hide Stacktrace" + } + }, + "gc": { + "title": "Garbage collections", + "marksweepcount": "Mark Sweep count", + "marksweeptime": "Mark Sweep time", + "scavengecount": "Scavenge count", + "scavengetime": "Scavenge time" + }, + "http": { + "title": "HTTP pyynnöt (ajat millisekunteina)", + "active": "Aktiiviset pyynnöt:", + "total": "Kaikki pyynnöt:", + "table": { + "code": "Koodi", + "count": "Kpl", + "mean": "Mediaani", + "average": "Keskiarvo", + "max": "Suurin" + }, + "code": { + "ok": "Ok", + "notfound": "Not found", + "servererror": "Server Error" + } + } + }, + "servicesstats": { + "title": "Palvelut statistiikka (ajat millisekunteina)", + "table": { + "name": "Palvelun nimi", + "count": "Kpl", + "mean": "Mediaani", + "min": "Pienin", + "max": "Suurin", + "p50": "p50", + "p75": "p75", + "p95": "p95", + "p99": "p99" + } + }, + "cache": { + "title": "Cache tilasto", + "cachename": "Cache nimi", + "hits": "Cache osumat", + "misses": "Cache hutit", + "gets": "Cache luvut", + "puts": "Cache kirjoitukset", + "removals": "Cache poistot", + "evictions": "Cache häädöt", + "hitPercent": "Cache Osuma %", + "missPercent": "Cache Huti %", + "averageGetTime": "Keskimääräinen lukuaika (µs)", + "averagePutTime": "Keskimääräinen kirjoitusaika (µs)", + "averageRemoveTime": "Keskimääräinen poistoaika (µs)" + }, + "datasource": { + "usage": "Yhteys Pool Käyttö", + "title": "Tietokantayhteyden statistiikka (ajat millisekunteina)", + "name": "Poolin käyttö", + "count": "Kpl", + "mean": "Mediaani", + "min": "Pienin", + "max": "Suurin", + "p50": "p50", + "p75": "p75", + "p95": "p95", + "p99": "p99" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/password.json b/generators/languages/templates/src/main/webapp/i18n/fi/password.json new file mode 100644 index 000000000000..803f1119e8bd --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/password.json @@ -0,0 +1,12 @@ +{ + "password": { + "title": "Salasana tunnukselle [{{username}}]", + "form": { + "button": "Tallenna" + }, + "messages": { + "error": "Tapahtui virhe! Salasanaa ei voitu muuttaa.", + "success": "Salasana on vaihdettu!" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/register.json b/generators/languages/templates/src/main/webapp/i18n/fi/register.json new file mode 100644 index 000000000000..543fae7fc4f8 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/register.json @@ -0,0 +1,24 @@ +{ + "register": { + "title": "Rekisteröityminen", + "form": { + "button": "Rekisteröidy" + }, + "messages": { + "validate": { + "login": { + "required": "Käyttäjänimi on pakollinen.", + "minlength": "Käyttäjänimesi tulee olla vähintään yhden merkin pituinen.", + "maxlength": "Käyttäjänimesi ei voi olla pitempi kuin 50 merkkiä.", + "pattern": "Käyttäjänimessäsi voi olla ainoastaan kirjaimia ja numeroita." + } + }, + "success": "Rekisteröityminen tallennettu! Tarkista sähköpostistasi vahvistus.", + "error": { + "fail": "Rekisteröityminen epäonnistui! Ole hyvä ja yritä uudelleen.", + "userexists": "Käyttäjänimi on jo käytössä! Ole hyvä ja valitse toinen.", + "emailexists": "Sähköpostiosoite on jo käytössä! Ole hyvä ja valitse toinen." + } + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/reset.json.ejs new file mode 100644 index 000000000000..348c9e20249a --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/reset.json.ejs @@ -0,0 +1,45 @@ +<%# + Copyright 2013-2019 the original author or authors from the JHipster project. + + This file is part of the JHipster project, see https://www.jhipster.tech/ + for more information. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +{ + "reset": { + "request": { + "title": "Resetoi salasanasi", + "form": { + "button": "Resetoi salasana" + }, + "messages": { + "info": "Syötä rekisteröinnissä käyttämäsi sähköpostiosoite", + "success": "Tarkista sähköpostistasi ohjeet salasanasi resetoimiseen.", + "notfound": "Sähköpostiosoitetta ei ole rekisteröity! Tarkista ja yritä uudelleen." + } + }, + "finish": { + "title": "Resetoi salasanasi", + "form": { + "button": "Validoi uusi salasana" + }, + "messages": { + "info": "Valitse uusi salasana", + "success": "Salasanasi on resetoitu. Ole hyvä ", + "keymissing": "Resetointi avain puuttuu.", + "error": "Salasanaa ei voitu resetoida. Salasanan resetointipyyntö on voimassa vain 24 tuntia." + } + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/sessions.json b/generators/languages/templates/src/main/webapp/i18n/fi/sessions.json new file mode 100644 index 000000000000..3e052cb08e1d --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/sessions.json @@ -0,0 +1,15 @@ +{ + "sessions": { + "title": "Aktiiviset istunnot käyttäjälle [{{username}}]", + "table": { + "ipaddress": "IP osoite", + "useragent": "Agentti", + "date": "Pvm", + "button": "Invalidoi" + }, + "messages": { + "success": "Sessio invalidoitu!", + "error": "Tapahtui virhe! Sessiota ei voitu invalidoida." + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/settings.json b/generators/languages/templates/src/main/webapp/i18n/fi/settings.json new file mode 100644 index 000000000000..acc0834340b4 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/settings.json @@ -0,0 +1,32 @@ +{ + "settings": { + "title": "Käyttäjäasetukset [{{username}}]", + "form": { + "firstname": "Etunimi", + "firstname.placeholder": "Etunimesi", + "lastname": "Sukunimi", + "lastname.placeholder": "Sukunimesi", + "language": "Kieli", + "button": "Tallenna" + }, + "messages": { + "error": { + "fail": "Tapahtui virhe! Asetukset eivät välttämättä tallentuneet.", + "emailexists": "Sähköpostiosoite on jo käytössä! Valitse toinen." + }, + "success": "Asetukset tallennettu!", + "validate": { + "firstname": { + "required": "Etunimi on pakollinen.", + "minlength": "Etunimen tulee olla vähintään yhden merkin pituinen", + "maxlength": "Etunimi ei voi olla pitempi kuin 50 merkin pituinen" + }, + "lastname": { + "required": "Sukunimi on pakollinen.", + "minlength": "Your lasttulee olla vähintään yhden merkin pituinen", + "maxlength": "Sukunimi ei voi olla pitempi kuin 50 merkin pituinen" + } + } + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/tracker.json b/generators/languages/templates/src/main/webapp/i18n/fi/tracker.json new file mode 100644 index 000000000000..86e8e8d16156 --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/tracker.json @@ -0,0 +1,12 @@ +{ + "tracker": { + "title": "Reaaliaikaiset käyttäjätoiminnot", + "table": { + "userlogin": "Käyttäjä", + "ipaddress": "IP osoite", + "userAgent": "Agentti", + "page": "Nykyinen sivu", + "time": "Aika" + } + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fi/user-management.json b/generators/languages/templates/src/main/webapp/i18n/fi/user-management.json new file mode 100644 index 000000000000..1f7618940fff --- /dev/null +++ b/generators/languages/templates/src/main/webapp/i18n/fi/user-management.json @@ -0,0 +1,30 @@ +{ + "userManagement": { + "home": { + "title": "Käyttäjät", + "createLabel": "Luo uusi käyttäjä", + "createOrEditLabel": "Luo tai muokkaa käyttäjää" + }, + "created": "Uusi käyttäjä on luotu tunnuksella {{ param }}", + "updated": "Käyttäjä on päivitetty. Tunnus {{ param }}", + "deleted": "Käyttäjä on poistettu. Tunnus {{ param }}", + "delete": { + "question": "Oletko varma, että haluat poistaa käyttäjän {{ login }}?" + }, + "detail": { + "title": "Käyttäjä" + }, + "login": "Kirjaudu", + "firstName": "Etunimi", + "lastName": "Sukunimi", + "email": "Sähköposti", + "activated": "Aktivoitu", + "deactivated": "Deaktivoitu", + "profiles": "Profiilit", + "langKey": "Kieli", + "createdBy": "Luoja", + "createdDate": "Luotu pvm", + "lastModifiedBy": "Muokkaaja", + "lastModifiedDate": "Muokkaus pvm" + } +} diff --git a/generators/languages/templates/src/main/webapp/i18n/fr/audits.json b/generators/languages/templates/src/main/webapp/i18n/fr/audits.json index d4c4e06ab78e..61eef823d966 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fr/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/fr/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Adresse Distante :" } - } + }, + "notFound": "Aucun audit trouvé" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs index 89a79cab29a4..92c41c8b9524 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs @@ -47,7 +47,7 @@ "health": "Diagnostics", "configuration": "Configuration", "logs": "Logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audits", <%_ } _%> "apidocs": "API", @@ -61,7 +61,7 @@ "username.placeholder": "Votre nom d'utilisateur", "currentpassword.label": "Mot de passe actuel", "currentpassword.placeholder": "Mot de passe actuel", - "newpassword": "Nouveau mot de passe", + "newpassword.label": "Nouveau mot de passe", "newpassword.placeholder": "Nouveau mot de passe", "confirmpassword.label": "Confirmation du nouveau mot de passe", "confirmpassword.placeholder": "Confirmation du nouveau mot de passe", diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/audits.json b/generators/languages/templates/src/main/webapp/i18n/gl/audits.json index 196d8d8b42c3..482bde1c0b1b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/gl/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Dirección remota:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs index cb053ab382d7..2b8e7f9f7223 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs @@ -47,7 +47,7 @@ "health": "Saúde", "configuration": "Configuración", "logs": "Logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Auditorías", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/user-management.json b/generators/languages/templates/src/main/webapp/i18n/gl/user-management.json index bc76796b6389..2e8502e479e9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/gl/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "Crear ou editar un usuario" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "Seguro que quere eliminar o usuario {{ login }}?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/hi/audits.json b/generators/languages/templates/src/main/webapp/i18n/hi/audits.json index 7f705ef497b7..63f9f7b7c58e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/hi/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "दूरस्थ पते:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs index 1bd66cb98064..197eb898b1d3 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs @@ -47,7 +47,7 @@ "health": "स्वास्थ्य", "configuration": "कॉन्फ़िगरेशन", "logs": "लॉग", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "आडिट", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/audits.json b/generators/languages/templates/src/main/webapp/i18n/hu/audits.json index 4bf2cfb7cd34..0347a254cc4f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/hu/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "IP cím:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs index c41106f42a47..4b4cb417b263 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs @@ -47,7 +47,7 @@ "health": "Akalmazás állapota", "configuration": "Konfiguráció", "logs": "Naplók", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Nyomkövetés", <%_ } _%> "apidocs": "API dokumentáció", diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/user-management.json b/generators/languages/templates/src/main/webapp/i18n/hu/user-management.json index 013c5c07b89c..7024d7a47379 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/hu/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "Felhasználó létrehozás vagy módosítás" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "Biztos benne, hogy törölni szeretné az {{ login }} azonosítóval rendelkező felhasználót?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/hy/audits.json b/generators/languages/templates/src/main/webapp/i18n/hy/audits.json index d7a0b5623e88..6ba154bbe6bf 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/hy/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Remote Address:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs index 965a82bbde1e..782247eaba7c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs @@ -47,7 +47,7 @@ "health": "Health", "configuration": "Կարգավորումներ", "logs": "Logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Աուդիտ", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/in/audits.json b/generators/languages/templates/src/main/webapp/i18n/in/audits.json index ffe870abbd34..189a0b3cabe7 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/in/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Alamat Remote:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs index 7d7624eb0ab9..72de0c853e93 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs @@ -47,7 +47,7 @@ "health": "Kesehatan Aplikasi", "configuration": "Konfigurasi", "logs": "Logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audit", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/it/audits.json b/generators/languages/templates/src/main/webapp/i18n/it/audits.json index 10c0abeb88a1..54cccd28828e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/it/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/it/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Indirizzo remoto:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ja/audits.json b/generators/languages/templates/src/main/webapp/i18n/ja/audits.json index c0c2d00d4fd5..0405de19ad5f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/ja/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "リモートアドレス:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ja/user-management.json b/generators/languages/templates/src/main/webapp/i18n/ja/user-management.json index 30c125b6d00b..f5c5e48a224b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/ja/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "Create or edit a user" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "Are you sure you want to delete user {{ login }}?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/audits.json b/generators/languages/templates/src/main/webapp/i18n/ko/audits.json index 1a97184d60c5..50f5566d0d9f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/ko/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "원격 주소:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs index ebe95e8dc15c..a83a81a2ef4f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs @@ -46,7 +46,7 @@ "health": "상태 확인", "configuration": "설정", "logs": "로그", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audit", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/user-management.json b/generators/languages/templates/src/main/webapp/i18n/ko/user-management.json index e7b9e1464267..6cf5401d00fa 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/ko/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "사용자 생성 또는 수정" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "정말로 {{ login }} 사용자를 삭제하시겠습니까?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/mr/audits.json b/generators/languages/templates/src/main/webapp/i18n/mr/audits.json index 9ce0d1143dd5..a9cc8a97b62e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/mr/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "दूरस्थ पत्ता:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs index 7e4790e9f573..1b4f1bd0800e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs @@ -47,7 +47,7 @@ "health": "आरोग्य", "configuration": "संरचना", "logs": "नोंदी", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "ऑडिट", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/my/audits.json b/generators/languages/templates/src/main/webapp/i18n/my/audits.json index 435cbe9141a6..fa0f9dae97d3 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/my/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Remote Address:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs index e9438fb2d58b..07c5889dc33f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs @@ -47,7 +47,7 @@ "health": "စနစ်အခြေအနေ", "configuration": "Configuration များ", "logs": "Log များ", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "စာရင်းစစ်ဆေးခြင်း", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/nl/audits.json b/generators/languages/templates/src/main/webapp/i18n/nl/audits.json index ab1b5bf69511..8a678812d542 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/nl/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Remote Adres:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs index e494f686a314..db14cdb7d0f5 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs @@ -47,7 +47,7 @@ "health": "Status", "configuration": "Configuration", "logs": "Logboek", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audits", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/audits.json b/generators/languages/templates/src/main/webapp/i18n/pl/audits.json index 85a166f760d2..7d2a45854dd9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/pl/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Zdalny adres:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs index 7780e8f41188..defcf8557317 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs @@ -47,7 +47,7 @@ "health": "Status", "configuration": "Konfiguracja", "logs": "Logi", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audyty", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-br/audits.json b/generators/languages/templates/src/main/webapp/i18n/pt-br/audits.json index bb2d51246bc3..12cdbce3d878 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-br/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Endereço remoto:" } - } + }, + "notFound": "Nenhuma auditoria encontrada" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs index 2cd3f8f3f188..260100166abc 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs @@ -47,7 +47,7 @@ "health": "Estado do Sistema", "configuration": "Configuração", "logs": "Logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Auditorias", <%_ } _%> "apidocs": "API", @@ -59,8 +59,8 @@ "form": { "username.label": "Usuário", "username.placeholder": "Seu usuário", - "currentpassword.label": "Current password", - "currentpassword.placeholder": "Current password", + "currentpassword.label": "Senha atual", + "currentpassword.placeholder": "Senha atual", "newpassword.label": "Nova senha", "newpassword.placeholder": "Nova senha", "confirmpassword.label": "Confirmação de nova senha", @@ -107,7 +107,7 @@ "id": "Código" }, "ribbon": { - "dev": "Development" + "dev": "Desenvolvimento" }, "item-count": "Mostrando {{first}} - {{second}} de {{total}} resultados." }, diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/audits.json b/generators/languages/templates/src/main/webapp/i18n/pt-pt/audits.json index 9ad4a6ead9f2..096b94c0e37f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Endereço remoto:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs index 22e247b91fce..60a2aeac83ab 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs @@ -47,7 +47,7 @@ "health": "Estado do Sistema", "configuration": "Configuração", "logs": "Logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Auditorias", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/user-management.json b/generators/languages/templates/src/main/webapp/i18n/pt-pt/user-management.json index dad0d35148eb..0b4ddaba8241 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "Criar ou editar utilizador" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "Tem a certeza que deseja eliminar o utilizador {{ login }}?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/ro/audits.json b/generators/languages/templates/src/main/webapp/i18n/ro/audits.json index f382891e5a26..3ef25eca4683 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/ro/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Adresa:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs index 415c33136013..1a9a35275ab2 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs @@ -50,7 +50,7 @@ "health": "Stare", "configuration": "Configurare", "logs": "Jurnal", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audit", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/ru/audits.json b/generators/languages/templates/src/main/webapp/i18n/ru/audits.json index 70920aa9ce07..2ff100853749 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/ru/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Удалённый адрес:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs index e2e32b088014..888d60007d43 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs @@ -47,7 +47,7 @@ "health": "Состояние", "configuration": "Настройки", "logs": "Логи", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Аудит", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/sk/audits.json b/generators/languages/templates/src/main/webapp/i18n/sk/audits.json index 196d4ac86e22..722870ce2a52 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/sk/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Vzdialená adresa:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs index 8793afaffe95..5ddfcd15fe8f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs @@ -47,7 +47,7 @@ "health": "Stav systému", "configuration": "Konfigurácia", "logs": "Logy", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audity", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/sr/audits.json b/generators/languages/templates/src/main/webapp/i18n/sr/audits.json index 196882868246..25dd58578b1f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/sr/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Adresa pristupa:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs index 727b4e100bcb..8d54a04f822e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs @@ -47,7 +47,7 @@ "health": "Ispravnost sistema", "configuration": "Konfiguracija", "logs": "Logovi", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Revizije", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs index 123819bfe674..580f7e5d330b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs @@ -47,7 +47,7 @@ "health": "Status", "configuration": "Konfigurering", "logs": "Loggar", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Granskningar", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/ta/audits.json b/generators/languages/templates/src/main/webapp/i18n/ta/audits.json index ee71d6db2051..8171c696e81e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/ta/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "தொலை முகவரி:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs index 755220e75ae6..be4f4d64eeda 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs @@ -47,7 +47,7 @@ "health": "ஆரோக்கியம்", "configuration": "கட்டமைப்பு", "logs": "பதிவுகள்", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "தணிக்கைகள்", <%_ } _%> "apidocs": "எபிஐ ", diff --git a/generators/languages/templates/src/main/webapp/i18n/te/audits.json b/generators/languages/templates/src/main/webapp/i18n/te/audits.json index b961a4f6c71d..8045921b130a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/te/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/te/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "రిమోట్ అడ్రస్:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs index 552273cf6710..e2d22761d4d1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs @@ -47,7 +47,7 @@ "health": "పరిస్థితి", "configuration": "ఆకృతీకరణ", "logs": "లాగ్స్", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "తనిఖీలు", <%_ } _%> "apidocs": "API", @@ -59,9 +59,9 @@ "form": { "username": "వాడుకరిపేరు", "username.placeholder": "మీ వాడుకరిపేరు", - "currentpassword": "ప్రస్తుత రహస్య సంకేతపదం", + "currentpassword.label": "ప్రస్తుత రహస్య సంకేతపదం", "currentpassword.placeholder": "ప్రస్తుత రహస్య సంకేతపదం", - "newpassword": "కొత్త రహస్య సంకేతపదం", + "newpassword.label": "కొత్త రహస్య సంకేతపదం", "newpassword.placeholder": "కొత్త రహస్య సంకేతపదం", "confirmpassword": "రహస్య సంకేతపదం ధ్రువీకరణ", "confirmpassword.placeholder": "రహస్య సంకేతపదం ధ్రువీకరణ", diff --git a/generators/languages/templates/src/main/webapp/i18n/th/audits.json b/generators/languages/templates/src/main/webapp/i18n/th/audits.json index 24a88f4d37fa..75e82dd1ec51 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/th/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "ที่อยู่ปลายทาง:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs index 563d6046ddcb..2abd5d993fe1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs @@ -47,7 +47,7 @@ "health": "สถานะระบบ", "configuration": "องค์ประกอบ", "logs": "บันทึกการทำงาน", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "การตรวจสอบ", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/audits.json b/generators/languages/templates/src/main/webapp/i18n/tr/audits.json index 4afe8d8292b6..e07572b949ee 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/tr/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Uzak Adres:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs index 5b79b75b87d6..f68667449b5b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs @@ -47,7 +47,7 @@ "health": "Sağlık", "configuration": "Yapılandırma", "logs": "Kayıtlar", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Denetim", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/user-management.json b/generators/languages/templates/src/main/webapp/i18n/tr/user-management.json index 859f7587fff8..b8bd7c9c305d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/user-management.json +++ b/generators/languages/templates/src/main/webapp/i18n/tr/user-management.json @@ -6,8 +6,8 @@ "createOrEditLabel": "Kullanıcı oluştur veya düzenle" }, "created": "A new user is created with identifier {{ param }}", - "updated": "An user is updated with identifier {{ param }}", - "deleted": "An user is deleted with identifier {{ param }}", + "updated": "A user is updated with identifier {{ param }}", + "deleted": "A user is deleted with identifier {{ param }}", "delete": { "question": "{{ login }} kullanıcısını silmek istediğinize emin misiniz?" }, diff --git a/generators/languages/templates/src/main/webapp/i18n/ua/audits.json b/generators/languages/templates/src/main/webapp/i18n/ua/audits.json index eb692fb16e4d..6e5c4347b23f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/ua/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Віддалена адреса:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs index 0c34171d4b54..7c88d7b95a2f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs @@ -47,7 +47,7 @@ "health": "Стан", "configuration": "Налаштування", "logs": "Логи", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Аудит", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/audits.json b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/audits.json index 2d03fd02760e..346998743731 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Масофадаги манзил:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json index 223aed07fefc..df304d667868 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json @@ -36,9 +36,9 @@ "form": { "username": "Логин", "username.placeholder": "Сизнинг логинингиз", - "currentpassword": "Ҳозирги паролингиз", + "currentpassword.label": "Ҳозирги паролингиз", "currentpassword.placeholder": "Ҳозирги паролингиз", - "newpassword": "Янги парол", + "newpassword.label": "Янги парол", "newpassword.placeholder": "Янги парол", "confirmpassword": "Янги паролнинг тасдиғи", "confirmpassword.placeholder": "Янги паролнинг тасдиғи", diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs index 225b50facede..003120bf648b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs @@ -44,7 +44,7 @@ "health": "Ҳолат", "configuration": "Созламалар", "logs": "Логлар", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Аудит", <%_ } _%> "apidocs": "API", @@ -56,9 +56,9 @@ "form": { "username": "Логин", "username.placeholder": "Сизнинг логинингиз", - "currentpassword": "Ҳозирги паролингиз", + "currentpassword.label": "Ҳозирги паролингиз", "currentpassword.placeholder": "Ҳозирги паролингиз", - "newpassword": "Янги парол", + "newpassword.label": "Янги парол", "newpassword.placeholder": "Янги парол", "confirmpassword": "Янги паролнинг тасдиғи", "confirmpassword.placeholder": "Янги паролнинг тасдиғи", diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/audits.json b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/audits.json index b9946869117b..2678e017ce91 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Ip adres:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs index 32b6afa24733..186f0771694d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs @@ -47,7 +47,7 @@ "health": "Holat", "configuration": "Sozlamalar", "logs": "Loglar", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Audit", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/vi/audits.json b/generators/languages/templates/src/main/webapp/i18n/vi/audits.json index c02cb3fb6b57..465d2d929ab3 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/vi/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "Địa chỉ máy khách:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs index fa4cff5f9cf7..a79043d1baee 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs @@ -47,7 +47,7 @@ "health": "Tình trạng", "configuration": "Cấu hình", "logs": "Ghi logs", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "Kiểm duyệt", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-cn/audits.json b/generators/languages/templates/src/main/webapp/i18n/zh-cn/audits.json index abfda6cc5764..fd6a03c2b24d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "远程地址:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs index 53920d70c01c..31a13ec9f3ed 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs @@ -47,7 +47,7 @@ "health": "服务状态", "configuration": "配置", "logs": "日志", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "审核", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-tw/audits.json b/generators/languages/templates/src/main/webapp/i18n/zh-tw/audits.json index 638d65743570..fb71c41dcd46 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/audits.json +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/audits.json @@ -22,6 +22,7 @@ "data": { "remoteAddress": "遠端位址:" } - } + }, + "notFound": "No audit found" } } diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs index 8659173e5578..ad6674108f62 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs @@ -47,7 +47,7 @@ "health": "服務狀態", "configuration": "設定", "logs": "紀錄", - <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%> + <%_ if ((databaseType !== 'no' || authenticationType === 'uaa') && databaseType !== 'cassandra') { _%> "audits": "稽核", <%_ } _%> "apidocs": "API", diff --git a/generators/languages/templates/src/test/resources/i18n/messages_fi.properties.ejs b/generators/languages/templates/src/test/resources/i18n/messages_fi.properties.ejs new file mode 100644 index 000000000000..cdf4c291dbce --- /dev/null +++ b/generators/languages/templates/src/test/resources/i18n/messages_fi.properties.ejs @@ -0,0 +1,4 @@ +email.test.title=testi otsikko +# Value used for English locale unit test in MailServiceIT +# as this file is loaded instead of real file +email.activation.title=<%= baseName %> tili aktivointi diff --git a/generators/languages/templates/src/test/resources/i18n/messages_pt_BR.properties.ejs b/generators/languages/templates/src/test/resources/i18n/messages_pt_BR.properties.ejs index b6bb721ad1f1..7710cb8054ba 100644 --- a/generators/languages/templates/src/test/resources/i18n/messages_pt_BR.properties.ejs +++ b/generators/languages/templates/src/test/resources/i18n/messages_pt_BR.properties.ejs @@ -1 +1,4 @@ -email.test.title=ativação +email.test.title=Título de Teste +# Value used for English locale unit test in MailServiceIT +# as this file is loaded instead of real file +email.activation.title=<%= baseName %> ativação \ No newline at end of file diff --git a/generators/openshift/templates/deployment.yml.ejs b/generators/openshift/templates/deployment.yml.ejs index daaf60b3cf84..1d50a2266328 100644 --- a/generators/openshift/templates/deployment.yml.ejs +++ b/generators/openshift/templates/deployment.yml.ejs @@ -233,10 +233,10 @@ objects: value: http://${APPLICATION_NAME}-elasticsearch:9200 <%_ } _%> <%_ if (app.messageBroker === 'kafka') { _%> - - name: SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS - value: jhipster-kafka - - name: SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES - value: jhipster-zookeeper + - name: SPRING_KAFKA_CONSUMER_BOOTSTRAP_SERVERS + value: jhipster-kafka:9092 + - name: SPRING_KAFKA_PRODUCER_BOOTSTRAP_SERVERS + value: jhipster-kafka:9092 <%_ } _%> <%_ if (monitoring === 'elk') { _%> - name: JHIPSTER_METRICS_LOGS_ENABLED diff --git a/generators/openshift/templates/messagebroker/kafka.yml.ejs b/generators/openshift/templates/messagebroker/kafka.yml.ejs index 53b1ce5fc6ab..18e131b435f6 100644 --- a/generators/openshift/templates/messagebroker/kafka.yml.ejs +++ b/generators/openshift/templates/messagebroker/kafka.yml.ejs @@ -134,6 +134,13 @@ objects: containers: - name: ${ZK_APPLICATION_NAME} image: <%= DOCKER_ZOOKEEPER %> + env: + - name: ZOOKEEPER_CLIENT_PORT + value: 2181 + - name: ZOOKEEPER_TICK_TIME + value: 2000 + - name: ZOOKEEPER_SYNC_LIMIT + value: 2 ports: - containerPort: 2181 volumeMounts: @@ -203,14 +210,14 @@ objects: - name: ${APPLICATION_NAME} image: <%= DOCKER_KAFKA %> env: - - name: KAFKA_ADVERTISED_HOST_NAME - value: ${APPLICATION_NAME} - - name: KAFKA_ADVERTISED_PORT - value: '9092' + - name: KAFKA_ADVERTISED_LISTENERS + value: PLAINTEXT://${APPLICATION_NAME}:9092 - name: KAFKA_ZOOKEEPER_CONNECT - value: ${ZK_APPLICATION_NAME} - - name: KAFKA_CREATE_TOPICS - value: 'topic-jhipster:1:1' + value: ${ZK_APPLICATION_NAME}:2181 + - name: KAFKA_BROKER_ID + value: 2 + - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR + value: 1 ports: - containerPort: 9092 volumeMounts: diff --git a/generators/server/files.js b/generators/server/files.js index 341708966953..7518c330c730 100644 --- a/generators/server/files.js +++ b/generators/server/files.js @@ -444,6 +444,14 @@ const serverFiles = { { file: 'package/security/oauth2/AudienceValidator.java', renameTo: generator => `${generator.javaDir}security/oauth2/AudienceValidator.java` + }, + { + file: 'package/security/oauth2/JwtAuthorityExtractor.java', + renameTo: generator => `${generator.javaDir}security/oauth2/JwtAuthorityExtractor.java` + }, + { + file: 'package/security/oauth2/OAuthIdpTokenResponseDTO.java', + renameTo: generator => `${generator.javaDir}security/oauth2/OAuthIdpTokenResponseDTO.java` } ] }, @@ -503,10 +511,6 @@ const serverFiles = { file: 'package/config/apidoc/GatewaySwaggerResourcesProvider.java', renameTo: generator => `${generator.javaDir}config/apidoc/GatewaySwaggerResourcesProvider.java` }, - { - file: 'package/gateway/ratelimiting/RateLimitingFilter.java', - renameTo: generator => `${generator.javaDir}gateway/ratelimiting/RateLimitingFilter.java` - }, { file: 'package/gateway/accesscontrol/AccessControlFilter.java', renameTo: generator => `${generator.javaDir}gateway/accesscontrol/AccessControlFilter.java` @@ -522,6 +526,17 @@ const serverFiles = { } ] }, + { + condition: generator => + generator.applicationType === 'gateway' && generator.serviceDiscoveryType && generator.cacheProvider === 'hazelcast', + path: SERVER_MAIN_SRC_DIR, + templates: [ + { + file: 'package/gateway/ratelimiting/RateLimitingFilter.java', + renameTo: generator => `${generator.javaDir}gateway/ratelimiting/RateLimitingFilter.java` + } + ] + }, { condition: generator => generator.applicationType === 'gateway' && generator.authenticationType === 'jwt' && generator.serviceDiscoveryType, @@ -594,6 +609,10 @@ const serverFiles = { (generator.applicationType === 'monolith' || generator.applicationType === 'gateway'), path: SERVER_MAIN_SRC_DIR, templates: [ + { + file: 'package/web/rest/AuthInfoResource.java', + renameTo: generator => `${generator.javaDir}web/rest/AuthInfoResource.java` + }, { file: 'package/web/rest/LogoutResource.java', renameTo: generator => `${generator.javaDir}web/rest/LogoutResource.java` @@ -957,16 +976,6 @@ const serverFiles = { renameTo: generator => `${generator.javaDir}config/ElasticsearchConfiguration.java` } ] - }, - { - condition: generator => generator.messageBroker === 'kafka', - path: SERVER_MAIN_SRC_DIR, - templates: [ - { - file: 'package/config/MessagingConfiguration.java', - renameTo: generator => `${generator.javaDir}config/MessagingConfiguration.java` - } - ] } ], serverJavaDomain: [ @@ -1020,6 +1029,22 @@ const serverFiles = { templates: [ { file: 'package/service/util/RandomUtil.java', renameTo: generator => `${generator.javaDir}service/util/RandomUtil.java` } ] + }, + { + condition: generator => generator.messageBroker === 'kafka', + path: SERVER_MAIN_SRC_DIR, + templates: [ + { + file: 'package/service/KafkaConsumer.java', + renameTo: generator => + `${generator.javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaConsumer.java` + }, + { + file: 'package/service/KafkaProducer.java', + renameTo: generator => + `${generator.javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaProducer.java` + } + ] } ], serverJavaWebError: [ @@ -1094,6 +1119,17 @@ const serverFiles = { renameTo: generator => `${generator.javaDir}web/rest/ClientForwardController.java` } ] + }, + { + condition: generator => generator.messageBroker === 'kafka', + path: SERVER_MAIN_SRC_DIR, + templates: [ + { + file: 'package/web/rest/KafkaResource.java', + renameTo: generator => + `${generator.javaDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResource.java` + } + ] } ], serverJavaWebsocket: [ @@ -1315,6 +1351,17 @@ const serverFiles = { renameTo: generator => `${generator.testDir}security/DomainUserDetailsServiceIT.java` } ] + }, + { + condition: generator => generator.messageBroker === 'kafka', + path: SERVER_TEST_SRC_DIR, + templates: [ + { + file: 'package/web/rest/KafkaResourceIT.java', + renameTo: generator => + `${generator.testDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResourceIT.java` + } + ] } ], serverJavaUserManagement: [ diff --git a/generators/server/index.js b/generators/server/index.js index 6fb4403a2bb1..95ded221ce62 100644 --- a/generators/server/index.js +++ b/generators/server/index.js @@ -28,7 +28,7 @@ const constants = require('../generator-constants'); const statistics = require('../statistics'); const { getBase64Secret, getRandomHex } = require('../utils'); -let useBlueprint; +let useBlueprints; module.exports = class extends BaseBlueprintGenerator { constructor(args, opts) { @@ -59,17 +59,9 @@ module.exports = class extends BaseBlueprintGenerator { this.uaaBaseName = this.options.uaaBaseName || this.configOptions.uaaBaseName || this.config.get('uaaBaseName'); this.setupServerOptions(this); - const blueprint = this.options.blueprint || this.configOptions.blueprint || this.config.get('blueprint'); - if (!opts.fromBlueprint) { - // use global variable since getters dont have access to instance property - useBlueprint = this.composeBlueprint(blueprint, 'server', { - ...this.options, - 'client-hook': !this.skipClient, - configOptions: this.configOptions - }); - } else { - useBlueprint = false; - } + + useBlueprints = !opts.fromBlueprint && this.instantiateBlueprints('server', { 'client-hook': !this.skipClient }); + this.registerPrettierTransform(); } @@ -169,11 +161,7 @@ module.exports = class extends BaseBlueprintGenerator { } this.cacheProvider = configuration.get('cacheProvider') || configuration.get('hibernateCache') || 'no'; - this.enableHibernateCache = - configuration.get('enableHibernateCache') || - (configuration.get('hibernateCache') !== undefined && - configuration.get('hibernateCache') !== 'no' && - configuration.get('hibernateCache') !== 'memcached'); + this.enableHibernateCache = configuration.get('enableHibernateCache') && !['no', 'memcached'].includes(this.cacheProvider); this.databaseType = configuration.get('databaseType'); if (this.databaseType === 'mongodb') { @@ -192,7 +180,9 @@ module.exports = class extends BaseBlueprintGenerator { this.devDatabaseType = 'no'; this.prodDatabaseType = 'no'; this.enableHibernateCache = false; - this.skipUserManagement = true; + if (this.authenticationType !== 'uaa') { + this.skipUserManagement = true; + } } else { // sql this.devDatabaseType = configuration.get('devDatabaseType'); @@ -298,7 +288,7 @@ module.exports = class extends BaseBlueprintGenerator { } get initializing() { - if (useBlueprint) return; + if (useBlueprints) return; return this._initializing(); } @@ -338,7 +328,7 @@ module.exports = class extends BaseBlueprintGenerator { } get prompting() { - if (useBlueprint) return; + if (useBlueprints) return; return this._prompting(); } @@ -417,7 +407,7 @@ module.exports = class extends BaseBlueprintGenerator { } get configuring() { - if (useBlueprint) return; + if (useBlueprints) return; return this._configuring(); } @@ -460,7 +450,7 @@ module.exports = class extends BaseBlueprintGenerator { } get default() { - if (useBlueprint) return; + if (useBlueprints) return; return this._default(); } @@ -470,7 +460,7 @@ module.exports = class extends BaseBlueprintGenerator { } get writing() { - if (useBlueprint) return; + if (useBlueprints) return; return this._writing(); } @@ -493,7 +483,7 @@ module.exports = class extends BaseBlueprintGenerator { } get install() { - if (useBlueprint) return; + if (useBlueprints) return; return this._install(); } @@ -525,7 +515,7 @@ module.exports = class extends BaseBlueprintGenerator { } get end() { - if (useBlueprint) return; + if (useBlueprints) return; return this._end(); } }; diff --git a/generators/server/needle-api/needle-server-liquibase.js b/generators/server/needle-api/needle-server-liquibase.js index 31b7d1168bdc..7c04bfbfc10d 100644 --- a/generators/server/needle-api/needle-server-liquibase.js +++ b/generators/server/needle-api/needle-server-liquibase.js @@ -48,6 +48,13 @@ module.exports = class extends needleServer { this.addBlockContentToFile(rewriteFileModel, errorMessage); } + addLoadColumnToEntityChangeSet(filePath, content) { + const errorMessage = 'LoadColumn not added.'; + const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-liquibase-add-loadcolumn', content); + + this.addBlockContentToFile(rewriteFileModel, errorMessage); + } + addChangesetToEntityChangelog(filePath, content) { const errorMessage = 'Changeset not added.'; const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-liquibase-add-changeset', content); diff --git a/generators/server/needle-api/needle-server-maven.js b/generators/server/needle-api/needle-server-maven.js index 320baecd3ae7..8fa54fdad60b 100644 --- a/generators/server/needle-api/needle-server-maven.js +++ b/generators/server/needle-api/needle-server-maven.js @@ -138,6 +138,22 @@ module.exports = class extends needleServer { this.addBlockContentToFile(rewriteFileModel, errorMessage); } + addAnnotationProcessor(groupId, artifactId, version) { + const errorMessage = `${chalk.yellow( + ' Reference to ' + )}maven annotation processor (groupId: ${groupId}, artifactId:${artifactId}, version:${version}) + ${chalk.yellow(' not added.\n')}`; + // prettier-ignore + const annotationProcessorPath = `${'
@@ -64,10 +66,10 @@ public class GatewayConfiguration {
public RateLimitingConfiguration(JHipsterProperties jHipsterProperties) {
this.jHipsterProperties = jHipsterProperties;
}
-
@Bean
public RateLimitingFilter rateLimitingFilter() {
return new RateLimitingFilter(jHipsterProperties);
}
}
+ <%_ } _%>
}
diff --git a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs
index 48ca959db3c1..a3fee471a3ce 100644
--- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs
+++ b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs
@@ -20,77 +20,79 @@ package <%= packageName %>.config;
<%_ if (authenticationType === 'session' || authenticationType === 'jwt' || authenticationType === 'oauth2') { _%>
import <%= packageName %>.security.*;
-<%_ if (authenticationType === 'jwt') { _%>
+ <%_ if (authenticationType === 'jwt') { _%>
import <%= packageName %>.security.jwt.*;
-<%_ } _%>
-<%_ if (authenticationType === 'session') { _%>
+ <%_ } _%>
+ <%_ if (authenticationType === 'session') { _%>
- <%_ if (!skipUserManagement) { _%>
+ <%_ if (!skipUserManagement) { _%>
import io.github.jhipster.config.JHipsterProperties;
- <%_ } _%>
+ <%_ } _%>
import io.github.jhipster.security.*;
-<%_ } _%>
+ <%_ } _%>
-<%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
+ <%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.factory.InitializingBean;
-<%_ } _%>
+ <%_ } _%>
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
-<%_ if (authenticationType !== 'uaa' && !(applicationType === 'microservice' && authenticationType === 'oauth2')) { _%>
+ <%_ if (authenticationType !== 'uaa' && !(applicationType === 'microservice' && authenticationType === 'oauth2')) { _%>
import org.springframework.http.HttpMethod;
-<%_ } _%>
+ <%_ } _%>
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-<%_ if (authenticationType !== 'uaa' && !(applicationType === 'microservice' && authenticationType === 'oauth2')) { _%>
+ <%_ if (authenticationType !== 'uaa' && !(applicationType === 'microservice' && authenticationType === 'oauth2')) { _%>
import org.springframework.security.config.annotation.web.builders.WebSecurity;
-<%_ } _%>
+ <%_ } _%>
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-<%_ if (authenticationType === 'jwt' || (authenticationType === 'oauth2' && applicationType === 'microservice')) { _%>
+ <%_ if (authenticationType === 'jwt' || (authenticationType === 'oauth2' && applicationType === 'microservice')) { _%>
import org.springframework.security.config.http.SessionCreationPolicy;
-<%_ } _%>
-<%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
+ <%_ } _%>
+ <%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
-<%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+ <%_ } _%>
+ <%_ if (authenticationType === 'oauth2') { _%>
import <%= packageName %>.security.oauth2.AudienceValidator;
+import <%=packageName%>.security.SecurityUtils;
import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
import org.springframework.security.oauth2.core.OAuth2TokenValidator;
import org.springframework.security.oauth2.jwt.*;
- <%_ if (applicationType === 'gateway') { _%>
+ <%_ if (applicationType === 'gateway') { _%>
import <%=packageName%>.security.oauth2.AuthorizationHeaderFilter;
import <%=packageName%>.security.oauth2.AuthorizationHeaderUtil;
- <%_ } _%>
+ <%_ } _%>
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
+ <%_ if (applicationType !== 'microservice') { _%>
import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
-import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-<%_ } _%>
-<%_ if (authenticationType === 'session') { _%>
- <%_ if (!skipUserManagement) { _%>
-import org.springframework.security.web.authentication.RememberMeServices;
+ <%_ } _%>
+import java.util.*;
<%_ } _%>
+ <%_ if (authenticationType === 'session') { _%>
+ <%_ if (!skipUserManagement) { _%>
+import org.springframework.security.web.authentication.RememberMeServices;
+ <%_ } _%>
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
import org.springframework.security.web.csrf.CsrfFilter;
-<%_ } _%>
-<%_ if (authenticationType === 'oauth2' && applicationType !== 'microservice') { _%>
+ <%_ } _%>
+ <%_ if (authenticationType === 'oauth2' && applicationType !== 'microservice') { _%>
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
import org.springframework.security.web.csrf.CsrfFilter;
-<%_ } _%>
-<%_ if (authenticationType === 'jwt' && applicationType !== 'microservice') { _%>
+ <%_ } _%>
+ <%_ if (authenticationType === 'oauth2') { _%>
+import <%=packageName%>.security.oauth2.JwtAuthorityExtractor;
+ <%_ } _%>
+ <%_ if (authenticationType === 'jwt' && applicationType !== 'microservice') { _%>
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-<%_ } _%>
-<%_ if (applicationType !== 'microservice') { _%>
+ <%_ } _%>
+import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
+ <%_ if (applicationType !== 'microservice') { _%>
import org.springframework.web.filter.CorsFilter;
-<%_ } _%>
+ <%_ } _%>
import org.zalando.problem.spring.web.advice.security.SecurityProblemSupport;
@EnableWebSecurity
@@ -115,21 +117,26 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Value("${spring.security.oauth2.client.provider.oidc.issuer-uri}")
private String issuerUri;
+
+ private final JwtAuthorityExtractor jwtAuthorityExtractor;
<%_ } _%>
private final SecurityProblemSupport problemSupport;
- public SecurityConfiguration(<% if (authenticationType === 'session' && !skipUserManagement) { %>JHipsterProperties jHipsterProperties, RememberMeServices rememberMeServices, <% } if (authenticationType === 'jwt') { %>TokenProvider tokenProvider, <% } %><% if (applicationType !== 'microservice') { %>CorsFilter corsFilter, <% } %>SecurityProblemSupport problemSupport) {
- <%_ if (authenticationType === 'session' && !skipUserManagement) { _%>
+ public SecurityConfiguration(<% if (authenticationType === 'session' && !skipUserManagement) { %>JHipsterProperties jHipsterProperties, RememberMeServices rememberMeServices, <% } if (authenticationType === 'jwt') { %>TokenProvider tokenProvider, <% } %><% if (applicationType !== 'microservice') { %>CorsFilter corsFilter, <% } %><% if (authenticationType === 'oauth2') { %>JwtAuthorityExtractor jwtAuthorityExtractor, <% } %>SecurityProblemSupport problemSupport) {
+ <%_ if (authenticationType === 'session' && !skipUserManagement) { _%>
this.jHipsterProperties = jHipsterProperties;
this.rememberMeServices = rememberMeServices;
- <%_ } _%>
- <%_ if (authenticationType === 'jwt') { _%>
+ <%_ } _%>
+ <%_ if (authenticationType === 'jwt') { _%>
this.tokenProvider = tokenProvider;
- <%_ } _%>
- <%_ if (applicationType !== 'microservice') { _%>
+ <%_ } _%>
+ <%_ if (applicationType !== 'microservice') { _%>
this.corsFilter = corsFilter;
- <%_ } _%>
+ <%_ } _%>
this.problemSupport = problemSupport;
+ <%_ if (authenticationType === 'oauth2') { _%>
+ this.jwtAuthorityExtractor = jwtAuthorityExtractor;
+ <%_ } _%>
}
<%_ if (authenticationType === 'session') { _%>
@@ -142,8 +149,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
public AjaxAuthenticationFailureHandler ajaxAuthenticationFailureHandler() {
return new AjaxAuthenticationFailureHandler();
}
- <%_ } _%>
- <%_ if (authenticationType === 'session') { _%>
@Bean
public AjaxLogoutSuccessHandler ajaxLogoutSuccessHandler() {
@@ -157,20 +162,20 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
return new BCryptPasswordEncoder();
}
<%_ } _%>
- <%_ if (authenticationType !== 'uaa' && !(applicationType === 'microservice' && authenticationType === 'oauth2')) { _%>
+ <%_ if (authenticationType !== 'uaa' && applicationType !== 'microservice') { _%>
@Override
- public void configure(WebSecurity web) throws Exception {
+ public void configure(WebSecurity web) {
web.ignoring()
.antMatchers(HttpMethod.OPTIONS, "/**")
- <%_ if (!skipClient) { _%>
+ <%_ if (!skipClient) { _%>
.antMatchers("/app/**/*.{js,html}")
.antMatchers("/i18n/**")
.antMatchers("/content/**")
- <%_ } _%>
- <%_ if (devDatabaseType === 'h2Disk' || devDatabaseType === 'h2Memory') { _%>
+ <%_ } _%>
+ <%_ if (devDatabaseType === 'h2Disk' || devDatabaseType === 'h2Memory') { _%>
.antMatchers("/h2-console/**")
- <%_ } _%>
+ <%_ } _%>
.antMatchers("/swagger-ui/index.html")
.antMatchers("/test/**");
}
@@ -181,93 +186,102 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
// @formatter:off
http
.csrf()
- <%_ if (['session','oauth2'].includes(authenticationType) && applicationType !== 'microservice') { _%>
+ <%_ if (['session','oauth2'].includes(authenticationType) && applicationType !== 'microservice') { _%>
.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
.and()
- <%_ } else{ _%>
+ <%_ } else { _%>
.disable()
- <%_ } _%>
- <%_ if (applicationType !== 'microservice') { _%>
- <%_ if (authenticationType === 'jwt') { _%>
+ <%_ } _%>
+ <%_ if (applicationType !== 'microservice') { _%>
+ <%_ if (authenticationType === 'jwt') { _%>
.addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class)
- <%_ } else if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>
+ <%_ } else if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>
.addFilterBefore(corsFilter, CsrfFilter.class)
- <%_ } _%>
- <%_ } _%>
+ <%_ } _%>
+ <%_ } _%>
.exceptionHandling()
- <%_ if (authenticationType !== 'oauth2') { _%>
+ <%_ if (authenticationType !== 'oauth2') { _%>
.authenticationEntryPoint(problemSupport)
- <%_ } _%>
+ <%_ } _%>
.accessDeniedHandler(problemSupport)
- <%_ if (authenticationType === 'session') { _%>
- <%_ if (!skipUserManagement) { _%>
+ <%_ if (authenticationType === 'session') { _%>
+ <%_ if (!skipUserManagement) { _%>
.and()
.rememberMe()
.rememberMeServices(rememberMeServices)
.rememberMeParameter("remember-me")
.key(jHipsterProperties.getSecurity().getRememberMe().getKey())
- <%_ } _%>
+ <%_ } _%>
.and()
.formLogin()
.loginProcessingUrl("/api/authentication")
.successHandler(ajaxAuthenticationSuccessHandler())
.failureHandler(ajaxAuthenticationFailureHandler())
.permitAll()
- <%_ } _%>
- <%_ if (authenticationType === 'session') { _%>
.and()
.logout()
.logoutUrl("/api/logout")
.logoutSuccessHandler(ajaxLogoutSuccessHandler())
.permitAll()
- <%_ } _%>
+ <%_ } _%>
.and()
.headers()
+ .contentSecurityPolicy("default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:")
+ .and()
+ .referrerPolicy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
+ .and()
+ .featurePolicy("geolocation 'none'; midi 'none'; sync-xhr 'none'; microphone 'none'; camera 'none'; magnetometer 'none'; gyroscope 'none'; speaker 'none'; fullscreen 'self'; payment 'none'")
+ .and()
.frameOptions()
- .disable()
+ .deny()
.and()
- <%_ if (authenticationType === 'jwt' || (authenticationType === 'oauth2' && applicationType === 'microservice')) { _%>
+ <%_ if (authenticationType === 'jwt' || (authenticationType === 'oauth2' && applicationType === 'microservice')) { _%>
.sessionManagement()
.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and()
- <%_ } _%>
+ <%_ } _%>
.authorizeRequests()
- <%_ if (authenticationType !== 'oauth2') { _%>
+ <%_ if (authenticationType !== 'oauth2') { _%>
.antMatchers("/api/authenticate").permitAll()
- <%_ } _%>
- <%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
+ <%_ } _%>
+ <%_ if (authenticationType !== 'oauth2' && !skipUserManagement) { _%>
.antMatchers("/api/register").permitAll()
.antMatchers("/api/activate").permitAll()
.antMatchers("/api/account/reset-password/init").permitAll()
.antMatchers("/api/account/reset-password/finish").permitAll()
- <%_ } _%>
- .antMatchers("/api/**").authenticated()
- <%_ if (authenticationType === 'oauth2') { _%>
+ <%_ } _%>
+ <%_ if (authenticationType === 'oauth2') { _%>
.antMatchers("/api/auth-info").permitAll()
- <%_ } _%>
- <%_ if (websocket === 'spring-websocket') { _%>
+ <%_ } _%>
+ .antMatchers("/api/**").authenticated()
+ <%_ if (websocket === 'spring-websocket') { _%>
.antMatchers("/websocket/tracker").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/websocket/**").permitAll()
- <%_ } _%>
+ <%_ } _%>
.antMatchers("/management/health").permitAll()
.antMatchers("/management/info").permitAll()
.antMatchers("/management/prometheus").permitAll()
.antMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN)<%_ if (authenticationType === 'session') { %>;<% } %>
- <%_ if (authenticationType === 'jwt') { _%>
- <%_ if (applicationType === 'monolith') { _%>
+ <%_ if (authenticationType === 'jwt') { _%>
+ <%_ if (applicationType === 'monolith') { _%>
.and()
.httpBasic()
- <%_ } _%>
+ <%_ } _%>
.and()
.apply(securityConfigurerAdapter());
- <%_ } else if (authenticationType === 'oauth2') { _%>
- <%_ if (['monolith', 'gateway'].includes(applicationType)) { _%>
+ <%_ } else if (authenticationType === 'oauth2') { _%>
+ <%_ if (['monolith', 'gateway'].includes(applicationType)) { _%>
.and()
.oauth2Login()
- <%_ } _%>
- .and()
- .oauth2ResourceServer().jwt();
<%_ } _%>
+ .and()
+ .oauth2ResourceServer()
+ .jwt()
+ .jwtAuthenticationConverter(jwtAuthorityExtractor)
+ .and()
+ .and()
+ .oauth2Client();
+ <%_ } _%>
// @formatter:on
}
<%_ if (authenticationType === 'jwt') { _%>
@@ -278,6 +292,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
<%_ } _%>
<%_ if (authenticationType === 'oauth2') { _%>
+ <%_ if (applicationType !== 'microservice') { _%>
/**
* Map authorities from "groups" or "roles" claim in ID Token.
*
@@ -285,26 +300,18 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
* the IdP to Spring Security Authorities.
*/
@Bean
- @SuppressWarnings("unchecked")
public GrantedAuthoritiesMapper userAuthoritiesMapper() {
return (authorities) -> {
Set{{ msg }}
+