Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Adina Țeudan 2021-07-26 13:59:41 +03:00
parent 0762dd3f62
commit 8f2c39a4be
2 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts
View File

@ -12,6 +12,7 @@ import { AppConfigService } from '../../../app-config/app-config.service';
import { AutoUnsubscribeComponent } from '../../../shared/base/auto-unsubscribe.component';
import { Toaster } from '../../../../services/toaster.service';
import { LoadingService } from '../../../../services/loading.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@Component({
selector: 'redaction-general-config-screen',
@ -124,9 +125,9 @@ export class GeneralConfigScreenComponent extends AutoUnsubscribeComponent imple
this._loadingService.start();
try {
await this._smtpConfigService.testSMTPConfiguration(this.smtpForm.getRawValue()).toPromise();
this._toaster.success('smtp-config-screen.test.success');
this._toaster.success(_('general-config-screen.test.success'));
} catch (e) {
this._toaster.error('smtp-config-screen.test.error');
this._toaster.error(_('general-config-screen.test.error'));
} finally {
this._loadingService.stop();
}

94
apps/red-ui/src/assets/i18n/en.json
View File

@ -981,6 +981,50 @@
"people": "Dossier Member(s)",
"status": "Status"
},
"general-config-screen": {
"actions": {
"save": "Save Configurations",
"test-connection": "Test Connection"
},
"app-name": {
"label": "Application Name",
"placeholder": "RedactManager"
},
"form": {
"auth": "Enable Authentication",
"change-credentials": "Change Credentials",
"envelope-from": "Envelope From",
"envelope-from-hint": "Info text regarding envelope from field.",
"envelope-from-placeholder": "Sender Envelope Email Address",
"from": "From",
"from-display-name": "Name for Sender",
"from-display-name-hint": "Info text regarding the name for sender.",
"from-display-name-placeholder": "Display Name for Sender Email Address",
"from-placeholder": "Sender Email Address",
"host": "Host",
"host-placeholder": "SMTP Host",
"port": "Port",
"reply-to": "Reply To",
"reply-to-display-name": "Name for Reply To",
"reply-to-display-name-placeholder": "Display Name for Reply To Email Address",
"reply-to-placeholder": "Reply To Email Address",
"ssl": "Enable SSL",
"starttls": "Enable StartTLS"
},
"general": {
"form": {
"forgot-password": "Show Forgot password link on Login screen"
},
"subtitle": "",
"title": "General Configurations"
},
"subtitle": "SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.",
"test": {
"error": "Test email could not be sent! Please revise the email address.",
"success": "Test email was sent successfully!"
},
"title": "Configure SMTP Account"
},
"hint": "Hint",
"image-category": {
"formula": "Formula",
@ -1111,11 +1155,7 @@
"value": "Value"
},
"report-type": {
"excel-multi-file": "Excel (for all)",
"excel-single-file": "Excel (per file)",
"label": "{length} report {length, plural, one{type} other{types}}",
"word-single-file-appendix-a1": "Justification Appendix A1",
"word-single-file-appendix-a2": "Justification Appendix A2"
"label": "{length} report {length, plural, one{type} other{types}}"
},
"reports": "Reports",
"reports-screen": {
@ -1170,50 +1210,6 @@
},
"title": "Enable Authentication"
},
"general-config-screen": {
"actions": {
"save": "Save Configurations",
"test-connection": "Test Connection"
},
"app-name": {
"label": "Application Name",
"placeholder": "RedactManager"
},
"form": {
"auth": "Enable Authentication",
"change-credentials": "Change Credentials",
"envelope-from": "Envelope From",
"envelope-from-hint": "Info text regarding envelope from field.",
"envelope-from-placeholder": "Sender Envelope Email Address",
"from": "From",
"from-display-name": "Name for Sender",
"from-display-name-hint": "Info text regarding the name for sender.",
"from-display-name-placeholder": "Display Name for Sender Email Address",
"from-placeholder": "Sender Email Address",
"host": "Host",
"host-placeholder": "SMTP Host",
"port": "Port",
"reply-to": "Reply To",
"reply-to-display-name": "Name for Reply To",
"reply-to-display-name-placeholder": "Display Name for Reply To Email Address",
"reply-to-placeholder": "Reply To Email Address",
"ssl": "Enable SSL",
"starttls": "Enable StartTLS"
},
"general": {
"form": {
"forgot-password": "Show Forgot password link on Login screen"
},
"subtitle": "",
"title": "General Configurations"
},
"subtitle": "SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.",
"test": {
"error": "Test email could not be sent! Please revise the email address.",
"success": "Test email was sent successfully!"
},
"title": "Configure SMTP Account"
},
"time": {
"days": "{days} {days, plural, one{day} other{days}}",
"hours": "{hours} {hours, plural, one{hour} other{hours}}",