Updated translations

This commit is contained in:
Emanuel Schütze 2019-09-03 22:43:44 +02:00
parent 3b64ca0954
commit 89375ae133
13 changed files with 37 additions and 19 deletions

View File

@ -256,9 +256,11 @@ export class PdfDocumentService {
if (logoHeaderLeftUrl && logoHeaderRightUrl) { if (logoHeaderLeftUrl && logoHeaderRightUrl) {
text = ''; text = '';
} else { } else {
const general_event_name = this.configService.instant<string>('general_event_name');
const general_event_description = this.configService.instant<string>('general_event_name');
const line1 = [ const line1 = [
this.translate.instant(this.configService.instant('general_event_name')), this.translate.instant(general_event_name),
this.translate.instant(this.configService.instant('general_event_description')) this.translate.instant(general_event_description)
] ]
.filter(Boolean) .filter(Boolean)
.join(' '); .join(' ');

View File

@ -300,8 +300,10 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User, UserTi
*/ */
public async bulkSendInvitationEmail(users: ViewUser[]): Promise<string> { public async bulkSendInvitationEmail(users: ViewUser[]): Promise<string> {
const user_ids = users.map(user => user.id); const user_ids = users.map(user => user.id);
const subject = this.translate.instant(this.configService.instant('users_email_subject')); const users_email_subject = this.configService.instant<string>('users_email_subject');
const message = this.translate.instant(this.configService.instant('users_email_body')); const users_email_body = this.configService.instant<string>('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[] }>( const response = await this.httpService.post<{ count: Number; no_email_ids: number[] }>(
'/rest/users/user/mass_invite_email/', '/rest/users/user/mass_invite_email/',

View File

@ -362,6 +362,7 @@ _(
_('Username or password is not correct.'); _('Username or password is not correct.');
_('Guest'); _('Guest');
_('Participant'); _('Participant');
_('No users with email {0} found.');
// default groups // default groups
_('Default'); _('Default');

View File

@ -5,7 +5,7 @@
</os-head-bar> </os-head-bar>
<mat-card class="os-card"> <mat-card class="os-card">
<div class="app-content" translate> <div class="app-content">
<h1>{{ welcomeTitle | translate }}</h1> <h1>{{ welcomeTitle | translate }}</h1>
<div [innerHTML]="welcomeText"></div> <div [innerHTML]="welcomeText"></div>

View File

@ -1,4 +1,4 @@
<h4 translate> <h4>
<span translate>Submitters</span> <span translate>Submitters</span>
<button <button
class="small-button" class="small-button"

View File

@ -62,7 +62,8 @@ export class MotionPdfExportService {
*/ */
public exportMotionCatalog(motions: ViewMotion[], exportInfo: MotionExportInfo): void { public exportMotionCatalog(motions: ViewMotion[], exportInfo: MotionExportInfo): void {
const doc = this.pdfCatalogService.motionListToDocDef(motions, exportInfo); const doc = this.pdfCatalogService.motionListToDocDef(motions, exportInfo);
const filename = this.translate.instant(this.configService.instant<string>('motions_export_title')); const motions_export_title = this.configService.instant<string>('motions_export_title');
const filename = this.translate.instant(motions_export_title);
const metadata = { const metadata = {
title: filename title: filename
}; };

View File

@ -559,8 +559,9 @@ export class MotionPdfService {
* @returns doc def for the motion text * @returns doc def for the motion text
*/ */
private createPreamble(motion: ViewMotion): object { private createPreamble(motion: ViewMotion): object {
const motions_preamble = this.configService.instant<string>('motions_preamble');
return { return {
text: `${this.translate.instant(this.configService.instant('motions_preamble'))}`, text: `${this.translate.instant(motions_preamble)}`,
margin: [0, 10, 0, 10] margin: [0, 10, 0, 10]
}; };
} }

View File

@ -207,13 +207,15 @@ export class UserPdfService {
* @returns pdfMake definitions * @returns pdfMake definitions
*/ */
private createWelcomeText(): object { private createWelcomeText(): object {
const users_pdf_welcometitle = this.configService.instant<string>('users_pdf_welcometitle');
const users_pdf_welcometext = this.configService.instant<string>('users_pdf_welcometext');
return [ return [
{ {
text: this.translate.instant(this.configService.instant<string>('users_pdf_welcometitle')), text: this.translate.instant(users_pdf_welcometitle),
style: 'userDataHeading' style: 'userDataHeading'
}, },
{ {
text: this.translate.instant(this.configService.instant<string>('users_pdf_welcometext')), text: this.translate.instant(users_pdf_welcometext),
style: 'userDataTopic' style: 'userDataTopic'
} }
]; ];

File diff suppressed because one or more lines are too long

View File

@ -5,11 +5,11 @@ msgid ""
msgstr "" msgstr ""
"Last-Translator: Emanuel Schütze <emanuel.schuetze@intevation.de>, 2019\n" "Last-Translator: Emanuel Schütze <emanuel.schuetze@intevation.de>, 2019\n"
"Language-Team: German (https://www.transifex.com/openslides/teams/14270/de/)\n" "Language-Team: German (https://www.transifex.com/openslides/teams/14270/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: de\n" "Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"mime-version: 1.0\n"
msgid "%num% emails were send sucessfully." msgid "%num% emails were send sucessfully."
msgstr "%num% E-Mails wurden erfolgreich versandt." msgstr "%num% E-Mails wurden erfolgreich versandt."
@ -1535,6 +1535,9 @@ msgstr "Keine Satzungsabschnitte vorhanden"
msgid "No tags" msgid "No tags"
msgstr "Keine Schlagwörter" msgstr "Keine Schlagwörter"
msgid "No users with email {0} found."
msgstr "Es wurde kein Nutzer mit E-Mail-Adresse {0} gefunden."
msgid "No." msgid "No."
msgstr "Nr." msgstr "Nr."

File diff suppressed because one or more lines are too long

View File

@ -6,11 +6,11 @@ msgid ""
msgstr "" msgstr ""
"Last-Translator: Andreas Engler <engel.a@web.de>, 2019\n" "Last-Translator: Andreas Engler <engel.a@web.de>, 2019\n"
"Language-Team: Russian (https://www.transifex.com/openslides/teams/14270/ru/)\n" "Language-Team: Russian (https://www.transifex.com/openslides/teams/14270/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: ru\n" "Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
"mime-version: 1.0\n"
msgid "%num% emails were send sucessfully." msgid "%num% emails were send sucessfully."
msgstr "%num% электронных писем отправлено успешно." msgstr "%num% электронных писем отправлено успешно."
@ -1156,7 +1156,7 @@ msgid "Initiate update check for all clients"
msgstr "Начать проверку обновлений для всех клиентов" msgstr "Начать проверку обновлений для всех клиентов"
msgid "Inline" msgid "Inline"
msgstr "В очереди" msgstr "В пределах"
msgid "Input format: DD.MM.YYYY HH:MM" msgid "Input format: DD.MM.YYYY HH:MM"
msgstr "Формат ввода: ДД.ММ.ГГГГ ЧЧ:ММ" msgstr "Формат ввода: ДД.ММ.ГГГГ ЧЧ:ММ"
@ -1527,6 +1527,9 @@ msgstr "Нет пункта параграфов"
msgid "No tags" msgid "No tags"
msgstr "Нет тегов" msgstr "Нет тегов"
msgid "No users with email {0} found."
msgstr ""
msgid "No." msgid "No."
msgstr "Нет." msgstr "Нет."
@ -1583,7 +1586,7 @@ msgid "Numbered per category"
msgstr "Нумерованный по категории" msgstr "Нумерованный по категории"
msgid "Numbering" msgid "Numbering"
msgstr "Нумерованный" msgstr "Нумерация"
msgid "Numbering prefix for agenda items" msgid "Numbering prefix for agenda items"
msgstr "Префикс нумерации пунктов повестки дня" msgstr "Префикс нумерации пунктов повестки дня"
@ -1644,7 +1647,7 @@ msgid "Original version"
msgstr "Исходная версия" msgstr "Исходная версия"
msgid "Outside" msgid "Outside"
msgstr "Вне" msgstr "Снаружи"
msgid "Overlay" msgid "Overlay"
msgstr "Накладка" msgstr "Накладка"
@ -1818,7 +1821,7 @@ msgid "Project"
msgstr "Проект" msgstr "Проект"
msgid "Project selection?" msgid "Project selection?"
msgstr "Выбор проекта?" msgstr "Выбор проецировать?"
msgid "Projection defaults" msgid "Projection defaults"
msgstr "Проекция по умолчанию" msgstr "Проекция по умолчанию"

View File

@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"MIME-Version: 1.0\n" "mime-version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -1471,6 +1471,9 @@ msgstr ""
msgid "No tags" msgid "No tags"
msgstr "" msgstr ""
msgid "No users with email {0} found."
msgstr ""
msgid "No." msgid "No."
msgstr "" msgstr ""