diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf index da241b9..cde820e 100644 --- a/Resources/Private/Translations/en/Main.xlf +++ b/Resources/Private/Translations/en/Main.xlf @@ -44,6 +44,9 @@ Send newsletter to: + + Loading... + diff --git a/Resources/Private/Translations/ru/Main.xlf b/Resources/Private/Translations/ru/Main.xlf index a3ade78..860d7bc 100644 --- a/Resources/Private/Translations/ru/Main.xlf +++ b/Resources/Private/Translations/ru/Main.xlf @@ -58,6 +58,10 @@ Send newsletter to: Отправить рассылку группе: + + Loading... + Загрузка... + diff --git a/Resources/Public/JavaScript/Inspector/Views/NewsletterView.html b/Resources/Public/JavaScript/Inspector/Views/NewsletterView.html index 4c6b188..2271418 100644 --- a/Resources/Public/JavaScript/Inspector/Views/NewsletterView.html +++ b/Resources/Public/JavaScript/Inspector/Views/NewsletterView.html @@ -1,20 +1,24 @@
- {{#if view.selectContent}} - {{view view._select}} + {{#if view.subscription}} + {{#if view.selectContent}} + {{view view._select}} + {{else}} +
+ {{view._sendTo}} {{view.subscription.label}} +
+ {{/if}} + + {{#if view.errorMessage}} +
+ + {{view._errorMessage}} +
+ {{/if}} {{else}} -
- {{view._sendTo}} {{view.subscription.label}} -
- {{/if}} - - {{#if view.errorMessage}} -
- - {{view._errorMessage}} -
+ {{view._loadingLabel}} {{/if}}
diff --git a/Resources/Public/JavaScript/Inspector/Views/NewsletterView.js b/Resources/Public/JavaScript/Inspector/Views/NewsletterView.js index 0787aa4..8585b9c 100644 --- a/Resources/Public/JavaScript/Inspector/Views/NewsletterView.js +++ b/Resources/Public/JavaScript/Inspector/Views/NewsletterView.js @@ -38,6 +38,9 @@ define([ _sendTo: function () { return I18n.translate('Psmb.Newsletter:Main:js.sendTo', 'Send newsletter to: '); }.property(), + _loadingLabel: function () { + return I18n.translate('Psmb.Newsletter:Main:js.loading', 'Loading...'); + }.property(), init: function () { var subscriptionsEndpoint = '/newsletter/getSubscriptions';