diff options
3 files changed, 7 insertions, 2 deletions
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index c2eb62f0964..f8be8c0c245 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -684,6 +684,9 @@ email_configuration.from_address=From address email_configuration.from_address.description=Emails will come from this address. For example - "noreply@sonarsource.com". Note that server may ignore this setting (like does GMail). email_configuration.email_prefix=Email prefix email_configuration.email_prefix.description=This prefix will be prepended to all outgoing email subjects. +email_configuration.save_settings=Save +email_configuration.saving_settings=Saving +email_configuration.settings_saved=Settings are saved. email_configuration.test.title=Test Configuration email_configuration.test.to_address=To @@ -693,6 +696,7 @@ email_configuration.test.subject_text=Test Message from Sonar email_configuration.test.message=Message email_configuration.test.message_text=This is a test message from Sonar email_configuration.test.send=Send test email +email_configuration.test.sending=Sending test email email_configuration.test.email_was_sent_to_x=Email was sent to {0} notification.channel.EmailNotificationChannel=Email diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb index 5982b704372..e8f89b50748 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb @@ -40,6 +40,7 @@ class EmailConfigurationController < ApplicationController Property.set(configuration::SMTP_PASSWORD, params[:smtp_password]) Property.set(configuration::FROM, params[:email_from]) Property.set(configuration::PREFIX, params[:email_prefix]) + flash[:notice] = message('email_configuration.settings_saved') redirect_to :action => 'index' end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb index d1bd745c14a..04e91ee296c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb @@ -39,7 +39,7 @@ </tr> <tr> <td></td> - <td><%= submit_tag message('save') %></td> + <td><%= submit_tag message('email_configuration.save_settings'), :disable_with => message('email_configuration.saving_settings') %></td> </tr> </table> <% end -%> @@ -63,7 +63,7 @@ </tr> <tr> <td></td> - <td><%= submit_tag message('email_configuration.test.send') %></td> + <td><%= submit_tag message('email_configuration.test.send'), :disable_with => message('email_configuration.test.sending') %></td> </tr> </table> <% end -%> |