Commit ec4362a8d29a4db303e5f4d9c2991c1ee3dd2c42
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
a2b7e1c0
added list with tls versions for outgoing-mail-settings
Showing
18 changed files
with
7 additions
and
17 deletions
| ... | ... | @@ -25,6 +25,8 @@ export default function AdminController(adminService, toast, $scope, $rootScope, |
| 25 | 25 | return protocol; |
| 26 | 26 | }); |
| 27 | 27 | |
| 28 | + vm.tlsVersions = ['TLSv1.0', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3']; | |
| 29 | + | |
| 28 | 30 | $translate('admin.test-mail-sent').then(function (translation) { |
| 29 | 31 | vm.testMailSent = translation; |
| 30 | 32 | }, function (translationId) { | ... | ... |
| ... | ... | @@ -82,7 +82,11 @@ |
| 82 | 82 | aria-label="{{ 'admin.enable-tls' | translate }}" ng-model="vm.settings.jsonValue.enableTls">{{ 'admin.enable-tls' | translate }}</md-checkbox> |
| 83 | 83 | <md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableTls"> |
| 84 | 84 | <label translate>admin.tls-version</label> |
| 85 | - <input name="tlsVersion" placeholder="{{ 'admin.enter-tls-version' | translate }}" ng-model="vm.settings.jsonValue.tlsVersion"> | |
| 85 | + <md-select ng-disabled="$root.loading" ng-model="vm.settings.jsonValue.tlsVersion"> | |
| 86 | + <md-option ng-repeat="tlsVersion in vm.tlsVersions" value="{{tlsVersion}}"> | |
| 87 | + {{tlsVersion}} | |
| 88 | + </md-option> | |
| 89 | + </md-select> | |
| 86 | 90 | </md-input-container> |
| 87 | 91 | <md-input-container class="md-block"> |
| 88 | 92 | <label translate>common.username</label> | ... | ... |
| ... | ... | @@ -84,7 +84,6 @@ |
| 84 | 84 | "timeout-invalid": "Das ist keine gültige Wartezeit.", |
| 85 | 85 | "enable-tls": "TLS aktivieren", |
| 86 | 86 | "tls-version" : "TLS-Version", |
| 87 | - "enter-tls-version" : "Geben Sie die TLS-Version ein", | |
| 88 | 87 | "send-test-mail": "Test E-Mail senden", |
| 89 | 88 | "security-settings": "Sicherheitseinstellungen", |
| 90 | 89 | "password-policy": "Kennwortrichtlinie", | ... | ... |
| ... | ... | @@ -89,7 +89,6 @@ |
| 89 | 89 | "timeout-invalid": "Αυτή δε φαίνεται να είναι μια έγκυρη τιμή timeout.", |
| 90 | 90 | "enable-tls": "Ενεργοποίηση TLS", |
| 91 | 91 | "tls-version": "Έκδοση TLS", |
| 92 | - "enter-tls-version" : "Εισαγάγετε την έκδοση TLS", | |
| 93 | 92 | "send-test-mail": "Αποστολή δοκιμαστικού μηνύματος", |
| 94 | 93 | "use-system-mail-settings": "Χρήση των ρυθμίσεων διακομιστή αλληλογραφίας συστήματος", |
| 95 | 94 | "mail-templates": "Πρότυπα αλληλογραφίας", | ... | ... |
| ... | ... | @@ -87,7 +87,6 @@ |
| 87 | 87 | "timeout-invalid": "That doesn't look like a valid timeout.", |
| 88 | 88 | "enable-tls": "Enable TLS", |
| 89 | 89 | "tls-version": "TLS version", |
| 90 | - "enter-tls-version" : "Enter TLS version", | |
| 91 | 90 | "send-test-mail": "Send test mail", |
| 92 | 91 | "security-settings": "Security settings", |
| 93 | 92 | "password-policy": "Password policy", | ... | ... |
| ... | ... | @@ -86,7 +86,6 @@ |
| 86 | 86 | "timeout-invalid": "Eso no parece un tiempo de espera válido.", |
| 87 | 87 | "enable-tls": "Habilitar TLS", |
| 88 | 88 | "tls-version": "Versión TLS", |
| 89 | - "enter-tls-version" : "Ingrese la versión de TLS", | |
| 90 | 89 | "send-test-mail": "Enviar correo de prueba", |
| 91 | 90 | "password-policy": "Política de contraseñas", |
| 92 | 91 | "security-settings": "Configuraciones de seguridad", | ... | ... |
| ... | ... | @@ -57,7 +57,6 @@ |
| 57 | 57 | "base-url-required": "L'URL de base est requise.", |
| 58 | 58 | "enable-tls": "Activer TLS", |
| 59 | 59 | "tls-version": "Version TLS", |
| 60 | - "enter-tls-version" : "Entrez la version TLS", | |
| 61 | 60 | "general": "Général", |
| 62 | 61 | "general-settings": "Paramètres généraux", |
| 63 | 62 | "mail-from": "Mail de", | ... | ... |
| ... | ... | @@ -85,7 +85,6 @@ |
| 85 | 85 | "timeout-invalid": "Timeout non valido.", |
| 86 | 86 | "enable-tls": "Abilita TLS", |
| 87 | 87 | "tls-version" : "Versione TLS", |
| 88 | - "enter-tls-version" : "Inserisci la versione TLS", | |
| 89 | 88 | "send-test-mail": "Invia mail di test", |
| 90 | 89 | "security-settings": "Settaggi di sicurezza", |
| 91 | 90 | "password-policy": "Politica password", | ... | ... |
| ... | ... | @@ -86,7 +86,6 @@ |
| 86 | 86 | "timeout-invalid": "Недействительный таймаут.", |
| 87 | 87 | "enable-tls": "Включить TLS", |
| 88 | 88 | "tls-version" : "Версия TLS", |
| 89 | - "enter-tls-version" : "Введите версию TLS", | |
| 90 | 89 | "send-test-mail": "Отправить пробное письмо", |
| 91 | 90 | "security-settings": "Настройки безопасности", |
| 92 | 91 | "password-policy": "Политика паролей", | ... | ... |
| ... | ... | @@ -84,7 +84,6 @@ |
| 84 | 84 | "timeout-invalid": "Bu geçerli bir zaman aşımı gibi görünmüyor.", |
| 85 | 85 | "enable-tls": "TLS'i etkinleştir.", |
| 86 | 86 | "tls-version" : "TLS sürümü", |
| 87 | - "enter-tls-version" : "TLS sürümünü girin", | |
| 88 | 87 | "send-test-mail": "Test e-postası gönder" |
| 89 | 88 | }, |
| 90 | 89 | "alarm": { | ... | ... |
| ... | ... | @@ -88,7 +88,6 @@ |
| 88 | 88 | "timeout-invalid": "Це не схоже на правильний час очікування.", |
| 89 | 89 | "enable-tls": "Увімкнути TLS", |
| 90 | 90 | "tls-version" : "Версія TLS", |
| 91 | - "enter-tls-version" : "Вкажіть версію TLS", | |
| 92 | 91 | "send-test-mail": "Надіслати тестове повідомлення", |
| 93 | 92 | "use-system-mail-settings": "Використовувати параметри системного поштового сервера", |
| 94 | 93 | "mail-templates": "Шаблони електронної пошти", | ... | ... |