diff --git a/app/assets/javascripts/app/controllers/import_zendesk.coffee b/app/assets/javascripts/app/controllers/import_zendesk.coffee index 172693d9d..04ffeee3b 100644 --- a/app/assets/javascripts/app/controllers/import_zendesk.coffee +++ b/app/assets/javascripts/app/controllers/import_zendesk.coffee @@ -10,6 +10,7 @@ class Index extends App.ControllerContent '.zendesk-api-token-error': 'apiTokenErrorMessage' '#zendesk-email': 'zendeskEmail' '#zendesk-api-token': 'zendeskApiToken' + updateMigrationDisplayLoop: 0 events: 'click .js-zendesk-credentials': 'showCredentials' @@ -142,6 +143,7 @@ class Index extends App.ControllerContent ) updateMigration: => + @updateMigrationDisplayLoop += 1 @showImportState() @ajax( id: 'import_status' @@ -160,6 +162,11 @@ class Index extends App.ControllerContent else @$('.js-error').addClass('hide') + if data.message is 'not running' && @updateMigrationDisplayLoop > 16 + @$('.js-error').removeClass('hide') + @$('.js-error').html(App.i18n.translateContent('Background process did not start or has not finished! Please contact your support.')) + return + if data.result is 'in_progress' for key, item of data.data if item.done > item.total diff --git a/app/assets/javascripts/app/views/import/zendesk.jst.eco b/app/assets/javascripts/app/views/import/zendesk.jst.eco index 26d8092b8..72d538d19 100644 --- a/app/assets/javascripts/app/views/import/zendesk.jst.eco +++ b/app/assets/javascripts/app/views/import/zendesk.jst.eco @@ -2,13 +2,13 @@ <%- @Icon('full-logo', 'wizard-logo') %>
-

<%- @T('Zendesk URL') %>

+

<%- @T('%s URL', 'Zendesk') %>

- <%- @T('Enter the URL of your Zendesk system') %>: + <%- @T('Enter the URL of your %s system', 'Zendesk') %>:

- +
@@ -27,20 +27,20 @@
-

<%- @T('Zendesk credentials') %>

+

<%- @T('%s credentials', 'Zendesk') %>

- <%- @T('Enter your Email address and the Zendesk API token gained from your') %> <%- @T('admin interface') %> + <%- @T('Enter your email address and the %s API token gained from your admin interface.', 'Zendesk') %>

- <%- @T('Attention: These will be your login credentials after the import is completed.') %> + <%- @T('Attention: These will be your login password after the import is completed.') %>

- +
- +
@@ -54,12 +54,12 @@
<%- @T('Go Back') %> -
<%- @T('Migrate Zendesk Data') %>
+
<%- @T('Migrate %s Data', 'Zendesk') %>
-

<%- @T('Zendesk Migration') %>

+

<%- @T('%s Migration', 'Zendesk') %>

@@ -102,7 +102,7 @@