Skip to content

Commit

Permalink
Merge pull request #21204 from abpframework/auto-merge/rel-9-0/3139
Browse files Browse the repository at this point in the history
Merge branch dev with rel-9.0
  • Loading branch information
maliming authored Oct 28, 2024
2 parents 338f865 + 0af86fc commit c0893cf
Show file tree
Hide file tree
Showing 30 changed files with 62 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Volo.Abp.SettingManagement;
public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSettingsAppService
{
protected ISettingManager SettingManager { get; }

protected IEmailSender EmailSender { get; }

public EmailSettingsAppService(ISettingManager settingManager, IEmailSender emailSender)
Expand All @@ -30,7 +30,6 @@ public virtual async Task<EmailSettingsDto> GetAsync()
SmtpHost = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Host),
SmtpPort = Convert.ToInt32(await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Port)),
SmtpUserName = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.UserName),
SmtpPassword = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Password),
SmtpDomain = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Domain),
SmtpEnableSsl = Convert.ToBoolean(await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.EnableSsl)),
SmtpUseDefaultCredentials = Convert.ToBoolean(await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.UseDefaultCredentials)),
Expand All @@ -42,7 +41,6 @@ public virtual async Task<EmailSettingsDto> GetAsync()
{
settingsDto.SmtpHost = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.Host, CurrentTenant.GetId(), false);
settingsDto.SmtpUserName = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.UserName, CurrentTenant.GetId(), false);
settingsDto.SmtpPassword = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.Password, CurrentTenant.GetId(), false);
settingsDto.SmtpDomain = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.Domain, CurrentTenant.GetId(), false);
}

Expand All @@ -56,7 +54,10 @@ public virtual async Task UpdateAsync(UpdateEmailSettingsDto input)
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Host, input.SmtpHost);
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Port, input.SmtpPort.ToString());
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.UserName, input.SmtpUserName);
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Password, input.SmtpPassword);
if (!input.SmtpPassword.IsNullOrWhiteSpace())
{
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Password, input.SmtpPassword);
}
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Domain, input.SmtpDomain);
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.EnableSsl, input.SmtpEnableSsl.ToString());
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.UseDefaultCredentials, input.SmtpUseDefaultCredentials.ToString().ToLowerInvariant());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<Validation MessageLocalizer="@LH.Localize">
<Field>
<FieldLabel>@L["SmtpPassword"]</FieldLabel>
<TextEdit Role="TextRole.Password" @bind-Text="@EmailSettings.SmtpPassword">
<TextEdit Role="TextRole.Password" @bind-Text="@EmailSettings.SmtpPassword" Placeholder="@L["SmtpPasswordPlaceholder"].Value">
<Feedback>
<ValidationError/>
</Feedback>
Expand All @@ -99,7 +99,7 @@
}
<SubmitButton Clicked="@UpdateSettingsAsync"/>
</Column>

</Row>
</Form>

Expand Down Expand Up @@ -164,4 +164,4 @@
</ModalContent>
</Modal>
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "تمكين إدارة الإعداد",
"Feature:SettingManagementEnableDescription": "تفعيل إعداد نظام الإدارة في التطبيق.",
"Feature:AllowChangingEmailSettings": "السماح لتغيير إعدادات البريد الإلكتروني.",
"Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني."
"Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني.",
"SmtpPasswordPlaceholder": "أدخل قيمة لتحديث كلمة المرور",
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Povolit správu nastavení",
"Feature:SettingManagementEnableDescription": "Povolit systém správy nastavení v aplikaci.",
"Feature:AllowChangingEmailSettings": "Povolit změnu nastavení e-mailu.",
"Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu."
"Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu.",
"SmtpPasswordPlaceholder": "Zadejte hodnotu pro aktualizaci hesla",
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Einstellungsverwaltung aktivieren",
"Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.",
"Feature:AllowChangingEmailSettings": "Änderung der E-Mail-Einstellungen zulassen.",
"Feature:AllowChangingEmailSettingsDescription": "Änderung der E-Mail-Einstellungen zulassen."
"Feature:AllowChangingEmailSettingsDescription": "Änderung der E-Mail-Einstellungen zulassen.",
"SmtpPasswordPlaceholder": "Geben Sie einen Wert ein, um das Passwort zu aktualisieren"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Aktivieren Sie die Einstellungsverwaltung",
"Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.",
"Feature:AllowChangingEmailSettings": "Erlauben Sie das Ändern der E-Mail-Einstellungen.",
"Feature:AllowChangingEmailSettingsDescription": "Erlauben Sie das Ändern der E-Mail-Einstellungen."
"Feature:AllowChangingEmailSettingsDescription": "Erlauben Sie das Ändern der E-Mail-Einstellungen.",
"SmtpPasswordPlaceholder": "Geben Sie einen Wert ein, um das Passwort zu aktualisieren"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Feature:SettingManagementEnable": "Ενεργοποίηση διαχείρισης ρυθμίσεων",
"Feature:SettingManagementEnableDescription": "Ενεργοποίηση συστήματος διαχείρισης ρυθμίσεων στην εφαρμογή.",
"Feature:AllowChangingEmailSettings": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.",
"Feature:AllowChangingEmailSettingsDescription": "Επιτρέψτε την αλλαγή των ρυθμίσεων email."
"Feature:AllowChangingEmailSettingsDescription": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.",
"SmtpPasswordPlaceholder": "Εισαγάγετε μια τιμή για ενημέρωση κωδικού πρόσβασης"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Enable setting management",
"Feature:SettingManagementEnableDescription": "Enable setting management system in the application.",
"Feature:AllowChangingEmailSettings": "Allow changing email settings.",
"Feature:AllowChangingEmailSettingsDescription": "Allow changing email settings."
"Feature:AllowChangingEmailSettingsDescription": "Allow changing email settings.",
"SmtpPasswordPlaceholder": "Enter a value to update password"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Habilitar la gestión de la configuración",
"Feature:SettingManagementEnableDescription": "Habilite el sistema de gestión de la configuración en la aplicación.",
"Feature:AllowChangingEmailSettings": "Permitir cambiar la configuración de correo electrónico.",
"Feature:AllowChangingEmailSettingsDescription": "Permitir cambiar la configuración de correo electrónico."
"Feature:AllowChangingEmailSettingsDescription": "Permitir cambiar la configuración de correo electrónico.",
"SmtpPasswordPlaceholder": "Ingrese un valor para actualizar la contraseña"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Ota asetusten hallinta käyttöön",
"Feature:SettingManagementEnableDescription": "Ota asetustenhallintajärjestelmä käyttöön sovelluksessa.",
"Feature:AllowChangingEmailSettings": "Salli sähköpostiasetusten muuttaminen.",
"Feature:AllowChangingEmailSettingsDescription": "Salli sähköpostiasetusten muuttaminen."
"Feature:AllowChangingEmailSettingsDescription": "Salli sähköpostiasetusten muuttaminen.",
"SmtpPasswordPlaceholder": "Syötä arvo päivittääksesi salasana"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Activer la gestion des paramètres",
"Feature:SettingManagementEnableDescription": "Activer le système de gestion des paramètres dans l'application.",
"Feature:AllowChangingEmailSettings": "Autoriser la modification des paramètres de messagerie.",
"Feature:AllowChangingEmailSettingsDescription": "Autoriser la modification des paramètres de messagerie."
"Feature:AllowChangingEmailSettingsDescription": "Autoriser la modification des paramètres de messagerie.",
"SmtpPasswordPlaceholder": "Entrez une valeur pour mettre à jour le mot de passe"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "सेटिंग प्रबंधन सक्षम करें",
"Feature:SettingManagementEnableDescription": "एप्लिकेशन में सेटिंग प्रबंधन प्रणाली सक्षम करें।",
"Feature:AllowChangingEmailSettings": "ईमेल सेटिंग्स बदलने की अनुमति दें।",
"Feature:AllowChangingEmailSettingsDescription": "ईमेल सेटिंग्स बदलने की अनुमति दें।"
"Feature:AllowChangingEmailSettingsDescription": "ईमेल सेटिंग्स बदलने की अनुमति दें।",
"SmtpPasswordPlaceholder": "पासवर्ड अपडेट करने के लिए एक मान दर्ज करें"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Omogući upravljanje postavkama",
"Feature:SettingManagementEnableDescription": "Omogućite sustav upravljanja postavkama u aplikaciji.",
"Feature:AllowChangingEmailSettings": "Dopusti promjenu postavki e-pošte.",
"Feature:AllowChangingEmailSettingsDescription": "Dopusti promjenu postavki e-pošte."
"Feature:AllowChangingEmailSettingsDescription": "Dopusti promjenu postavki e-pošte.",
"SmtpPasswordPlaceholder": "Unesite vrijednost za ažuriranje lozinke"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Beállításkezelés engedélyezése",
"Feature:SettingManagementEnableDescription": "A beállításkezelő rendszer engedélyezése az alkalmazásban.",
"Feature:AllowChangingEmailSettings": "Az e-mail beállítások módosításának engedélyezése.",
"Feature:AllowChangingEmailSettingsDescription": "Az e-mail beállítások módosításának engedélyezése."
"Feature:AllowChangingEmailSettingsDescription": "Az e-mail beállítások módosításának engedélyezése.",
"SmtpPasswordPlaceholder": "Adjon meg egy értéket a jelszó frissítéséhez"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Virkja stillingar",
"Feature:SettingManagementEnableDescription": "Virkja stillingar í forritinu.",
"Feature:AllowChangingEmailSettings": "Leyfa að breyta stillingum tölvupósts.",
"Feature:AllowChangingEmailSettingsDescription": "Leyfa að breyta stillingum tölvupósts."
"Feature:AllowChangingEmailSettingsDescription": "Leyfa að breyta stillingum tölvupósts.",
"SmtpPasswordPlaceholder": "Sláðu inn gildi til að uppfæra lykilorð"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Abilita gestione impostazioni",
"Feature:SettingManagementEnableDescription": "Abilita sistema gestione impostazioni nell'applicazione",
"Feature:AllowChangingEmailSettings": "Consenti di modificare le loro impostazioni e-mail.",
"Feature:AllowChangingEmailSettingsDescription": "Consenti di modificare le loro impostazioni e-mail."
"Feature:AllowChangingEmailSettingsDescription": "Consenti di modificare le loro impostazioni e-mail.",
"SmtpPasswordPlaceholder": "Inserisci un valore per aggiornare la password"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Instellingenbeheer inschakelen",
"Feature:SettingManagementEnableDescription": "Schakel het instellingsbeheersysteem in de toepassing in.",
"Feature:AllowChangingEmailSettings": "Toestaan om e-mailinstellingen te wijzigen.",
"Feature:AllowChangingEmailSettingsDescription": "Toestaan om e-mailinstellingen te wijzigen."
"Feature:AllowChangingEmailSettingsDescription": "Toestaan om e-mailinstellingen te wijzigen.",
"SmtpPasswordPlaceholder": "Voer een waarde in om het wachtwoord bij te werken"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Włącz zarządzanie ustawieniami",
"Feature:SettingManagementEnableDescription": "Włącz system zarządzania ustawieniami w aplikacji.",
"Feature:AllowChangingEmailSettings": "Zezwól na zmianę ustawień poczty e-mail.",
"Feature:AllowChangingEmailSettingsDescription": "Zezwól na zmianę ustawień poczty e-mail."
"Feature:AllowChangingEmailSettingsDescription": "Zezwól na zmianę ustawień poczty e-mail.",
"SmtpPasswordPlaceholder": "Wprowadź wartość, aby zaktualizować hasło"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Habilitar gerenciamento de configuração",
"Feature:SettingManagementEnableDescription": "Habilite o sistema de gerenciamento de configuração no aplicativo.",
"Feature:AllowChangingEmailSettings": "Permitir alterar as configurações de e-mail.",
"Feature:AllowChangingEmailSettingsDescription": "Permitir alterar as configurações de e-mail."
"Feature:AllowChangingEmailSettingsDescription": "Permitir alterar as configurações de e-mail.",
"SmtpPasswordPlaceholder": "Digite um valor para atualizar a senha"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Activează administrarea setărilor",
"Feature:SettingManagementEnableDescription": "Activează sistemul de administrare a setărilor în aplicaţie.",
"Feature:AllowChangingEmailSettings": "Permiteți modificarea setărilor de e-mail.",
"Feature:AllowChangingEmailSettingsDescription": "Permiteți modificarea setărilor de e-mail."
"Feature:AllowChangingEmailSettingsDescription": "Permiteți modificarea setărilor de e-mail.",
"SmtpPasswordPlaceholder": "Introduceți o valoare pentru a actualiza parola"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Включить управление настройками",
"Feature:SettingManagementEnableDescription": "Включите систему управления настройками в приложении.",
"Feature:AllowChangingEmailSettings": "Разрешить изменение настроек электронной почты.",
"Feature:AllowChangingEmailSettingsDescription": "Разрешить изменение настроек электронной почты."
"Feature:AllowChangingEmailSettingsDescription": "Разрешить изменение настроек электронной почты.",
"SmtpPasswordPlaceholder": "Введите значение для обновления пароля"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Povoliť správu nastavení",
"Feature:SettingManagementEnableDescription": "Povoliť systém správy nastavení v aplikácii.",
"Feature:AllowChangingEmailSettings": "Povoliť zmenu nastavení e-mailu.",
"Feature:AllowChangingEmailSettingsDescription": "Povoliť zmenu nastavení e-mailu."
"Feature:AllowChangingEmailSettingsDescription": "Povoliť zmenu nastavení e-mailu.",
"SmtpPasswordPlaceholder": "Zadajte hodnotu pre aktualizáciu hesla"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Omogoči upravljanje nastavitev",
"Feature:SettingManagementEnableDescription": "Omogočite nastavitev sistema upravljanja v aplikaciji.",
"Feature:AllowChangingEmailSettings": "Dovoli spreminjanje e-poštnih nastavitev.",
"Feature:AllowChangingEmailSettingsDescription": "Dovoli spreminjanje e-poštnih nastavitev."
"Feature:AllowChangingEmailSettingsDescription": "Dovoli spreminjanje e-poštnih nastavitev.",
"SmtpPasswordPlaceholder": "Vnesite vrednost za posodobitev gesla"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"Feature:SettingManagementEnable": "Aktivera hantering av inställningar",
"Feature:SettingManagementEnableDescription": "Aktivera inställningshanteringssystem i applikationen.",
"Feature:AllowChangingEmailSettings": "Tillåt ändring av e-postinställningar.",
"Feature:AllowChangingEmailSettingsDescription": "Tillåt ändring av e-postinställningar."
"Feature:AllowChangingEmailSettingsDescription": "Tillåt ändring av e-postinställningar.",
"SmtpPasswordPlaceholder": "Ange ett värde för att uppdatera lösenordet"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Ayar yönetimini etkinleştir",
"Feature:SettingManagementEnableDescription": "Uygulamada ayar yönetim sistemini etkinleştirin.",
"Feature:AllowChangingEmailSettings": "E-posta ayarlarını değiştirmeye izin verin.",
"Feature:AllowChangingEmailSettingsDescription": "E-posta ayarlarını değiştirmeye izin verin."
"Feature:AllowChangingEmailSettingsDescription": "E-posta ayarlarını değiştirmeye izin verin.",
"SmtpPasswordPlaceholder": "Şifreyi güncellemek için bir değer girin"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "Bật quản lý cài đặt",
"Feature:SettingManagementEnableDescription": "Bật cài đặt hệ thống quản lý trong ứng dụng.",
"Feature:AllowChangingEmailSettings": "Cho phép thay đổi cài đặt email.",
"Feature:AllowChangingEmailSettingsDescription": "Cho phép thay đổi cài đặt email."
"Feature:AllowChangingEmailSettingsDescription": "Cho phép thay đổi cài đặt email.",
"SmtpPasswordPlaceholder": "Nhập một giá trị để cập nhật mật khẩu"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Feature:SettingManagementEnable": "启用设置管理",
"Feature:SettingManagementEnableDescription": "在应用程序中启用设置管理系统。",
"Feature:AllowChangingEmailSettings": "允许更改邮件设置。",
"Feature:AllowChangingEmailSettingsDescription": "允许更改邮件设置。"
"Feature:AllowChangingEmailSettingsDescription": "允许更改邮件设置。",
"SmtpPasswordPlaceholder": "输入一个值以更新密码"
}
}
Loading

0 comments on commit c0893cf

Please sign in to comment.