diff --git a/src/menu-left.pug b/src/menu-left.pug index e5411a4384fd868fc427657f5365f18435ae1684..b3a751801301932d2d6af110c5fb9d67177305bc 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -20,7 +20,7 @@ solid-widget(name='hubl-create') br span(data-trans="menuLeft.emptyCircleProject.createNew") span - solid-link(next='admin', data-trans="menuLeft.emptyCircleProject.adminPanel") + solid-link(next="${value == 'projet' ? 'admin-projects' : 'admin-circles'}", data-trans="menuLeft.emptyCircleProject.adminPanel") solid-widget(name='hubl-menu-fix-url-circle') template diff --git a/src/scripts/intl.js b/src/scripts/intl.js index 167794d14cbd4696d0ecdee35e2d29c76ecb7a8b..d4c84e46031e338262c88374cf9e704728a945b0 100644 --- a/src/scripts/intl.js +++ b/src/scripts/intl.js @@ -39,6 +39,12 @@ class JsI18n { if (attr == "html") { this.translateNodeContent(node, k); } else { + if(node.tagName == "SOLID-DELETE") { + let button = node.querySelector('button'); + if(button != null) { + this.translateNodeContent(button, k); + } + } this.translateNodeContent(node.attributes[attr], k); } } diff --git a/src/views/admin/page-admin-users-create.pug b/src/views/admin/page-admin-users-create.pug index c39ee6f0695cd3521bb2ebf1b8f7ed217f93ae5f..66e7c47535ac61cc7df2139b79b24a6fb4c71689 100644 --- a/src/views/admin/page-admin-users-create.pug +++ b/src/views/admin/page-admin-users-create.pug @@ -61,5 +61,5 @@ div.content-box__info.flex next='admin-communities-list' submit-button='' - data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;user.create.labelEmail;submit-button=user.create.buttonSubmit' + data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;label-user.email=user.create.labelEmail;submit-button=user.create.buttonSubmit' ) diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index d17e155b4f715550996d5734fd0fb70c7ff21dbf..c56d36aea903fd2e201e48523da4b93b09b649e7 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -68,7 +68,7 @@ div.content-box__info widget-user='solid-form-dropdown-autocompletion' submit-button='' - data-trans='circle.edit.buttonAddMember' + data-trans='submit-button=circle.edit.buttonAddMember' ) .table-wrapper