ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4988 from emanuelschuetze/translations-20190909

Browse Source 
Updated translations
This commit is contained in:
Emanuel Schütze 2019-09-09 11:34:38 +02:00 committed by GitHub
commit 2c58d0f0fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/core/pdf-services/pdf-document.service.ts
View File

@ -256,9 +256,11 @@ export class PdfDocumentService {
if (logoHeaderLeftUrl && logoHeaderRightUrl) {
text = '';
} 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 = [
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(' – ');

6
client/src/app/core/repositories/users/user-repository.service.ts
View File

@ -300,8 +300,10 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User, UserTi
*/
public async bulkSendInvitationEmail(users: ViewUser[]): Promise<string> {
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<string>('users_email_subject');
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[] }>(
'/rest/users/user/mass_invite_email/',

1
client/src/app/core/translate/marked-translations.ts
View File

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

2
client/src/app/site/common/components/start/start.component.html
View File

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

2
client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html
View File

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

3
client/src/app/site/motions/services/motion-pdf-export.service.ts
View File

@ -62,7 +62,8 @@ export class MotionPdfExportService {
*/
public exportMotionCatalog(motions: ViewMotion[], exportInfo: MotionExportInfo): void {
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 = {
title: filename
};

3
client/src/app/site/motions/services/motion-pdf.service.ts
View File

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

6
client/src/app/site/users/services/user-pdf.service.ts
View File

@ -207,13 +207,15 @@ export class UserPdfService {
* @returns pdfMake definitions
*/
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 [
{
text: this.translate.instant(this.configService.instant<string>('users_pdf_welcometitle')),
text: this.translate.instant(users_pdf_welcometitle),
style: 'userDataHeading'
},
{
text: this.translate.instant(this.configService.instant<string>('users_pdf_welcometext')),
text: this.translate.instant(users_pdf_welcometext),
style: 'userDataTopic'
}
];

2
client/src/assets/i18n/de.json
View File

File diff suppressed because one or more lines are too long

5
client/src/assets/i18n/de.po
View File

@ -5,11 +5,11 @@ msgid ""
msgstr ""
"Last-Translator: Emanuel Schütze <emanuel.schuetze@intevation.de>, 2019\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-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"mime-version: 1.0\n"
msgid "%num% emails were send sucessfully."
msgstr "%num% E-Mails wurden erfolgreich versandt."
@ -1535,6 +1535,9 @@ msgstr "Keine Satzungsabschnitte vorhanden"
msgid "No tags"
msgstr "Keine Schlagwörter"
msgid "No users with email {0} found."
msgstr "Es wurde kein Nutzer mit E-Mail-Adresse {0} gefunden."
msgid "No."
msgstr "Nr."

2
client/src/assets/i18n/ru.json
View File

File diff suppressed because one or more lines are too long

13
client/src/assets/i18n/ru.po
View File

@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Last-Translator: Andreas Engler <engel.a@web.de>, 2019\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-Transfer-Encoding: 8bit\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"
"mime-version: 1.0\n"
msgid "%num% emails were send sucessfully."
msgstr "%num% электронных писем отправлено успешно."
@ -1156,7 +1156,7 @@ msgid "Initiate update check for all clients"
msgstr "Начать проверку обновлений для всех клиентов"
msgid "Inline"
msgstr "В очереди"
msgstr "В пределах"
msgid "Input format: DD.MM.YYYY HH:MM"
msgstr "Формат ввода: ДД.ММ.ГГГГ ЧЧ:ММ"
@ -1527,6 +1527,9 @@ msgstr "Нет пункта параграфов"
msgid "No tags"
msgstr "Нет тегов"
msgid "No users with email {0} found."
msgstr ""
msgid "No."
msgstr "Нет."
@ -1583,7 +1586,7 @@ msgid "Numbered per category"
msgstr "Нумерованный по категории"
msgid "Numbering"
msgstr "Нумерованный"
msgstr "Нумерация"
msgid "Numbering prefix for agenda items"
msgstr "Префикс нумерации пунктов повестки дня"
@ -1644,7 +1647,7 @@ msgid "Original version"
msgstr "Исходная версия"
msgid "Outside"
msgstr "Вне"
msgstr "Снаружи"
msgid "Overlay"
msgstr "Накладка"
@ -1818,7 +1821,7 @@ msgid "Project"
msgstr "Проект"
msgid "Project selection?"
msgstr "Выбор проекта?"
msgstr "Выбор проецировать?"
msgid "Projection defaults"
msgstr "Проекция по умолчанию"

5
client/src/assets/i18n/template-en.pot
View File

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