display import end when importing an archive

3 files changed, 14 insertions, 3 deletions

diff --git a/i18n/en.json b/i18n/en.json
index a44d3b4..b804c5e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -110,5 +110,7 @@
     "loading_notes_list": "Loading notes list",
     "importing_notes": "Importing notes",
     "import_finished": "Import finished",
-    "preload_editor": "Preload editor for faster load"
+    "preload_editor": "Preload editor for faster load",
+    "import_error": "An error occurred while importing",
+    "import_success": "Import success"
 }
\ No newline at end of file
diff --git a/i18n/tot.json b/i18n/tot.json
index 48511d4..1161eed 100644
--- a/i18n/tot.json
+++ b/i18n/tot.json
@@ -12,7 +12,7 @@
 { "search": "Hledat", "recent": "Poslední", "browser": "Prohlížeč", "settings": "Nastavení", "keywords": "Klíčová slova", "welcome": "Vítejte", "discover_carnet": "Objevte Carnet", "modern": "Carnet je moderní", "modern_subtext": "Užijte si psaní poznámek a textů v moderním uživatelském rozhraní", "synchronize": "Synchronizujte", "synchronize_subtext": "A nalezněte všechny vaše poznámky ve vašem prohlížeči (funguje i s iPhonem), ve vašem Android telefonu a ve vašem počítači", "next": "Další", "cancel": "Zrušit", "note_list_empty": "Zatím tu nejsou žádné poznámky. Začněte prosím vytvořením nové poznámky!", "pin": "Připnout", "archive": "Archivovat", "unarchive": "Odebrat z archivu", "delete": "Smazat", "ok": "OK", "rename": "Přejmenovat", "rename_or_move": "Přejmenovat nebo přesunout", "donation_message": "Tato aplikace byla vytvořena zadarmo. Zvažte prosím finanční příspěvek", "fake_note_1": "Tyto falešné poznámky zmizí, jakmile vytvoříte novou poznámku pomocí tlačítka vpravo dole", "fake_note_2": "Zvolte barvu poznámek a textu, přidejte klíčová slova ", "fake_note_3": "Ohodnoťte vaše poznámky nebo texty", "fake_note_4": "Synchronizujte s vašimi zařízeními", "fake_note_5": "Formátujte vaše poznámky a dokumenty, přidejte obrázky a nahrávejte audio", "fake_note_6": "Přidejte seznamy úkolů a URL adresy", "fake_note_todo_item_1": "Vyzkoušet Carnet", "fake_note_todo_item_2": "Sdílet Carnet", "fake_notes_warning": "Falešné poznámky nelze upravovat", "sort_reversed": "Opačné pořadí", "sort_default": "Výchozí", "sort_creation_date": "Datum vytvoření", "sort_modification_date": "Datum upravení", "sort_custom_date": "Vlastní datum", "statistics": "Statistiky", "sentences": "Věty:", "words": "Slova:", "characters": "Znaky:", "keyword": "Klíčové slovo", "format": "Formátování", "edit": "Upravit", "media": "Média", "tools": "Nástroje", "file": "Soubor", "note_name": "Název poznámky", "export": "Exportovat poznámku", "exit": "Ukončit", "add_a_keyword": "Přidat klíčové slovo", "back_to_text": "Zpět na text", "file_photo": "Soubor / Fotka", "recording": "Nahrát zvuk", "copy": "Kopírovat", "paste": "Vložit", "select_all": "Vybrat vše", "todo_list": "Seznam úkolů", "print": "Vytisknout", "print_title": "Vytisknout název", "print_modification_date": "Vytisknout datum úprav", "print_creation_date": "Vytisknout datum vytvoření", "error_save": "Vyskytla se chyba. Uložte prosím váš text a zkontrolujte, jestli není otevřen v jiné záložce", "not_yet_implemented": "Zatím neimplementováno", "open": "Otevřít", "date_time": "Datum a čas", "media_empty_text": "Pro přidání obrázků/zvuků použijte tlačítko +", "reminders": "Upozornění", "once-a-month": "Jednou za měsíc", "once-a-year": "Jednou za rok", "days-of-week": "V určené dny v týdnu", "once": "Jednou", "frequency": "Četnost", "monday": "Pondělí", "tuesday": "Úterý", "wednesday": "Středa", "thursday": "Čtvrtek", "friday": "Pátek", "saturday": "Sobota", "sunday": "Neděle", "time": "Čas", "date": "Datum", "beta_warning_reminders": "„Upozornění“ jsou stále ještě beta funkce, která funguje zatím pouze na Androidu", "more-options": "Více možností", "start_with_browser_view": "Spustit v režimu „Prohlížeč“", "delete_todolist_confirmation": "Tuto operaci nelze vrátit zpět. Opravdu chcete smazat tento seznam úkolů?", "something_went_wrong_please_reload": "Něco je špatně... Znovu načtěte, prosím", "note_color": "Barva poznámky", "new_todolist": "Nový seznam úkolů", "remove_todo_list": "Odstranit seznam úkolů", "add_item": "Přidat položku", "completed": "Hotovo", "todo": "Seznam", "display_more": "Zobrazit více", "display_less": "Zobrazit méně", "unable_rename_note": "Poznámku nelze přejmenovat", "delete_recording_confirmation": "Opravdu chcete smazat tuto nahrávku? Tuto akci nelze vrátit zpět." }
 ,
 "en":
-{ "search": "Search", "recent": "Latest", "browser": "Browser", "settings": "Settings", "keywords": "Keywords", "welcome": "Welcome", "discover_carnet": "Let's discover Carnet", "modern": "Modern", "modern_subtext": "Enjoy taking notes and writing texts in a modern UI", "synchronize": "Synchronize", "synchronize_subtext": "And find all your notes on your web browser (also works with iPhone), your Android phone, and your desktop", "next": "Next", "cancel": "Cancel", "note_list_empty": "No notes to display, please start by creating a new one !", "pin": "Pin", "archive": "Archive", "unarchive": "Unarchive", "delete": "Delete", "ok": "OK", "rename": "Rename", "rename_or_move": "Rename or move", "donation_message": "This application was created for free, please, consider making a donation", "fake_note_1": "These fake notes will disappear as soon as you create a new note by selecting the bottom right button", "fake_note_2": "Choose note/text colors, add keywords ", "fake_note_3": "Rate your notes or texts", "fake_note_4": "Sync with your devices", "fake_note_5": "Format your notes and documents, add pictures and audio records", "fake_note_6": "Add ToDo-Lists and URLs", "fake_note_todo_item_1": "Try Carnet", "fake_note_todo_item_2": "Share Carnet", "fake_notes_warning": "Fake notes are not editable", "sort_reversed": "Reversed order", "sort_default": "Default", "sort_creation_date": "Creation date", "sort_modification_date": "Modification date", "sort_custom_date": "Custom date", "statistics": "Statistics", "sentences": "Sentences :", "words": "Words :", "characters": "Characters :", "keyword": "Keyword", "format": "Format", "edit": "Edit", "media": "Media", "tools": "Tools", "file": "File", "note_name": "Note name", "export": "Export note", "exit": "Exit", "add_a_keyword": "Add a keyword", "back_to_text": "Back to text", "file_photo": "File / Photo", "recording": "Recording", "copy": "Copy", "paste": "Paste", "select_all": "Select all", "todo_list": "Todo-List", "print": "Print", "print_title": "Print title", "print_modification_date": "Print modification date", "print_creation_date": "Print creation date", "error_save": "An error occured, please save your text and check it is not open in another tab", "not_yet_implemented": "Not yet implemented", "open": "open", "date_time": "Date and time", "media_empty_text": "Select the + button to add images / sounds", "reminders": "Reminders", "once-a-month": "Once a month", "once-a-year": "Once a year", "days-of-week": "Days of week", "once": "Once", "frequency": "Frequency", "monday": "Monday", "tuesday": "Tuesday", "wednesday": "Wednesday", "thursday": "Thursday", "friday": "Friday", "saturday": "Saturday", "sunday": "Sunday", "time": "Time", "date": "Date", "beta_warning_reminders": "\"Reminders\" are still a beta features and will only work on Android", "more-options": "More options", "start_with_browser_view": "Start with browser view", "delete_todolist_confirmation": "This operation is irreversible, are you sure you want to delete this ToDo-List ?", "something_went_wrong_please_reload": "Something went wrong… Please, reload", "note_color": "Note color", "new_todolist": "New Todo-List", "remove_todo_list": "Remove ToDo-List", "add_item": "Add item", "completed": "Completed", "todo": "To do", "display_more": "Display more", "display_less": "Display less", "unable_rename_note": "Note couldn't be renamed", "delete_recording_confirmation": "Are you sure you want to delete this recording ? This action is irreversible.", "print_photos": "Include photos", "created": "Created", "modified": "Modified", "send": "Send", "send_export_print": "Send/Export/Print", "importer": "Importer", "select_archive": "Select archive", "send_whole_archive_or_select": "Send the whole archive or select specific notes to import.", "send_archive": "Send Archive", "select_notes": "Select Notes", "import": "Import", "add_to_recent": "Add to recent", "loading_notes_list": "Loading notes list", "importing_notes": "Importing notes", "import_finished": "Import finished" }
+{ "search": "Search", "recent": "Latest", "browser": "Browser", "settings": "Settings", "keywords": "Keywords", "welcome": "Welcome", "discover_carnet": "Let's discover Carnet", "modern": "Modern", "modern_subtext": "Enjoy taking notes and writing texts in a modern UI", "synchronize": "Synchronize", "synchronize_subtext": "And find all your notes on your web browser (also works with iPhone), your Android phone, and your desktop", "next": "Next", "cancel": "Cancel", "note_list_empty": "No notes to display, please start by creating a new one !", "pin": "Pin", "archive": "Archive", "unarchive": "Unarchive", "delete": "Delete", "ok": "OK", "rename": "Rename", "rename_or_move": "Rename or move", "donation_message": "This application was created for free, please, consider making a donation", "fake_note_1": "These fake notes will disappear as soon as you create a new note by selecting the bottom right button", "fake_note_2": "Choose note/text colors, add keywords ", "fake_note_3": "Rate your notes or texts", "fake_note_4": "Sync with your devices", "fake_note_5": "Format your notes and documents, add pictures and audio records", "fake_note_6": "Add ToDo-Lists and URLs", "fake_note_todo_item_1": "Try Carnet", "fake_note_todo_item_2": "Share Carnet", "fake_notes_warning": "Fake notes are not editable", "sort_reversed": "Reversed order", "sort_default": "Default", "sort_creation_date": "Creation date", "sort_modification_date": "Modification date", "sort_custom_date": "Custom date", "statistics": "Statistics", "sentences": "Sentences :", "words": "Words :", "characters": "Characters :", "keyword": "Keyword", "format": "Format", "edit": "Edit", "media": "Media", "tools": "Tools", "file": "File", "note_name": "Note name", "export": "Export note", "exit": "Exit", "add_a_keyword": "Add a keyword", "back_to_text": "Back to text", "file_photo": "File / Photo", "recording": "Recording", "copy": "Copy", "paste": "Paste", "select_all": "Select all", "todo_list": "Todo-List", "print": "Print", "print_title": "Print title", "print_modification_date": "Print modification date", "print_creation_date": "Print creation date", "error_save": "An error occured, please save your text and check it is not open in another tab", "not_yet_implemented": "Not yet implemented", "open": "open", "date_time": "Date and time", "media_empty_text": "Select the + button to add images / sounds", "reminders": "Reminders", "once-a-month": "Once a month", "once-a-year": "Once a year", "days-of-week": "Days of week", "once": "Once", "frequency": "Frequency", "monday": "Monday", "tuesday": "Tuesday", "wednesday": "Wednesday", "thursday": "Thursday", "friday": "Friday", "saturday": "Saturday", "sunday": "Sunday", "time": "Time", "date": "Date", "beta_warning_reminders": "\"Reminders\" are still a beta features and will only work on Android", "more-options": "More options", "start_with_browser_view": "Start with browser view", "delete_todolist_confirmation": "This operation is irreversible, are you sure you want to delete this ToDo-List ?", "something_went_wrong_please_reload": "Something went wrong… Please, reload", "note_color": "Note color", "new_todolist": "New Todo-List", "remove_todo_list": "Remove ToDo-List", "add_item": "Add item", "completed": "Completed", "todo": "To do", "display_more": "Display more", "display_less": "Display less", "unable_rename_note": "Note couldn't be renamed", "delete_recording_confirmation": "Are you sure you want to delete this recording ? This action is irreversible.", "print_photos": "Include photos", "created": "Created", "modified": "Modified", "send": "Send", "send_export_print": "Send/Export/Print", "importer": "Importer", "select_archive": "Select archive", "send_whole_archive_or_select": "Send the whole archive or select specific notes to import.", "send_archive": "Send Archive", "select_notes": "Select Notes", "import": "Import", "add_to_recent": "Add to recent", "loading_notes_list": "Loading notes list", "importing_notes": "Importing notes", "import_finished": "Import finished", "preload_editor": "Preload editor for faster load", "import_error": "An error occurred while importing", "import_success": "Import success" }
 ,
 "ru":
 { "search": "Найти", "recent": "Текущие", "browser": "Обзор", "settings": "Настройки", "keywords": "Ключевые слова", "welcome": "Приветствую", "discover_carnet": "Знакомьтесь, это – Carnet", "modern": "Современный", "modern_subtext": "Создавайте заметки и тексты, наслаждаясь современным интерфейсом", "synchronize": "Синхронизируйтесь", "synchronize_subtext": "И получите доступ к своим заметкам через веб-браузер (работает на iPhone), а также на Android и Вашем компьютере", "next": "Далее", "cancel": "Отмена", "note_list_empty": "Нет заметок для отображения. Создайте первую, чтобы начать!", "pin": "Закрепить", "archive": "в Архив", "unarchive": "из Архива", "delete": "Удалить", "ok": "OK", "rename": "Переименовать", "rename_or_move": "Переименовать или переместить", "donation_message": "Это приложение было создано бесплатным. Пожалуйста, подумайте о пожертвовании", "fake_note_1": "Эта демонстрация исчезнет, как только Вы создадите первую запись при помощи кнопки в нижней части экрана", "fake_note_2": "Выбирайте цвет заметок и текста, добавляйте ключевые слова ", "fake_note_3": "Оценивайте свои заметки и тексты", "fake_note_4": "Синхронизируйте свои устройства", "fake_note_5": "Форматируйте заметки и документы, добавляйте изображения и аудиозаписи", "fake_note_6": "Добавляйте списки задач и ссылки", "fake_note_todo_item_1": "Попробовать Carnet", "fake_note_todo_item_2": "Рассказать о Carnet", "fake_notes_warning": "Демонстрационные заметки нельзя изменить", "sort_reversed": "Обратный порядок", "sort_default": "по-умолчанию", "sort_creation_date": "по дате создания", "sort_modification_date": "по дате изменения", "sort_custom_date": "по внутренней дате", "statistics": "Статистика", "sentences": "Предложений :", "words": "Слов :", "characters": "Букв :", "keyword": "Ключевое слово", "format": "Формат", "edit": "Правка", "media": "Медиа", "tools": "Опции", "file": "Файл", "note_name": "Имя заметки", "export": "Экспорт заметки", "exit": "Выйти", "add_a_keyword": "Добавить ключевое слово", "back_to_text": "Обратно к тексту", "file_photo": "Файл / Фото", "recording": "Аудиозапись", "copy": "Копировать", "paste": "Вставить", "select_all": "Выделить все", "todo_list": "Список задач", "print": "Печать", "print_title": "Печать заголовка", "print_modification_date": "Печать даты изменения", "print_creation_date": "Печать даты создания", "error_save": "Произошла ошибка, сохраните текст и убедитесь, что он не открыт в другой вкладке", "not_yet_implemented": "Еще не реализовано", "open": "открыть", "date_time": "Дата и время", "media_empty_text": "Прикрепить изображение / аудиозапись", "reminders": "Оповещения", "once-a-month": "Раз в месяц", "once-a-year": "Раз в год", "days-of-week": "По дням недели", "once": "Однократно", "frequency": "Регулярность", "monday": "Понедельник", "tuesday": "Вторник", "wednesday": "Среда", "thursday": "Четверг", "friday": "Пятница", "saturday": "Суббота", "sunday": "Воскресенье", "time": "Время", "date": "Дата", "beta_warning_reminders": "\"Оповещения\" все еще проходят тестирование и работают только на Android", "more-options": "Дополнительно", "start_with_browser_view": "Запускать в режиме \"Обзор\"", "delete_todolist_confirmation": "Данное действие необратимо! Вы уверены, что хотите удалить этот список задач?", "something_went_wrong_please_reload": "Что-то пошло не так... Пожалуйста, загрузите снова", "note_color": "Цвет заметки", "new_todolist": "Новый список задач", "remove_todo_list": "Убрать", "add_item": "Доб. пункт", "completed": "Выполнено", "todo": "Задачи", "display_more": "Показать больше", "display_less": "Показать меньше", "unable_rename_note": "Заметка не может быть переименована" }
diff --git a/importer/importer.js b/importer/importer.js
index 3979dfa..277cbe2 100644
--- a/importer/importer.js
+++ b/importer/importer.js
@@ -131,6 +131,13 @@ Importer.prototype.displayChooseWholeArchiveOrSelectNotes = function () {
         }, files, function (error, data) {
             console.log("send " + error)
 
+            $('#import-finished').show();
+            $('#importing-view').hide();
+            if (error)
+                $('#import-report').html($.i18n("import_error"));
+            else
+                $('#import-report').html($.i18n("import_success"));
+
         }, function (percentComplete) {
 
             progressBar.classList.remove("mdl-progress__indeterminate")
@@ -138,7 +145,9 @@ Importer.prototype.displayChooseWholeArchiveOrSelectNotes = function () {
             $("#archive-or-notes-selection").hide()
             console.log("sending " + percentComplete)
             $("#importing-view").show();
-            document.getElementById("importing").innerHTML = percentComplete + "%"
+            document.getElementById("importing").innerHTML = Math.trunc(percentComplete) + "%<br /> Please wait"
+            if (percentComplete == 100)
+                progressBar.classList.add("mdl-progress__indeterminate")
 
         })
     }