Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Translations

Browse Source
This commit is contained in:
fred
2017-05-24 15:58:02 +02:00
parent 2bb7d95e37
commit 5977b8b4bc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/mp2migrator.js
View File

@@ -29,11 +29,11 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
}).done(function (result) { }).done(function (result) {
jQuery("#logger").html(''); jQuery("#logger").html('');
result.split("\n").forEach(function (row) { result.split("\n").forEach(function (row) {
if(row.substr(0, 7) === '[ERROR]' || row.substr(0, 9) === '[WARNING]' || row === 'IMPORT STOPPED BY USER') { if(row.substr(0, 7) === '[ERROR]' || row.substr(0, 9) === '[WARNING]' || row === MailPoet.I18n.t('import_stopped_by_user')) {
row = '<span class="error_msg">' + row + '</span>'; // Mark the errors in red row = '<span class="error_msg">' + row + '</span>'; // Mark the errors in red
} }
// Test if the import is complete // Test if the import is complete
else if(row === 'IMPORT COMPLETE') { else if(row === MailPoet.I18n.t('import_complete')) {
jQuery('#import-actions').hide(); jQuery('#import-actions').hide();
jQuery('#upgrade-completed').show(); jQuery('#upgrade-completed').show();
} }

2
lib/Config/MP2Migrator.php
View File

@@ -145,7 +145,7 @@ class MP2Migrator {
Setting::setValue('mailpoet_migration_complete', true); Setting::setValue('mailpoet_migration_complete', true);
$this->log("IMPORT COMPLETE"); $this->log(__('IMPORT COMPLETE', 'mailpoet'));
$this->log(sprintf('=== ' . __('END IMPORT', 'mailpoet') . ' %s ===', $datetime->formatTime(time(), \MailPoet\WP\DateTime::DEFAULT_DATE_TIME_FORMAT))); $this->log(sprintf('=== ' . __('END IMPORT', 'mailpoet') . ' %s ===', $datetime->formatTime(time(), \MailPoet\WP\DateTime::DEFAULT_DATE_TIME_FORMAT)));
$result = ob_get_contents(); $result = ob_get_contents();
ob_clean(); ob_clean();