diff --git a/client/src/app/core/pdf-services/pdf-document.service.ts b/client/src/app/core/pdf-services/pdf-document.service.ts index 47f1c62c9..8a0527c3e 100644 --- a/client/src/app/core/pdf-services/pdf-document.service.ts +++ b/client/src/app/core/pdf-services/pdf-document.service.ts @@ -256,9 +256,11 @@ export class PdfDocumentService { if (logoHeaderLeftUrl && logoHeaderRightUrl) { text = ''; } else { + const general_event_name = this.configService.instant('general_event_name'); + const general_event_description = this.configService.instant('general_event_name'); const line1 = [ - this.translate.instant(this.configService.instant('general_event_name')), - this.translate.instant(this.configService.instant('general_event_description')) + this.translate.instant(general_event_name), + this.translate.instant(general_event_description) ] .filter(Boolean) .join(' – '); diff --git a/client/src/app/core/repositories/users/user-repository.service.ts b/client/src/app/core/repositories/users/user-repository.service.ts index 5c6bbc31b..ce2076b6e 100644 --- a/client/src/app/core/repositories/users/user-repository.service.ts +++ b/client/src/app/core/repositories/users/user-repository.service.ts @@ -300,8 +300,10 @@ export class UserRepositoryService extends BaseRepository { const user_ids = users.map(user => user.id); - const subject = this.translate.instant(this.configService.instant('users_email_subject')); - const message = this.translate.instant(this.configService.instant('users_email_body')); + const users_email_subject = this.configService.instant('users_email_subject'); + const users_email_body = this.configService.instant('users_email_body'); + const subject = this.translate.instant(users_email_subject); + const message = this.translate.instant(users_email_body); const response = await this.httpService.post<{ count: Number; no_email_ids: number[] }>( '/rest/users/user/mass_invite_email/', diff --git a/client/src/app/core/translate/marked-translations.ts b/client/src/app/core/translate/marked-translations.ts index 0608a9568..5a0f6e206 100644 --- a/client/src/app/core/translate/marked-translations.ts +++ b/client/src/app/core/translate/marked-translations.ts @@ -362,6 +362,7 @@ _( _('Username or password is not correct.'); _('Guest'); _('Participant'); +_('No users with email {0} found.'); // default groups _('Default'); diff --git a/client/src/app/site/common/components/start/start.component.html b/client/src/app/site/common/components/start/start.component.html index 0cb9e172b..747e1daf3 100644 --- a/client/src/app/site/common/components/start/start.component.html +++ b/client/src/app/site/common/components/start/start.component.html @@ -5,7 +5,7 @@ -
+

{{ welcomeTitle | translate }}

diff --git a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html index 654182cf0..067edb1ac 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html @@ -1,4 +1,4 @@ -

+

Submitters