From 8bfaa50ded8da72363249f1de8561acc8461050a Mon Sep 17 00:00:00 2001 From: Thamara Andrade Date: Mon, 8 Jan 2024 00:10:46 -0300 Subject: [PATCH 1/6] Removing support of old database (fixed 4 entries) --- __tests__/__main__/import-export.js | 31 --------- js/import-export.js | 61 ++--------------- js/main-window.js | 101 ---------------------------- 3 files changed, 4 insertions(+), 189 deletions(-) diff --git a/__tests__/__main__/import-export.js b/__tests__/__main__/import-export.js index 62080b68d..f57107422 100644 --- a/__tests__/__main__/import-export.js +++ b/__tests__/__main__/import-export.js @@ -4,7 +4,6 @@ const { exportDatabaseToFile, importDatabaseFromFile, - migrateFixedDbToFlexible, validEntry } = require('../../js/import-export'); @@ -42,25 +41,9 @@ describe('Import export', function() }); }); - const store = new Store(); const flexibleStore = new Store({name: 'flexible-store'}); const waivedWorkdays = new Store({name: 'waived-workdays'}); - // TODO: Regular store is still here to test migration of dbs. Please remove on the next release. - store.clear(); - const regularEntries = { - '2020-3-1-day-begin': '08:00', - '2020-3-1-day-end': '17:00', - '2020-3-1-day-total': '08:00', - '2020-3-1-lunch-begin': '12:00', - '2020-3-1-lunch-end': '13:00', - '2020-3-1-lunch-total': '01:00', - '2020-3-2-day-begin': '10:00', - '2020-3-2-day-end': '18:00', - '2020-3-2-day-total': '08:00', - }; - store.set(regularEntries); - flexibleStore.clear(); const flexibleEntries = { '2020-3-1': {'values': ['08:00', '12:00', '13:00', '17:00']}, @@ -114,20 +97,6 @@ describe('Import export', function() '2020-3-2': {'values': ['10:00', '18:00']} }; - describe('migrateFixedDbToFlexible', function() - { - test('Check that migration works', () => - { - expect(flexibleStore.size).toBe(2); - flexibleStore.clear(); - expect(flexibleStore.size).toBe(0); - migrateFixedDbToFlexible(); - expect(flexibleStore.size).toBe(2); - expect(flexibleStore.get('2020-3-1')).toStrictEqual(migratedFlexibleEntries['2020-3-1']); - expect(flexibleStore.get('2020-3-2')).toStrictEqual(migratedFlexibleEntries['2020-3-2']); - }); - }); - // TODO: Mixed importing is still here due to compatibility with old dbs. Please remove on the next release. const mixedEntriesContent = `[{"type": "regular", "date": "2020-6-3", "data": "day-end", "hours": "10:00"}, diff --git a/js/import-export.js b/js/import-export.js index 0dc462e69..e69aad14f 100644 --- a/js/import-export.js +++ b/js/import-export.js @@ -6,6 +6,7 @@ import fs from 'fs'; import { validateTime } from './time-math.js'; import { generateKey } from './date-db-formatter.js'; +import { assert } from 'console'; /** * Returns the database (only flexible calendar entries) as an array of: @@ -76,8 +77,7 @@ function _validateDate(dateStr) function validEntry(entry) { - // TODO: 'regular' is still here while we allow importing old DB data. Please remove on the next release. - if (entry.hasOwnProperty('type') && ['regular', 'waived', 'flexible'].indexOf(entry.type) !== -1) + if (entry.hasOwnProperty('type') && ['waived', 'flexible'].indexOf(entry.type) !== -1) { const validatedDate = entry.hasOwnProperty('date') && _validateDate(entry.date); let hasExpectedProperties; @@ -144,26 +144,12 @@ function importDatabaseFromFile(filename) } else { + assert(entry.type === 'flexible'); const [year, month, day] = entry.date.split('-'); //The main database uses a JS-based month index (0-11) //So we need to adjust it from human month index (1-12) const date = generateKey(year, (parseInt(month) - 1), day); - if (entry.type === 'flexible') - { - flexibleEntries[date] = {values: entry.values}; - } - else if (entry.type === 'regular') - { - // TODO: 'regular' is still here while we allow importing old DB data. Please remove on the next release. - const [/*event*/, key] = entry.data.split('-'); - if (['begin', 'end'].indexOf(key) !== -1) - { - let currentFlexibleEntry = flexibleEntries[date]; - if (currentFlexibleEntry === undefined) - currentFlexibleEntry = { values: [] }; - flexibleEntries[date] = mergeOldStoreDataIntoFlexibleStore(currentFlexibleEntry, entry.hours); - } - } + flexibleEntries[date] = {values: entry.values}; } } @@ -182,47 +168,8 @@ function importDatabaseFromFile(filename) return {'result': true}; } -function migrateFixedDbToFlexible() -{ - const store = new Store(); - const flexibleStore = new Store({name: 'flexible-store'}); - flexibleStore.clear(); - const regularEntryArray = []; - for (const entry of store) - { - const key = entry[0]; - const value = entry[1]; - - const [year, month, day, /*stage*/, step] = key.split('-'); - if (['begin', 'end'].indexOf(step) !== -1) - { - const date = generateKey(year, month, day); - if (regularEntryArray[date] === undefined) - { - regularEntryArray[date] = { values: []}; - } - regularEntryArray[date].values.push(value); - } - } - try - { - for (const key of Object.keys(regularEntryArray)) - { - regularEntryArray[key].values.sort(); - flexibleStore.set(key, regularEntryArray[key]); - } - } - catch (err) - { - console.log(err); - return {'result': false, 'err': err}; - } - return {'result': true, 'err': ''}; -} - module.exports = { exportDatabaseToFile, importDatabaseFromFile, - migrateFixedDbToFlexible, validEntry, }; diff --git a/js/main-window.js b/js/main-window.js index 06a4b7905..43c27ef6c 100644 --- a/js/main-window.js +++ b/js/main-window.js @@ -5,7 +5,6 @@ import path from 'path'; import Store from 'electron-store'; const { checkForUpdates, shouldCheckForUpdates } = require('./update-manager'); -const { migrateFixedDbToFlexible } = require('./import-export.js'); const { getContextMenuTemplate, getDockMenuTemplate, @@ -168,104 +167,6 @@ function triggerStartupDialogs() { checkForUpdates(/*showUpToDateDialog=*/false); } - - if (shouldProposeFlexibleDbMigration()) - { - proposeFlexibleDbMigration(); - } -} - -function proposeFlexibleDbMigration() -{ - const options = { - type: 'question', - buttons: [getCurrentTranslation('$Menu.migrate'), getCurrentTranslation('$Menu.fresh-start')], - defaultId: 2, - title: getCurrentTranslation('$Menu.migrate-calendar-to-flexible'), - message: getCurrentTranslation('$Menu.should-migrate-to-flexible'), - }; - - const response = dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), options); - if (response === 0 /*migrate*/) - { - const migrateResult = migrateFixedDbToFlexible(); - mainWindow.webContents.send('RELOAD_CALENDAR'); - if (migrateResult['result'] === true) - { - dialog.showMessageBox(BrowserWindow.getFocusedWindow(), - { - title: 'Time to Leave', - message: getCurrentTranslation('$Menu.database-migrated'), - type: 'info', - icon: appConfig.iconpath, - detail: getCurrentTranslation('$Menu.migration-successful') - }); - } - else - { - handleFailedFlexibleDbMigration(migrateResult); - } - } - else if (response === 1 /*fresh-start*/) - { - const confirmOptions = { - type: 'question', - buttons: [getCurrentTranslation('$Menu.cancel'), getCurrentTranslation('$Menu.yes-please')], - defaultId: 2, - title: getCurrentTranslation('$Menu.fresh-start'), - message: getCurrentTranslation('$Menu.fresh-start-confirm'), - }; - - const confirmResponse = dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), confirmOptions); - if (confirmResponse === 0 /*cancel*/) - { - proposeFlexibleDbMigration(); - } - } -} - -/** - * @param {Object} migrateResult Result of migrateFixedDbToFlexible() call - */ -function handleFailedFlexibleDbMigration(migrateResult) -{ - const warningResponse = dialog.showMessageBoxSync({ - type: 'warning', - buttons: [getCurrentTranslation('$Menu.report'), getCurrentTranslation('$Menu.quit')], - title: getCurrentTranslation('$Menu.failed-migrating'), - message: getCurrentTranslation('$Menu.something-went-wrong') - }); - - if (warningResponse === 0 /*report*/) - { - const issueTitle = 'Failed Migrating Database'; - const err = migrateResult['err']; - const LB = '%0D%0A'; // Line Break char in html encoding - const encodedDetails = getDetails().replaceAll('\n', LB); - const issueBody = `While performing database migration, my application failed with the following issue:${LB}` + - LB + - '```' + LB + - err + LB + - '```' + LB + - LB + - 'Environment:' + LB + - LB + - encodedDetails + LB + - LB + - 'Please look into it.'; - shell.openExternal(`https://github.com/thamara/time-to-leave/issues/new?labels=bug&title=${issueTitle}&body=${issueBody}`); - } - - app.quit(); -} - -function shouldProposeFlexibleDbMigration() -{ - const store = new Store(); - const flexibleStore = new Store({name: 'flexible-store'}); - - // There is data saved on the old store, but nothing yet on the flexible store. - return store.size !== 0 && flexibleStore.size === 0; } function resetMainWindow() @@ -292,8 +193,6 @@ module.exports = { getLeaveByInterval: () => leaveByInterval, getMainWindow, getWindowTray: () => tray, - proposeFlexibleDbMigration, resetMainWindow, - shouldProposeFlexibleDbMigration, triggerStartupDialogs, }; From eb55b809c75b51d997fbcff0baf998ead2e4a1da Mon Sep 17 00:00:00 2001 From: Thamara Andrade Date: Mon, 8 Jan 2024 00:11:01 -0300 Subject: [PATCH 2/6] Removing unused strings --- locales/bn/translation.json | 8 -------- locales/ca/translation.json | 8 -------- locales/de-DE/translation.json | 8 -------- locales/el/translation.json | 8 -------- locales/en/translation.json | 8 -------- locales/es/translation.json | 8 -------- locales/fa-IR/translation.json | 8 -------- locales/fr-FR/translation.json | 8 -------- locales/gu/translation.json | 8 -------- locales/he/translation.json | 8 -------- locales/hi/translation.json | 8 -------- locales/id/translation.json | 8 -------- locales/it/translation.json | 8 -------- locales/ja/translation.json | 8 -------- locales/ko/translation.json | 8 -------- locales/mr/translation.json | 8 -------- locales/nl/translation.json | 8 -------- locales/pl/translation.json | 8 -------- locales/pt-BR/translation.json | 8 -------- locales/pt-MI/translation.json | 8 -------- locales/pt-PT/translation.json | 8 -------- locales/ru-RU/translation.json | 8 -------- locales/sv-SE/translation.json | 8 -------- locales/ta/translation.json | 8 -------- locales/th-TH/translation.json | 8 -------- locales/tr-TR/translation.json | 8 -------- locales/uk-UA/translation.json | 8 -------- locales/zh-TW/translation.json | 8 -------- 28 files changed, 224 deletions(-) diff --git a/locales/bn/translation.json b/locales/bn/translation.json index 04d0466d8..4ce992655 100644 --- a/locales/bn/translation.json +++ b/locales/bn/translation.json @@ -74,7 +74,6 @@ "cut": "কাটা", "database-export": "ডাটাবেস রপ্তানি", "database-imported": "আমদানি করা ডাটাবেস", - "database-migrated": "ডাটাবেস মাইগ্রেটেড", "database-was-exported": "ঠিক আছে, ডাটাবেস এক্সপোর্ট করা হয়েছে।", "edit": "সম্পাদনা", "exit": "প্রস্থান করুন", @@ -82,18 +81,12 @@ "export-database": "রপ্তানি ডাটাবেস", "export-db-to-file": "ডাটাবেস ফাইলে রপ্তানি করুন", "failed-entries": "ব্যর্থ এন্ট্রি", - "failed-migrating": "ব্যর্থ স্থানান্তর", - "fresh-start": "ফ্রেশ স্টার্ট", - "fresh-start-confirm": "আপনি কি নিশ্চিত যে আপনি একটি নতুন শুরু করতে চান?", "help": "সাহায্য", "import": "আমদানি ", "import-database": "আমদানি ডাটাবেস", "import-db-from-file": "ফাইল থেকে ডাটাবেস আমদানি করুন", "import-successful": "হ্যাঁ! আমদানি সফল!", "menu": "মেনু", - "migrate": "মাইগ্রেট", - "migrate-calendar-to-flexible": "স্থির ক্যালেন্ডার ডাটাবেস নমনীয়তে স্থানান্তর করুন", - "migration-successful": "হ্যাঁ! মাইগ্রেশন সফল!", "no-thanks": "না, ধন্যবাদ", "ok": "ঠিক আছে", "paste": "ঠিক আছে", @@ -105,7 +98,6 @@ "report": "প্রতিবেদন", "select-all": "সব নির্বাচন করুন", "send-feedback": "প্রতিক্রিয়া পাঠান", - "should-migrate-to-flexible": "এই টাইম টু লিভ রিলিজের নতুন বৈশিষ্ট্যগুলির মধ্যে একটি হল ক্যালেন্ডারের জন্য নমনীয় সংখ্যক এন্ট্রি। \n\n এই নতুন ভিউ একটি নতুন ডাটাবেস ফরম্যাট ব্যবহার করে।\n হয় আপনার বিদ্যমান ডাটাবেসকে নতুন বিন্যাসে স্থানান্তর করতে পারেন অথবা নতুন করে শুরু করতে পারেন।", "show-app": "অ্যাপ দেখান", "something-went-wrong": "কিছু ভুল হয়েছে :", diff --git a/locales/ca/translation.json b/locales/ca/translation.json index e361e4307..6c0f2a1df 100644 --- a/locales/ca/translation.json +++ b/locales/ca/translation.json @@ -74,7 +74,6 @@ "cut": "Tallar", "database-export": "Exportar la base de dades", "database-imported": "Base de dades importada", - "database-migrated": "Base de dades migrada", "database-was-exported": "Correcte, la base de dades exportada.", "edit": "Editar", "exit": "Sortir", @@ -82,18 +81,12 @@ "export-database": "Exportar la base de dades", "export-db-to-file": "Exportar la base de dades a un arxiu", "failed-entries": "Entrades fallides", - "failed-migrating": "Migració fallida", - "fresh-start": "Nou començament", - "fresh-start-confirm": "Esteu segur que voleu un nou començament?", "help": "Ajuda", "import": "Importar", "import-database": "Importar base de dades", "import-db-from-file": "Importar base de dades d'un arxiu", "import-successful": "¡Importació exitosa!", "menu": "Menú", - "migrate": "Migrar", - "migrate-calendar-to-flexible": "Migrar base de dades del calendari fixe a calendari flexible", - "migration-successful": "¡Migració exitosa!", "no-thanks": "No, gracies", "ok": "D'acord", "paste": "Enganxar", @@ -105,7 +98,6 @@ "report": "Informe", "select-all": "Seleccionar tot", "send-feedback": "Envieu els vostres comentaris", - "should-migrate-to-flexible": "Una de les novetats d’aquest llançament de Time to Leave és un nombre flexible d’entrades per al calendari.\n\nAquesta nova vista utilitza un nou format de base de dades.\nPer utilitzar-lo, podeu migrar la base de dades existent al nou format o començar de nou.", "show-app": "Mostra Aplicació", "something-went-wrong": "Hi ha hagut un error :(", "toggle-dev-tools": "Alternar a eines de desenvolupament", diff --git a/locales/de-DE/translation.json b/locales/de-DE/translation.json index bd5ac5db5..0137719f5 100644 --- a/locales/de-DE/translation.json +++ b/locales/de-DE/translation.json @@ -74,7 +74,6 @@ "cut": "Ausschneiden", "database-export": "Datenbank Export", "database-imported": "Datenbank importiert", - "database-migrated": "Datenbank migriert", "database-was-exported": "Okay, Datenbank wurde exportiert.", "edit": "Bearbeiten", "exit": "Beenden", @@ -82,18 +81,12 @@ "export-database": "Export Datenbank", "export-db-to-file": "Export Datenbank in Datei", "failed-entries": "Fehlerhafte Einträge", - "failed-migrating": "Migrierung fehlgeschlagen", - "fresh-start": "Neuanfang", - "fresh-start-confirm": "Sind Sie sicher, dass Sie einen Neuanfang wollen?", "help": "Hilfe", "import": "Import", "import-database": "Datenbank Import", "import-db-from-file": "Datenbank Import aus Datei", "import-successful": "Yay! Import erfolgreich!", "menu": "Menü", - "migrate": "Migrieren", - "migrate-calendar-to-flexible": "Migriere fixierte Kalender Datenbank zu flexibler", - "migration-successful": "Yay! Migration erfolgreich!", "no-thanks": "Nein, danke", "ok": "OK", "paste": "Einfügen", @@ -105,7 +98,6 @@ "report": "Melden", "select-all": "Alle selektieren", "send-feedback": "Feedback senden", - "should-migrate-to-flexible": "Eine der neuen Funktionen dieser Version von Time to Leave ist eine flexible Anzahl von Einträgen für den Kalender.\n\nDiese neue Ansicht verwendet ein neues Datenbankformat.\nUm sie zu nutzen, können Sie entweder Ihre bestehende Datenbank auf das neue Format migrieren oder neu beginnen.", "show-app": "Zeige App", "something-went-wrong": "Etwas ist falsch gelaufen :(", "toggle-dev-tools": "Entwickler Werkzeuge umschalten", diff --git a/locales/el/translation.json b/locales/el/translation.json index 81fa18171..31ee4c088 100644 --- a/locales/el/translation.json +++ b/locales/el/translation.json @@ -74,7 +74,6 @@ "cut": "Αποκοπή", "database-export": "Εξαγωγή βάσης δεδομένων", "database-imported": "Η βάση δεδομένων εισήχθη", - "database-migrated": "Η βάση δεδομένων μετακινήθηκε", "database-was-exported": "Εντάξει, η βάση δεδομένων εξήχθη.", "edit": "Επεξεργασία", "exit": "Έξοδος", @@ -82,18 +81,12 @@ "export-database": "Εξαγωγή βάσης δεδομένων", "export-db-to-file": "Εξαγωγή βάσης δεδομένων σε αρχείο", "failed-entries": "Αποτυχημένες εγγραφές", - "failed-migrating": "Αποτυχία μεταφοράς", - "fresh-start": "Νέα αρχή", - "fresh-start-confirm": "Είστε σίγουροι ότι θέλετε μια νέα αρχή;", "help": "Βοήθεια", "import": "Εισαγωγή", "import-database": "Εισαγωγή βάσης δεδομένων", "import-db-from-file": "Εισαγωγή βάσης δεδομένων από αρχείο", "import-successful": "Ναι! Εισαγωγή επιτυχής!", "menu": "Μενού", - "migrate": "Μετεγκατάσταση", - "migrate-calendar-to-flexible": "Μετεγκατάσταση από προκαθορισμένο σε ευέλικτο ημερολόγιο", - "migration-successful": "Ναι! Μετεγκατάσταση επιτυχής!", "no-thanks": "Όχι, ευχαριστώ", "ok": "OK", "paste": "Επικόλληση", @@ -105,7 +98,6 @@ "report": "Αναφορά", "select-all": "Επιλογή όλων", "send-feedback": "Αποστολή σχολίων", - "should-migrate-to-flexible": "Ένα από τα νέα χαρακτηριστικά της νέας έκδοσης Time to Leave είναι ο ευέλικτος αριθμός καταχωρήσεων για το ημερολόγιο.\n\nΑυτή η νέα προβολή χρησιμοποιεί ένα νέο φορμάτ βάσης δεδομένων.\nΓια να το χρησιμοποιήσετε, μπορείτε είτε να μετακινήσετε την υπάρχουσα βάση δεδομένων στο νέο φορμάτ είτε να ξεκινήσετε από την αρχή.", "show-app": "Εμφάνιση εφαρμογής", "something-went-wrong": "Κάτι πήγε στραβά :(", "toggle-dev-tools": "Εναλλαγή εργαλείων ανάπτυξης", diff --git a/locales/en/translation.json b/locales/en/translation.json index 4c30b3a6c..dd03d3e74 100644 --- a/locales/en/translation.json +++ b/locales/en/translation.json @@ -74,7 +74,6 @@ "cut": "Cut", "database-export": "Database export", "database-imported": "Database imported", - "database-migrated": "Database migrated", "database-was-exported": "Okay, database was exported.", "edit": "Edit", "exit": "Exit", @@ -82,18 +81,12 @@ "export-database": "Export database", "export-db-to-file": "Export database to file", "failed-entries": "Failed entries", - "failed-migrating": "Failed migrating", - "fresh-start": "Fresh Start", - "fresh-start-confirm": "Are you sure you want a fresh start?", "help": "Help", "import": "Import", "import-database": "Import database", "import-db-from-file": "Import database from file", "import-successful": "Yay! Import successful!", "menu": "Menu", - "migrate": "Migrate", - "migrate-calendar-to-flexible": "Migrate fixed calendar database to flexible", - "migration-successful": "Yay! Migration successful!", "no-thanks": "No, thanks", "ok": "OK", "paste": "Paste", @@ -105,7 +98,6 @@ "report": "Report", "select-all": "Select all", "send-feedback": "Send feedback", - "should-migrate-to-flexible": "One of the new features of this Time to Leave release is a flexible number of entries for the calendar.\n\nThis new view uses a new database format.\nTo use it, you can either migrate your existing database to the new format or make a fresh start.", "show-app": "Show App", "something-went-wrong": "Something wrong happened :(", "toggle-dev-tools": "Toggle developer tools", diff --git a/locales/es/translation.json b/locales/es/translation.json index 97b6b64c6..3d2d6586b 100644 --- a/locales/es/translation.json +++ b/locales/es/translation.json @@ -74,7 +74,6 @@ "cut": "Cortar", "database-export": "Exportación de la base de datos", "database-imported": "Base de datos importada", - "database-migrated": "Base de datos migrada", "database-was-exported": "Bien, la base de datos fue exportada.", "edit": "Editado", "exit": "Salir", @@ -82,18 +81,12 @@ "export-database": "Exportar la base de datos", "export-db-to-file": "Exportar la base de datos a un archivo", "failed-entries": "Entradas fallidas", - "failed-migrating": "Migración fallida", - "fresh-start": "Empezar desde cero", - "fresh-start-confirm": "¿Estás seguro de que quieres empezar desde cero?", "help": "Ayuda", "import": "Importar", "import-database": "Importar base de datos", "import-db-from-file": "Importar base de datos de un archivo", "import-successful": "¡Sí! ¡Importación exitosa!", "menu": "Menú", - "migrate": "Migrar", - "migrate-calendar-to-flexible": "Migrar base de datos de calendario fijo a calendario flexible", - "migration-successful": "Sí! ¡Migración exitosa!", "no-thanks": "No, gracias", "ok": "OK", "paste": "Pegar", @@ -105,7 +98,6 @@ "report": "Reportar", "select-all": "Seleccionar Todo", "send-feedback": "Envíe sus comentarios", - "should-migrate-to-flexible": "Una de las novedades de este lanzamiento de Time to Leave es un número flexible de entradas para el calendario.\n\nEsta nueva vista usa un nuevo formato en la base de datos.\nPara usarlo, puedes migrar su base de datos existente al nuevo formato, o empezar desde cero.", "show-app": "Mostrar Aplicacion", "something-went-wrong": "Algo malo pasó :(", "toggle-dev-tools": "Alternar a herramientas de desarrollo", diff --git a/locales/fa-IR/translation.json b/locales/fa-IR/translation.json index fb00a9f7b..7372dba8c 100644 --- a/locales/fa-IR/translation.json +++ b/locales/fa-IR/translation.json @@ -74,7 +74,6 @@ "cut": "برش", "database-export": "صادر کردن دیتابیس", "database-imported": "پایگاه داده وارد شد", - "database-migrated": "پایگاه داده انتقال یافت", "database-was-exported": "دیتابیس صادر شد.", "edit": "ویرایش", "exit": "خروج", @@ -82,18 +81,12 @@ "export-database": "صادر کردن دیتابیس", "export-db-to-file": "ذخیره کردن دیتابیس در فایل", "failed-entries": "موردهای ناموفق", - "failed-migrating": "انتقال انجام نشد", - "fresh-start": "شروع مجدد", - "fresh-start-confirm": "آیا مطمئنید که می خواهید شروع مجدد داشته باشید؟", "help": "کمک", "import": "وارد کردن", "import-database": "وارد کردن دیتابیس", "import-db-from-file": "وارد کردن دیتابیس از فایل", "import-successful": "با موفقیت وارد شد!", "menu": "منو", - "migrate": "انتقال", - "migrate-calendar-to-flexible": "انتقال پایگاه داده تقویم ثابت به حالت انعطاف پذیر", - "migration-successful": "انتقال با موفقیت انجام شد!", "no-thanks": "خیر", "ok": "باشه", "paste": "جای گذاری", @@ -105,7 +98,6 @@ "report": "گزارش", "select-all": "انتخاب همه", "send-feedback": "ارسال بازخورد", - "should-migrate-to-flexible": "یکی از ویژگی های جدید این نسخه Time To Leave تعداد موارد دلخواه برای تقویم است.\n\nاین نمایش جدید از یک قالب پایگاه داده جدید استفاده می کند.\nبرای استفاده از آن شما می توانید پایگاه داده فعلی را به قالب جدید انتقال دهید یا یک شروع مجدد داشته باشید.", "show-app": "نمایش برنامه", "something-went-wrong": "مشکلی پیش آمده است :(", "toggle-dev-tools": "ابزارهای توسعه دهنده ها", diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json index 1aada1254..584d1fbe6 100644 --- a/locales/fr-FR/translation.json +++ b/locales/fr-FR/translation.json @@ -74,7 +74,6 @@ "cut": "Couper", "database-export": "Exporter les données", "database-imported": "Importer des données", - "database-migrated": "Base de données migrée", "database-was-exported": "Ok, les données ont été exportées.", "edit": "Éditer", "exit": "Quitter", @@ -82,18 +81,12 @@ "export-database": "Exporter la base de données", "export-db-to-file": "Exporter la base de données vers un fichier", "failed-entries": "Entrées échouées", - "failed-migrating": "Échec de la migration", - "fresh-start": "Recommencer entièrement", - "fresh-start-confirm": "Êtes-vous sûr de vouloir tout recommencer ?", "help": "Aide", "import": "Importer", "import-database": "Importer la base de données", "import-db-from-file": "Importer la base de données à partir d'un fichier", "import-successful": "youpi! Importation réussie!", "menu": "Menu", - "migrate": "Migrer", - "migrate-calendar-to-flexible": "Migrer la base de données de calendrier fixe vers flexible", - "migration-successful": "youpi! Migration réussie!", "no-thanks": "Non merci", "ok": "OK", "paste": "Coller", @@ -105,7 +98,6 @@ "report": "Rapporter", "select-all": "Tout sélectionner", "send-feedback": "Envoyez vos commentaires", - "should-migrate-to-flexible": "Une des nouvelles fonctionnalitée de Time to Leave est la possibilité d'avoir un nombre d'entrée flexible dans le calendrier.\n\nCette nouvelle vue utilise un autre format de données.\nPour l'utiliser, vous pouvez migrer votre base de donnée ou recommencer un clandrier.", "show-app": "Afficher l'application", "something-went-wrong": "Quelque chose s'est mal passé :(", "toggle-dev-tools": "Basculer Outils de développement", diff --git a/locales/gu/translation.json b/locales/gu/translation.json index d88a26d31..b426eaf39 100644 --- a/locales/gu/translation.json +++ b/locales/gu/translation.json @@ -74,7 +74,6 @@ "cut": "કાપવું", "database-export": "ડેટાબેસ નિકાસ", "database-imported": "ડેટાબેસ આયાત કરાયો", - "database-migrated": "ડેટાબેસ સ્થાનાંતરિત", "database-was-exported": "ઠીક છે, ડેટાબેઝ નિકાસ કરવામાં આવ્યો હતો.", "edit": "સંપાદિત કરો", "exit": "બહાર નીકળો", @@ -82,18 +81,12 @@ "export-database": "ડેટાબેઝ નિકાસ કરો", "export-db-to-file": "ફાઇલમાં ડેટાબેસ નિકાસ કરો", "failed-entries": "નિષ્ફળ પ્રવેશો", - "failed-migrating": "પ્રવેશ સ્થાનાંતરિત કરવામાં નિષ્ફળ", - "fresh-start": "નવેસરથી શરૂઆત", - "fresh-start-confirm": "શું તમે ખરેખર નવી શરૂઆત માંગો છો?", "help": "સહાય કરો", "import": "આયાત કરો", "import-database": "ડેટાબેઝ આયાત કરો", "import-db-from-file": "ફાઇલમાંથી ડેટાબેસ આયાત કરો", "import-successful": "હા! આયાત સફળ!", "menu": "મેનુ", - "migrate": "સ્થળાંતર", - "migrate-calendar-to-flexible": "લવચીક પર સ્થિર ક flexલેન્ડર ડેટાબેસ સ્થાનાંતરિત કરો", - "migration-successful": "હા! સ્થળાંતર સફળ થયું!", "no-thanks": "ના, આભાર", "ok": "બરાબર", "paste": "પેસ્ટ કરો", @@ -105,7 +98,6 @@ "report": "અહેવાલ", "select-all": "બધા પસંદ કરો", "send-feedback": "પ્રતિસાદ મોકલ", - "should-migrate-to-flexible": "આ સમય છોડવાની પ્રકાશનની નવી સુવિધાઓમાંની એક એ કેલેન્ડર માટે લવચીક પ્રવેશો છે. \n \n આ નવો દૃશ્ય નવા ડેટાબેઝ ફોર્મેટનો ઉપયોગ કરે છે. તેનો ઉપયોગ કરવા માટે, તમે તમારા હાલના ડેટાબેઝને નવા ફોર્મેટમાં સ્થાનાંતરિત કરી શકો છો અથવા નવી શરૂઆત કરો.", "show-app": "એપ્લિકેશન બતાવો", "something-went-wrong": "કંઈક ખોટું થયું :(", "toggle-dev-tools": "વિકાસકર્તા સાધનોને ટerગલ કરો", diff --git a/locales/he/translation.json b/locales/he/translation.json index 3e4cbfc26..8f8b92a64 100644 --- a/locales/he/translation.json +++ b/locales/he/translation.json @@ -74,7 +74,6 @@ "cut": "לגזור", "database-export": "יצוא מסד נתונים", "database-imported": "מסד נתונים יובא", - "database-migrated": "מסד נתונים הועבר", "database-was-exported": "אוקי, מסד נתונים מוצא.", "edit": "לערוף", "exit": "לצאת", @@ -82,18 +81,12 @@ "export-database": "יצא מסד נתונים", "export-db-to-file": "יצא מסד נתונים לקובץ", "failed-entries": "רשומות כושלות", - "failed-migrating": "מיגרציה נכשלה", - "fresh-start": "התחלה חדשה", - "fresh-start-confirm": "האם אתה בטוח שאתה רוצה התחלה חדשה?", "help": "עזרה", "import": "יבוא", "import-database": "יבא מסד נתונים", "import-db-from-file": "יבא מסד נתונים מקובץ", "import-successful": "יש! יבוא הצליח!", "menu": "תפריט", - "migrate": "מיגרציה", - "migrate-calendar-to-flexible": "העבר לוח שנה מקובע לגמיש", - "migration-successful": "יש! מיגרציה הצליחה!", "no-thanks": "לא, תודה", "ok": "אוקי", "paste": "הדבק", @@ -105,7 +98,6 @@ "report": "דווח", "select-all": "בחירת הכל", "send-feedback": "שליחת משוב", - "should-migrate-to-flexible": "אחת מהתכונות החדשות של של גרסה זו היא כמות רשומות גמישה ללוח השנה.\n\n תצוגה חדשה זאת משתמשת בפורמט מסד נתונים חדש. \n\n כדי להשתמש בו, אתה יכול לעביר את מסד הנתונים לפורמט החדש או להתחיל מחדש.", "show-app": "הצג יישומון", "something-went-wrong": "משהו לא תקין קרה :(", "toggle-dev-tools": "הפעל/בטל כלי מפתח", diff --git a/locales/hi/translation.json b/locales/hi/translation.json index 0c49fb820..f7349301b 100644 --- a/locales/hi/translation.json +++ b/locales/hi/translation.json @@ -74,7 +74,6 @@ "cut": "कट गया", "database-export": "डेटाबेस निर्यात", "database-imported": "डेटाबेस आयात किया गया", - "database-migrated": "डेटाबेस माइग्रेट किया गया", "database-was-exported": "ठीक है, डेटाबेस निर्यात किया गया था।", "edit": "संपादित करें", "exit": "बाहर जाएं", @@ -82,18 +81,12 @@ "export-database": "निर्यात डेटाबेस", "export-db-to-file": "फाइल करने के लिए डेटाबेस निर्यात करें", "failed-entries": "प्रविष्टियां विफल", - "failed-migrating": "पलायन करने में विफल", - "fresh-start": "नयी शुरुआत", - "fresh-start-confirm": "क्या आप वाकई एक नई शुरुआत चाहते हैं?", "help": "मदद", "import": "आयात", "import-database": "डेटाबेस आयात करें", "import-db-from-file": "डेटाबेस फ़ाइल से आयात करें", "import-successful": "वाह! आयात सफल!", "menu": "मेन्यू", - "migrate": "प्रवास", - "migrate-calendar-to-flexible": "तय कैलेंडर डेटाबेस को लचीले में माइग्रेट करें", - "migration-successful": "वाह! प्रवासन सफल!", "no-thanks": "जी नहीं, धन्यवाद", "ok": "ठीक", "paste": "पेस्ट करें", @@ -105,7 +98,6 @@ "report": "रिपोर्ट", "select-all": "सभी का चयन करे", "send-feedback": "प्रतिक्रिया भेजें", - "should-migrate-to-flexible": "इस Time to Leave रिलीज़ की नई सुविधाओं में से एक कैलेंडर के लिए प्रविष्टियों की एक लचीली संख्या है।\n\nयह नया दृश्य एक नए डेटाबेस प्रारूप का उपयोग करता है।\nइसका उपयोग करने के लिए, आप या तो अपने मौजूदा डेटाबेस को नए प्रारूप में माइग्रेट कर सकते हैं या एक नई शुरुआत करें।", "show-app": "ऐप दिखाएं", "something-went-wrong": "कुछ ग़लत हुआ :(", "toggle-dev-tools": "डेवलपर टूल टॉगल करें", diff --git a/locales/id/translation.json b/locales/id/translation.json index 775785a01..fecf370e1 100644 --- a/locales/id/translation.json +++ b/locales/id/translation.json @@ -74,7 +74,6 @@ "cut": "Pindah", "database-export": "Ekspor Database", "database-imported": "Impor Database", - "database-migrated": "Database telah dimigrasikan", "database-was-exported": "Oke, database telah di ekspor.", "edit": "Edit", "exit": "Keluar", @@ -82,18 +81,12 @@ "export-database": "Ekspor database", "export-db-to-file": "Ekspor database ke file", "failed-entries": "Entri gagal", - "failed-migrating": "Gagal migrasi", - "fresh-start": "Mulai Baru", - "fresh-start-confirm": "Apakah Anda yakin ingin memulai awal baru?", "help": "Bantuan", "import": "Impor", "import-database": "Impor database", "import-db-from-file": "Impor database dari file", "import-successful": "Yes! Impor berhasil!", "menu": "Menu", - "migrate": "Migrasi", - "migrate-calendar-to-flexible": "Migrasi kalender database tetap menjadi fleksibel", - "migration-successful": "Yay! Migrasi selesai!", "no-thanks": "Tidak, Terima Kasih", "ok": "OK", "paste": "Tempel", @@ -105,7 +98,6 @@ "report": "Laporan", "select-all": "Pilih Semua", "send-feedback": "Berikan masukan", - "should-migrate-to-flexible": "Salah satu fitur baru dari rilis Time to Leave ini adalah jumlah entri kalender yang fleksibel.\n\nTampilan baru ini menggunakan format database baru.\nUntuk menggunakannya, Anda dapat memigrasikan database yang ada ke format baru atau mulai baru", "show-app": "Tampilkan Aplikasi", "something-went-wrong": "Suatu hal ada yang salah :(", "toggle-dev-tools": "Beralih ke alat pengembang", diff --git a/locales/it/translation.json b/locales/it/translation.json index db26ac61a..9f4808490 100644 --- a/locales/it/translation.json +++ b/locales/it/translation.json @@ -74,7 +74,6 @@ "cut": "Taglia", "database-export": "Esporta database", "database-imported": "Database importato", - "database-migrated": "Database migrato", "database-was-exported": "Okay, il database è stato esportato.", "edit": "Modifica", "exit": "Esci", @@ -82,18 +81,12 @@ "export-database": "Esporta database", "export-db-to-file": "Esporta database su file", "failed-entries": "Record falliti", - "failed-migrating": "Fallimento migrando", - "fresh-start": "Nuovo inizio", - "fresh-start-confirm": "Sei sicuro che vuoi ripartire da un nuovo inizio?", "help": "Aiuto", "import": "Importa", "import-database": "Importa database", "import-db-from-file": "Importa database da file", "import-successful": "Yay! Importazione conclusa con successo!", "menu": "Menu", - "migrate": "Migra", - "migrate-calendar-to-flexible": "Migra database con calendario fisso a flessibile", - "migration-successful": "Yay! Migrazione conclusa con successo!", "no-thanks": "No, grazie", "ok": "OK", "paste": "Incolla", @@ -105,7 +98,6 @@ "report": "Report", "select-all": "Seleziona tutto", "send-feedback": "Manda feedback", - "should-migrate-to-flexible": "Una delle nuove funzionalità di questa versione di Time to Leave è un numero flessibile di record per il calendario.\n\nQuesta nuova visuale usa un nuovo formato di database.\nPer usarlo puoi migrare il tuo database esistente al nuovo formato, oppure ripartire da un nuovo inizio.", "show-app": "Mostra App", "something-went-wrong": "Qualcosa è andato storto :(", "toggle-dev-tools": "Abilita Developer Tools", diff --git a/locales/ja/translation.json b/locales/ja/translation.json index b96db50c6..9c545139f 100644 --- a/locales/ja/translation.json +++ b/locales/ja/translation.json @@ -74,7 +74,6 @@ "cut": "切り取り", "database-export": "データベースのエクスポート", "database-imported": "データベースがインポートされました", - "database-migrated": "データベースが移行されました", "database-was-exported": "データベースがエクスポートされました", "edit": "編集", "exit": "終了", @@ -82,18 +81,12 @@ "export-database": "データベースのエクスポート", "export-db-to-file": "データベースをファイルにエクスポート", "failed-entries": "記録できませんでした", - "failed-migrating": "移行できませんでした", - "fresh-start": "やり直し", - "fresh-start-confirm": "やり直しますか？", "help": "ヘルプ", "import": "インポート", "import-database": "データベースのインポート", "import-db-from-file": "ファイルからデータベースをインポート", "import-successful": "インポート成功!", "menu": "メニュー", - "migrate": "移行", - "migrate-calendar-to-flexible": "固定カレンダーデータベースをフレキシブルなものに移行", - "migration-successful": "移行成功!", "no-thanks": "いいえ、結構です", "ok": "OK", "paste": "貼り付け", @@ -105,7 +98,6 @@ "report": "報告", "select-all": "全てを選択", "send-feedback": "フィードバックの送信", - "should-migrate-to-flexible": "このリリースの新機能の1つは、カレンダーへの記録数を柔軟に変更できることです。\n\nこの新しい表示方法は新しいデータベース形式を使用しています。\nこれを使用するには、既存のデータベースを新しいフォーマットに移行するか、または新しいフォーマットを作成してください。", "show-app": "アプリを表示する", "something-went-wrong": "問題が発生しました", "toggle-dev-tools": "開発者ツールの表示", diff --git a/locales/ko/translation.json b/locales/ko/translation.json index 33eb7241e..18093148b 100644 --- a/locales/ko/translation.json +++ b/locales/ko/translation.json @@ -74,7 +74,6 @@ "cut": "잘라내기", "database-export": "데이터베이스 내보내기", "database-imported": "데이터베이스 가져오기", - "database-migrated": "데이터베이스가 이전되었습니다.", "database-was-exported": "좋아요. 데이터베이스 파일을 성공적으로 생성했습니다.", "edit": "편집", "exit": "종료", @@ -82,18 +81,12 @@ "export-database": "데이터베이스 내보내기", "export-db-to-file": "데이터베이스 파일로 내보내기", "failed-entries": "작업 내보내기 실패", - "failed-migrating": "데이터 이전 실패", - "fresh-start": "새로 시작", - "fresh-start-confirm": "정말 초기 상태로 새롭게 시작하시겠습니까?", "help": "도움말", "import": "가져오기", "import-database": "데이터베이스 가져오기", "import-db-from-file": "파일로부터 데이터베이스 가져오기", "import-successful": "와! 성공적으로 가져왔어요!", "menu": "메뉴", - "migrate": "이전", - "migrate-calendar-to-flexible": "고정 캘린더 데이터베이스를 가변으로 이전", - "migration-successful": "야호! 이전에 성공했어요!", "no-thanks": "아뇨, 괜찮아요", "ok": "확인", "paste": "붙여넣기", @@ -105,7 +98,6 @@ "report": "버그 신고", "select-all": "모두 선택", "send-feedback": "피드백 보내기", - "should-migrate-to-flexible": "해당 Time to Leave 버전은 여러 작업을 등록 가능한 가변 캘린더 보기를 사용합니다.\n\n가변 캘린더 보기는 새 데이터베이스 형식을 사용합니다.\n이를 사용하려면 기존 데이터를 새 형식으로 이전하거나, 초기 상태로 새롭게 시작해야 합니다.", "show-app": "앱 표시", "something-went-wrong": "뭔가 잘못된 것 같네요 :(", "toggle-dev-tools": "개발자 도구 토글", diff --git a/locales/mr/translation.json b/locales/mr/translation.json index d007f4999..00cfcd519 100644 --- a/locales/mr/translation.json +++ b/locales/mr/translation.json @@ -74,7 +74,6 @@ "cut": "कट", "database-export": "डेटाबेस निर्यात", "database-imported": "डेटाबेस आयात केला", - "database-migrated": "डेटाबेस स्थलांतर", "database-was-exported": "ठीक आहे, डेटाबेस निर्यात झाला.", "edit": "सुधारणे", "exit": "बाहेर पडा", @@ -82,18 +81,12 @@ "export-database": "डेटाबेस निर्यात करा", "export-db-to-file": "फाईलमध्ये डेटाबेस निर्यात करा", "failed-entries": "नोंदी अयशस्वी", - "failed-migrating": "स्थलांतर करण्यात अयशस्वी", - "fresh-start": "नवी सुरुवात", - "fresh-start-confirm": "तुम्हाला नवीन सुरुवात करायची खात्री आहे का?", "help": "मदत करा", "import": "आयात करा", "import-database": "आयात डेटाबेस", "import-db-from-file": "फाईलमधून डेटाबेस आयात करा", "import-successful": "होय! आयात यशस्वी!", "menu": "मेनू", - "migrate": "स्थलांतर", - "migrate-calendar-to-flexible": "निश्चित कॅलेंडर डेटाबेस लवचिकमध्ये स्थलांतरित करा", - "migration-successful": "होय! स्थलांतर यशस्वी!", "no-thanks": "नको धन्यवाद", "ok": "ठीक आहे", "paste": "पेस्ट करा", @@ -105,7 +98,6 @@ "report": "अहवाल", "select-all": "सर्व निवडा", "send-feedback": "अभिप्राय पाठवा", - "should-migrate-to-flexible": "या टाईम टू लीव्ह रिलीजच्या नवीन वैशिष्ट्यांपैकी एक म्हणजे कॅलेंडरसाठी लवचिक नोंदी..\n\nहे नवीन दृश्य नवीन डेटाबेस स्वरूप वापरते. Use n ते वापरण्यासाठी, तुम्ही एकतर तुमचा विद्यमान डेटाबेस नवीन स्वरूपात स्थलांतरित करू शकता किंवा नवीन सुरुवात करू शकता.", "show-app": "अ‍ॅप दर्शवा", "something-went-wrong": "काहीतरी चूक घडली :(", "toggle-dev-tools": "विकसक साधने टॉगल करा", diff --git a/locales/nl/translation.json b/locales/nl/translation.json index daec79bf0..0a493103e 100644 --- a/locales/nl/translation.json +++ b/locales/nl/translation.json @@ -74,7 +74,6 @@ "cut": "Knippen", "database-export": "Database opslaan", "database-imported": "Database ingeladen", - "database-migrated": "Database overzetten", "database-was-exported": "Oké, de database is opgeslagen.", "edit": "Bewerken", "exit": "Verlaten", @@ -82,18 +81,12 @@ "export-database": "Database opslaan", "export-db-to-file": "Database opslaan als bestand", "failed-entries": "Mislukte invoeringen", - "failed-migrating": "Overzetten mislukt", - "fresh-start": "Nieuwe start", - "fresh-start-confirm": "Weet je zeker dat je een nieuwe start wilt?", "help": "Help", "import": "Inladen", "import-database": "Database inladen", "import-db-from-file": "Databasebestand inladen", "import-successful": "Joepie! Succesvol ingeladen!", "menu": "Menu", - "migrate": "Overzetten", - "migrate-calendar-to-flexible": "De vaste kalenderdatabase naar een flexibele overzetten", - "migration-successful": "Joepie! Succesvol overgezet!", "no-thanks": "Nee, bedankt", "ok": "Oké", "paste": "Plakken", @@ -105,7 +98,6 @@ "report": "Melden", "select-all": "Alles selecteren", "send-feedback": "Feedback versturen", - "should-migrate-to-flexible": "Een van de nieuwe functies van deze Time to Leave-versie is een flexibel aantal items voor de kalender.\n\nDeze nieuwe weergave gebruikt een nieuw databaseformaat.\nOm het te gebruiken, kan je de bestaande database overzetten naar het nieuwe formaat of een nieuwe start maken.", "show-app": "App bekijken", "something-went-wrong": "Er is iets misgegaan :(", "toggle-dev-tools": "Ontwikkelaarshulpmiddelen in-/uitschakelen", diff --git a/locales/pl/translation.json b/locales/pl/translation.json index f872d9bb1..56f8cd01e 100644 --- a/locales/pl/translation.json +++ b/locales/pl/translation.json @@ -74,7 +74,6 @@ "cut": "Wytnij", "database-export": "Eksport bazy danych", "database-imported": "Zaimportowana baza danych", - "database-migrated": "Przeniesiona baza danych", "database-was-exported": "Ok, baza danych została wyeksportowana.", "edit": "Edytuj", "exit": "Wyjdź", @@ -82,18 +81,12 @@ "export-database": "Eksportuj bazę danych.", "export-db-to-file": "Eksportuj bazę danych do pliku", "failed-entries": "Nieudane wpisy", - "failed-migrating": "Przenoszenie nie powiodło się", - "fresh-start": "Od początku", - "fresh-start-confirm": "Czy na pewno chcesz zacząć od nowa?", "help": "Pomoc", "import": "Importuj", "import-database": "Importuj bazę danych", "import-db-from-file": "Importuj bazę danych z pliku", "import-successful": "Zaimportowano pomyślnie!", "menu": "Menu", - "migrate": "Przenieś", - "migrate-calendar-to-flexible": "Przenieś bazę danych ze stałego do dynamicznego kalendarza", - "migration-successful": "Przenoszenie powiodło się!", "no-thanks": "Nie, dziękuję", "ok": "Ok", "paste": "Wklej", @@ -105,7 +98,6 @@ "report": "Raport", "select-all": "Wybierz wszystkie", "send-feedback": "Prześlij opinię", - "should-migrate-to-flexible": "Jedną z nowych funkcji tej wersji Time to Leave jest dynamiczna liczba wpisów w kalendarzu.\n\nTen nowy widok korzysta z nowego formatu bazy danych.\nAby z niego skorzystać, możesz przeprowadzić migrację istniejącej bazy danych do nowego formatu lub zacznij od nowa.", "show-app": "Pokaż aplikację", "something-went-wrong": "Coś poszło nie tak :(", "toggle-dev-tools": "Włącz DevTools", diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json index 636d5b901..5b1c8b626 100644 --- a/locales/pt-BR/translation.json +++ b/locales/pt-BR/translation.json @@ -74,7 +74,6 @@ "cut": "Cortar", "database-export": "Exportação de base de dados", "database-imported": "Base de dados importada", - "database-migrated": "Base de dados migrada", "database-was-exported": "Ok, a base de dados foi exportada.", "edit": "Editar", "exit": "Sair", @@ -82,18 +81,12 @@ "export-database": "Exportar base de dados", "export-db-to-file": "Exportar Base de Dados para Arquivo", "failed-entries": "Entradas falharam", - "failed-migrating": "Migração falhou", - "fresh-start": "Começar do zero", - "fresh-start-confirm": "Tem certeza que quer começar do zero?", "help": "Ajuda", "import": "Importar", "import-database": "Importar base de dados", "import-db-from-file": "Importar Base de Dados de um Arquivo", "import-successful": "Uhul! Sucesso ao importar!", "menu": "Menu", - "migrate": "Migrar", - "migrate-calendar-to-flexible": "Migrar base de dados de calendário fixo para flexível", - "migration-successful": "Uhul! Sucesso na migração!", "no-thanks": "Não, valeu", "ok": "OK", "paste": "Colar", @@ -105,7 +98,6 @@ "report": "Reportar", "select-all": "Selecionar Tudo", "send-feedback": "Enviar comentários", - "should-migrate-to-flexible": "Um dos novos recursos deste lançamento do Time to Leave é um número flexível de entradas para o calendário.\n\nEssa nova visão usa um novo formato de banco de dados.\nPara usá-lo, você pode ou migrar sua base de dados existente para o novo formato, ou começar do zero.", "show-app": "Mostrar App", "something-went-wrong": "Algo de errado aconteceu :(", "toggle-dev-tools": "Alternar DevTools", diff --git a/locales/pt-MI/translation.json b/locales/pt-MI/translation.json index a0673f0e4..c40ac7b34 100644 --- a/locales/pt-MI/translation.json +++ b/locales/pt-MI/translation.json @@ -74,7 +74,6 @@ "cut": "Cortar", "database-export": "Exportação de base de dados", "database-imported": "Base de dados importada", - "database-migrated": "Base de dados migrada", "database-was-exported": "Ok, a base de dados foi exportada.", "edit": "Editar", "exit": "Sair", @@ -82,18 +81,12 @@ "export-database": "Exportar base de dados", "export-db-to-file": "Exportar Base de Dados para Arquivo", "failed-entries": "Entradas falharam", - "failed-migrating": "Migração falhou", - "fresh-start": "Começar do zero", - "fresh-start-confirm": "Tem certeza que quer começar do zero?", "help": "Ajuda", "import": "Importar", "import-database": "Importar base de dados", "import-db-from-file": "Importar Base de Dados de um Arquivo", "import-successful": "Uhul! Sucesso ao importar!", "menu": "Menu", - "migrate": "Migrar", - "migrate-calendar-to-flexible": "Migrar base de dados de calendário fixo para flexível", - "migration-successful": "Uhul! Sucesso na migração!", "no-thanks": "Não, valeu", "ok": "OK", "paste": "Colar", @@ -105,7 +98,6 @@ "report": "Reportar", "select-all": "Selecionar Tudo", "send-feedback": "Enviar comentários", - "should-migrate-to-flexible": "Um dos novos recursos deste lançamento do Time to Leave é um número flexível de entradas para o calendário.\n\nEssa nova visão usa um novo formato de banco de dados.\nPara usá-lo, você pode ou migrar sua base de dados existente para o novo formato, ou começar do zero.", "show-app": "Mostrar App", "something-went-wrong": "Ê lasquera, deu ruim :(", "toggle-dev-tools": "Trem de desenvolvimento", diff --git a/locales/pt-PT/translation.json b/locales/pt-PT/translation.json index 048df34df..3218cd611 100644 --- a/locales/pt-PT/translation.json +++ b/locales/pt-PT/translation.json @@ -74,7 +74,6 @@ "cut": "Cortar", "database-export": "Exportar Base de Dados", "database-imported": "Base de Dados importada", - "database-migrated": "Base de Dados migrada", "database-was-exported": "Ok, a base de dados foi exportada.", "edit": "Editar", "exit": "Sair", @@ -82,18 +81,12 @@ "export-database": "Exportar base de dados", "export-db-to-file": "Exportar base de dados para ficheiro", "failed-entries": "Registos com falhas", - "failed-migrating": "Migração com falhas", - "fresh-start": "Começar do zero", - "fresh-start-confirm": "Tens a certeza que queres começar do zero?", "help": "Ajuda", "import": "Importar", "import-database": "Importar base de dados", "import-db-from-file": "Importar base de dados de um ficheiro", "import-successful": "Yey! Sucesso ao importar!", "menu": "Menu", - "migrate": "Migrar", - "migrate-calendar-to-flexible": "Converter base de dados de calendário fixo para flexível", - "migration-successful": "Yey! Sucesso ao migrar!", "no-thanks": "Não, obrigado", "ok": "OK", "paste": "Colar", @@ -105,7 +98,6 @@ "report": "Reportar", "select-all": "Selecionar Tudo", "send-feedback": "Enviar feedback", - "should-migrate-to-flexible": "Um dos novos recursos desta versão do Time to Leave é um número flexível de registos para o calendário.\n\nEste novo modo de visualização utiliza um novo formato de base de dados.\nPara o utilizar, podes migrar a tua base de dados existente para o novo formato, ou começar uma do zero.", "show-app": "Mostrar Aplicação", "something-went-wrong": "Aconteceu algo de errado :(", "toggle-dev-tools": "Alternar Ferramentas do programador", diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json index 406e92354..9619c8a3b 100644 --- a/locales/ru-RU/translation.json +++ b/locales/ru-RU/translation.json @@ -74,7 +74,6 @@ "cut": "Вырезать", "database-export": "Экспорт данных", "database-imported": "Данные загружены", - "database-migrated": "Данные перенесены", "database-was-exported": "База данных была экспортирована.", "edit": "Редактировать", "exit": "Выход", @@ -82,18 +81,12 @@ "export-database": "Экспортировать данные", "export-db-to-file": "Эксопртировать данные в файл", "failed-entries": "Не удалось сделать запись", - "failed-migrating": "Не удалось перенести", - "fresh-start": "Начать с начала", - "fresh-start-confirm": "Вы уверены, что хотите начать с начала?", "help": "Помощь", "import": "Импорт", "import-database": "Импортировать базу данных", "import-db-from-file": "Импортировать базу данных из файла", "import-successful": "Успешный импорт!", "menu": "Меню", - "migrate": "Перенести", - "migrate-calendar-to-flexible": "Перенести данные из фиксированного календаря в гибкий", - "migration-successful": "Переносено успешно!", "no-thanks": "Нет, спасибо", "ok": "Окей", "paste": "Копировать", @@ -105,7 +98,6 @@ "report": "Пожаловаться", "select-all": "Выбрать все", "send-feedback": "Отправить отзыв", - "should-migrate-to-flexible": "В новой версии Time to Leave появилась новая функция — гибкое количество записей для календаря.\n\nВ этом представлении используется новый формат базы данных.\nЧтобы использовать его, вы можете либо перенести существующую базу данных в новый формат, либо начать все заново.", "show-app": "Показать приложение", "something-went-wrong": "Что-то пошло не так :(", "toggle-dev-tools": "Переключить инструменты разработки", diff --git a/locales/sv-SE/translation.json b/locales/sv-SE/translation.json index 8193e7f5a..2f8070b83 100644 --- a/locales/sv-SE/translation.json +++ b/locales/sv-SE/translation.json @@ -74,7 +74,6 @@ "cut": "Klipp ut", "database-export": "Databasexport", "database-imported": "Databasen har importerats", - "database-migrated": "Databasen har migrerats", "database-was-exported": "Okej, databasen har exporterats.", "edit": "Editera", "exit": "Avsluta", @@ -82,18 +81,12 @@ "export-database": "Exportera databas", "export-db-to-file": "Exportera databasen som en fil", "failed-entries": "Misslyckade posters", - "failed-migrating": "Misslyckad migrering", - "fresh-start": "Nystart", - "fresh-start-confirm": "Är du säker på att du vill göra en nystart?", "help": "Hjälp", "import": "Importera", "import-database": "Importera databas", "import-db-from-file": "Importera database från en fil", "import-successful": "Jippi! Importen lyckades!", "menu": "Meny", - "migrate": "Migrera", - "migrate-calendar-to-flexible": "Migrera fix kalendardatabas till att bli flexibel.", - "migration-successful": "Jippi! Migreringen lyckades!", "no-thanks": "Nej tack!", "ok": "OK", "paste": "Klistra in", @@ -105,7 +98,6 @@ "report": "Raportera", "select-all": "Välj alla", "send-feedback": "Skicka synpunkter", - "should-migrate-to-flexible": "En ny funktion för denna version av Time to Leave är flexibelt antal poster för kalender.\n\nDenna nya vyn använder ett nytt databasformat.\nFör att använda den nya funktionen, kan du antingen migrera din nuvarande databas till det nya formatet eller göra en nystart.", "show-app": "Visa Appp", "something-went-wrong": "Något gick fel :(", "toggle-dev-tools": "Växla till utvecklarverktyg", diff --git a/locales/ta/translation.json b/locales/ta/translation.json index 204a5a7d7..db720f932 100644 --- a/locales/ta/translation.json +++ b/locales/ta/translation.json @@ -74,7 +74,6 @@ "cut": "கட்", "database-export": "டேட்டாபேஸ் ஏற்றுமதி", "database-imported": "டேட்டாபேஸ் இறக்குமதி செய்யப்பட்டது", - "database-migrated": "டேட்டாபேஸ் மைக்ரேட் செய்யப்பட்டது", "database-was-exported": "சரி, டேட்டாபேஸ் ஏற்றுமதி செய்யப்பட்டது.", "edit": "தொகு", "exit": "வெளியேறு", @@ -82,18 +81,12 @@ "export-database": "டேட்டாபேஸை ஏற்றுமதி செய்க", "export-db-to-file": "கோப்புக்கு டேட்டாபேஸை ஏற்றுமதி செய்க", "failed-entries": "தோல்வியுற்ற உள்ளீடுகள்", - "failed-migrating": "இடம்பெயர்வதில் தோல்வி", - "fresh-start": "புதிய தொடக்கம்", - "fresh-start-confirm": "நீங்கள் நிச்சயமாக ஒரு புதிய தொடக்கத்தை விரும்புகிறீர்களா?", "help": "உதவி", "import": "இறக்குமதி செய்க", "import-database": "டேட்டாபேஸை இறக்குமதி செய்க ", "import-db-from-file": "கோப்புக்கு டேட்டாபேஸை இறக்குமதி செய்க", "import-successful": "வெற்றிகரமாக இறக்குமதி செய்யப்பட்டது", "menu": "மெனு", - "migrate": "மைக்ரேட்", - "migrate-calendar-to-flexible": "நிலையான காலண்டர் டேட்டாபேஸை நெகிழ்வானதாக மைக்ரேட் செய்யவும்", - "migration-successful": "வெற்றிகரமாக மைக்ரேட் செய்யப்பட்டது", "no-thanks": "இல்லை, நன்றி", "ok": "சரி", "paste": "பேஸ்ட்", @@ -105,7 +98,6 @@ "report": "அறிவி", "select-all": "அனைத்தையும் தெரிவுசெய்", "send-feedback": "கருத்தினை அனுப்பவும்", - "should-migrate-to-flexible": "இந்த Time to Leave வெளியீட்டின் புதிய அம்சங்களில் ஒன்று காலெண்டருக்கான நெகிழ்வான உள்ளீடுகள்.\n\n இந்த புதிய காட்சி புதிய டேட்டாபேஸ் வடிவமைப்பைப் பயன்படுத்துகிறது.\n இதைப் பயன்படுத்த, நீங்கள் ஏற்கனவே இருக்கும் டேட்டாபேஸை புதிய வடிவமைப்பிற்கு மாற்றலாம் அல்லது புதிய தொடக்கத்தை மேற்கொள்ளுங்கள்.", "show-app": "ஆப்பை காட்டு", "something-went-wrong": "ஏதோ தவறு நடந்துவிட்டது :(", "toggle-dev-tools": "டேவலப்பர் டூல்ஸை டாகில் செய்க", diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json index 4a94a1885..1708c40e3 100644 --- a/locales/th-TH/translation.json +++ b/locales/th-TH/translation.json @@ -74,7 +74,6 @@ "cut": "ตัด", "database-export": "การนำออกฐานข้อมูล", "database-imported": "การนำเข้าฐานข้อมูล", - "database-migrated": "การย้ายฐานข้อมูล", "database-was-exported": "การนำออกฐานข้อมูลเสร็จสิ้น", "edit": "แก้ไข", "exit": "ออก", @@ -82,18 +81,12 @@ "export-database": "นำออกฐานข้อมูล", "export-db-to-file": "การนำออกฐานข้อมูลไปเป็นไฟล์", "failed-entries": "ข้อมูลที่ล้มเหลว", - "failed-migrating": "การย้ายข้อมูลล้มเหลว", - "fresh-start": "เริ่มต้นใหม่", - "fresh-start-confirm": "คุณแน่ใจว่าต้องการเริ่มต้นใหม่หรือไม่?", "help": "ช่วยเหลือ", "import": "นำเข้า", "import-database": "นำเข้าฐานข้อมูล", "import-db-from-file": "การนำเข้าฐานข้อมูลจากไฟล์", "import-successful": "การนำเข้าฐานข้อมูลเสร็จสิ้น", "menu": "เมนู", - "migrate": "โอนย้าย", - "migrate-calendar-to-flexible": "ย้ายไปยังปฎิทินแบบล็อคไปยังแบบยืดหยุ่น", - "migration-successful": "เย้! การโอนย้ายเสร็จสมบูรณ์ !", "no-thanks": "ไม่", "ok": "ตกลง", "paste": "วาง", @@ -105,7 +98,6 @@ "report": "รายงาน", "select-all": "เลือกทั้งหมด", "send-feedback": "ส่งคำติชม", - "should-migrate-to-flexible": "หนึ่งในรูปแบบใหม่ของ Time to Leave รุ่นนี้คือจำนวนรายการที่ยืดหยุ่นได้สำหรับปฏิทิน\n\nโดยจะใช้รูปแบบฐานข้อมูลแบบใหม่\nหากต้องการใช้งาน คุณสามารถย้ายฐานข้อมูลที่มีอยู่ไปยังรูปแบบใหม่หรือสร้่างฐานข้อมูลใหม่", "show-app": "เปิดโปรแกรม", "something-went-wrong": "เกิดข้อผิดพลาด :(", "toggle-dev-tools": "เปิดมุมมองนักพัฒนา", diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json index 267276ef5..7c5646d0c 100644 --- a/locales/tr-TR/translation.json +++ b/locales/tr-TR/translation.json @@ -74,7 +74,6 @@ "cut": "Kes", "database-export": "Veritabanını dışa aktar", "database-imported": "Veritabanı içe aktarıldı.", - "database-migrated": "Veritabanı taşındı", "database-was-exported": "Tamam, veritabanı dışa aktarıldı.", "edit": "Düzenle", "exit": "Çıkış", @@ -82,18 +81,12 @@ "export-database": "Veritabanına dışa aktar", "export-db-to-file": "Veritabanını dosyaya aktar", "failed-entries": "Başarısız girdiler", - "failed-migrating": "Taşıma başarısız oldu", - "fresh-start": "Yeni Bir Başlangıç", - "fresh-start-confirm": "Yeni bir başlangıç istediğine emin misiniz?", "help": "Yardım", "import": "Dışa aktar", "import-database": "Veritabanını içe aktar", "import-db-from-file": "Veritabanını dosyadan içe aktar", "import-successful": "Yaşasın! İçe aktarma başarılı!", "menu": "Menü", - "migrate": "Taşıma", - "migrate-calendar-to-flexible": "Sabit takvim veritabanını esnek hale getirin.", - "migration-successful": "Yaşasın! Taşıma başarılı!", "no-thanks": "Hayır, Teşekkürler", "ok": "Tamam", "paste": "Yapıştır", @@ -105,7 +98,6 @@ "report": "Rapor", "select-all": "Hepsini Seç", "send-feedback": "Geri Bildirim Gönder", - "should-migrate-to-flexible": "Time to Leave yeni özelliklerinden biri de takvim için esnek girdi sayısıdır.\n\nBu yeni görünüm, yeni bir veritabanı biçimini kullanır.\nBunu kullanmak için mevcut veritabanınızı yeni formata geçirebilir veya yeni bir başlangıç yapabilirsiniz.", "show-app": "Uygulamayı Göster", "something-went-wrong": "Bazı şeyler ters gitti :(", "toggle-dev-tools": "Geliştirici Araçlarını Aç/Kapat", diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json index 08760baac..eb8ff1929 100644 --- a/locales/uk-UA/translation.json +++ b/locales/uk-UA/translation.json @@ -74,7 +74,6 @@ "cut": "Вирізати", "database-export": "Експорт бази даних", "database-imported": "Імпорт бази даних завершено", - "database-migrated": "Міграція бази даних завершена", "database-was-exported": "Чудово, експорт бази даних завершено.", "edit": "Редагувати", "exit": "Вихід", @@ -82,18 +81,12 @@ "export-database": "Експорт бази даних", "export-db-to-file": "Експорт бази даних у файл", "failed-entries": "Помилка запису", - "failed-migrating": "Помилка міграції", - "fresh-start": "Почати спочатку", - "fresh-start-confirm": "Ви впевнені, що хочете почати все заново?", "help": "Довідка", "import": "Імпорт", "import-database": "Імпорт бази даних", "import-db-from-file": "Імпорт бази даних із файлу", "import-successful": "Ура! Імпорт успішний!", "menu": "Меню", - "migrate": "Мігрувати", - "migrate-calendar-to-flexible": "Перенести базу даних фіксованого календаря на гнучкий", - "migration-successful": "Ура! Міграція успішна!", "no-thanks": "Ні, дякую", "ok": "Окей", "paste": "Вставити", @@ -105,7 +98,6 @@ "report": "Поскаржитись", "select-all": "Вибрати все", "send-feedback": "Надіслати відгук", - "should-migrate-to-flexible": "Однією з нових функцій цього випуску Time to Leave є гнучка кількість записів для календаря.\n\nЦей новий режим перегляду використовує новий формат бази даних.\nЩоб використовувати його, ви можете або перенести наявну базу даних у новий формат, або почати все заново.", "show-app": "Показати додаток", "something-went-wrong": "Щось пішло не так :(", "toggle-dev-tools": "Увімкнути/вимкнути інструменти розробника", diff --git a/locales/zh-TW/translation.json b/locales/zh-TW/translation.json index 683572779..af3696f3d 100644 --- a/locales/zh-TW/translation.json +++ b/locales/zh-TW/translation.json @@ -74,7 +74,6 @@ "cut": "剪下", "database-export": "導出資料庫", "database-imported": "已導入資料庫", - "database-migrated": "已轉移資料庫", "database-was-exported": "已導出資料庫", "edit": "編輯", "exit": "退出", @@ -82,18 +81,12 @@ "export-database": "導出資料庫", "export-db-to-file": "導出資料庫到文件", "failed-entries": "紀錄時發生錯誤", - "failed-migrating": "轉移時發生錯誤", - "fresh-start": "重新開始", - "fresh-start-confirm": "確定要重新開始嗎？", "help": "幫助", "import": "導入", "import-database": "導入資料庫", "import-db-from-file": "從文件導入資料庫", "import-successful": "太好了！導入成功！", "menu": "目錄", - "migrate": "轉移", - "migrate-calendar-to-flexible": "轉移固定日曆資料庫到自由", - "migration-successful": "太好了！轉移成功！", "no-thanks": "不用了，謝謝", "ok": "好的", "paste": "貼上", @@ -105,7 +98,6 @@ "report": "報告", "select-all": "選擇全部", "send-feedback": "發送意見反饋", - "should-migrate-to-flexible": "其中一個此Time to Leave發佈的新特性是擁有日歷彈性條目數。\n\n這個新的查看方式使用了一個新的資料庫格式。\n如需使用此功能，你可以轉移你現有的資料庫到新的格式或重新開始。", "show-app": "顯示程式", "something-went-wrong": "出錯了 :(", "toggle-dev-tools": "切換開發者工具", From 455beb5c446c35dc7b901ecb9e57b613daeee163 Mon Sep 17 00:00:00 2001 From: Thamara Andrade Date: Mon, 8 Jan 2024 00:22:43 -0300 Subject: [PATCH 3/6] Removing leftover code related to db migration --- __tests__/__main__/import-export.js | 33 ----------------------------- __tests__/__main__/validate-json.js | 2 +- js/import-export.js | 14 ------------ js/main-window.js | 5 ++--- 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/__tests__/__main__/import-export.js b/__tests__/__main__/import-export.js index f57107422..0f6969bd9 100644 --- a/__tests__/__main__/import-export.js +++ b/__tests__/__main__/import-export.js @@ -92,39 +92,6 @@ describe('Import export', function() }); }); - const migratedFlexibleEntries = { - '2020-3-1': {'values': ['08:00', '12:00', '13:00', '17:00']}, - '2020-3-2': {'values': ['10:00', '18:00']} - }; - - // TODO: Mixed importing is still here due to compatibility with old dbs. Please remove on the next release. - const mixedEntriesContent = - `[{"type": "regular", "date": "2020-6-3", "data": "day-end", "hours": "10:00"}, - {"type": "regular", "date": "2020-6-3", "data": "day-begin", "hours": "08:00"}, - {"type": "flexible", "date": "2020-3-1", "values": ["08:00", "12:00", "13:00", "17:00"]} - ]`; - const mixedEntriesFile = path.join(folder, 'mixed.ttldb'); - fs.writeFileSync(mixedEntriesFile, mixedEntriesContent, 'utf8'); - - // Expected values have month-1, due to how the db saves them starting from 0 - const expectedMixedEntries = { - '2020-2-1': {'values': ['08:00', '12:00', '13:00', '17:00']}, - '2020-5-3': {'values': ['08:00', '10:00']} - }; - - describe('importDatabaseFromFile (mixedContent)', function() - { - test('Check that import works', () => - { - flexibleStore.clear(); - expect(flexibleStore.size).toBe(0); - expect(importDatabaseFromFile([mixedEntriesFile])['result']).toBeTruthy(); - expect(flexibleStore.size).toBe(2); - expect(flexibleStore.get('2020-2-1')).toStrictEqual(expectedMixedEntries['2020-2-1']); - expect(flexibleStore.get('2020-5-3')).toStrictEqual(expectedMixedEntries['2020-5-3']); - }); - }); - afterAll(() => { fs.rmSync(folder, {recursive: true}); diff --git a/__tests__/__main__/validate-json.js b/__tests__/__main__/validate-json.js index 62cb7c3db..ce4f2ff54 100644 --- a/__tests__/__main__/validate-json.js +++ b/__tests__/__main__/validate-json.js @@ -27,7 +27,7 @@ describe('Validate json', function() }); }); -describe('validate date with and without leading 0', function() + describe('validate date with and without leading 0', function() { const validFlexibleDate1 = [{ 'type': 'flexible', 'date': '2020-06-03', 'values': ['08:00', '12:00', '13:00', '14:00'] }]; const validFlexibleDate2 = [{ 'type': 'flexible', 'date': '2020-6-3', 'values': ['08:00', '12:00', '13:00', '14:00'] }]; diff --git a/js/import-export.js b/js/import-export.js index e69aad14f..c4a7a4789 100644 --- a/js/import-export.js +++ b/js/import-export.js @@ -106,20 +106,6 @@ function validEntry(entry) return false; } -function mergeOldStoreDataIntoFlexibleStore(flexibleEntry, oldStoreHours) -{ - let index = 0; - for (const hour of flexibleEntry.values) - { - if (oldStoreHours > hour) - { - index++; - } - } - flexibleEntry.values.splice(index, 0, oldStoreHours); - return flexibleEntry; -} - function importDatabaseFromFile(filename) { const flexibleStore = new Store({name: 'flexible-store'}); diff --git a/js/main-window.js b/js/main-window.js index 43c27ef6c..6cff2c757 100644 --- a/js/main-window.js +++ b/js/main-window.js @@ -1,8 +1,7 @@ 'use strict'; -import { app, BrowserWindow, dialog, ipcMain, Menu, shell, Tray } from 'electron'; +import { app, BrowserWindow, ipcMain, Menu, Tray } from 'electron'; import path from 'path'; -import Store from 'electron-store'; const { checkForUpdates, shouldCheckForUpdates } = require('./update-manager'); const { @@ -17,7 +16,7 @@ const { getCurrentTranslation } = require('../src/configs/i18next.config'); let { contextMenu, tray } = require('./windows.js'); import { getDefaultWidthHeight, getUserPreferences, switchCalendarView } from './user-preferences.js'; -import { appConfig, getDetails } from './app-config.cjs'; +import { appConfig } from './app-config.cjs'; import { createLeaveNotification } from './notification.js'; // Keep a global reference of the window object, if you don't, the window will From 58c8ae379f79e0768bd07715dca2279457f2c4de Mon Sep 17 00:00:00 2001 From: Thamara Andrade Date: Mon, 8 Jan 2024 00:24:27 -0300 Subject: [PATCH 4/6] Removing comment --- __tests__/__main__/import-export.js | 1 - 1 file changed, 1 deletion(-) diff --git a/__tests__/__main__/import-export.js b/__tests__/__main__/import-export.js index 0f6969bd9..20f52c936 100644 --- a/__tests__/__main__/import-export.js +++ b/__tests__/__main__/import-export.js @@ -15,7 +15,6 @@ describe('Import export', function() { process.env.NODE_ENV = 'test'; - // TODO: Regular store entries are still here to test import of old dbs. Please remove on the next release. describe('validEntry(entry)', function() { const goodRegularEntry = {'type': 'regular', 'date': '2020-06-03', 'data': 'day-begin', 'hours': '08:00'}; From db89ee257cb2bbc3df81d245001eaccb93ff91ce Mon Sep 17 00:00:00 2001 From: Thamara Andrade Date: Mon, 8 Jan 2024 00:25:40 -0300 Subject: [PATCH 5/6] Moving tests to test flexible invalid dates --- __tests__/__main__/import-export.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__tests__/__main__/import-export.js b/__tests__/__main__/import-export.js index 20f52c936..a13000702 100644 --- a/__tests__/__main__/import-export.js +++ b/__tests__/__main__/import-export.js @@ -70,9 +70,9 @@ describe('Import export', function() }); const invalidEntriesContent = - `[{"type": "regular", "date": "not-a-date", "data": "day-begin", "hours": "08:00"}, + `[{"type": "flexible", "date": "not-a-date", "data": "day-begin", "hours": "08:00"}, {"type": "waived", "date": "2020-01-01", "data": "example waiver 2", "hours": "not-an-hour"}, - {"type": "regular", "date": "not-a-date", "data": "day-end", "hours": "17:00"}, + {"type": "flexible", "date": "not-a-date", "data": "day-end", "hours": "17:00"}, {"type": "flexible", "date": "not-a-date", "values": "not-an-array"}, {"type": "not-a-type", "date": "not-a-date", "data": "day-end", "hours": "17:00"} ]`; From 8e8f3843ab05b6c89e9fe7aee263e55d890b5c50 Mon Sep 17 00:00:00 2001 From: Thamara Andrade Date: Mon, 8 Jan 2024 00:27:41 -0300 Subject: [PATCH 6/6] Adjusting tests --- __tests__/__main__/import-export.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/__tests__/__main__/import-export.js b/__tests__/__main__/import-export.js index a13000702..a81726d94 100644 --- a/__tests__/__main__/import-export.js +++ b/__tests__/__main__/import-export.js @@ -17,23 +17,19 @@ describe('Import export', function() describe('validEntry(entry)', function() { - const goodRegularEntry = {'type': 'regular', 'date': '2020-06-03', 'data': 'day-begin', 'hours': '08:00'}; const goodFlexibleEntry = {'type': 'flexible', 'date': '2020-06-03', 'values': ['08:00', '12:00', '13:00', '14:00']}; const goodWaivedEntry = {'type': 'waived', 'date': '2020-06-03', 'data': 'waived', 'hours': '08:00'}; - const badRegularEntry = {'type': 'regular', 'date': 'not-a-date', 'data': 'day-begin', 'hours': '08:00'}; const badFlexibleEntry = {'type': 'flexible', 'date': '2020-06-03', 'values': ['not-an-hour']}; const badFlexibleEntry2 = {'type': 'flexible', 'date': '2020-06-03', 'values': 'not-an-array'}; const badWaivedEntry = {'type': 'regular', 'date': '2020-06-03', 'data': 'day-begin', 'hours': 'not-an-hour'}; test('should be valid', () => { - expect(validEntry(goodRegularEntry)).toBeTruthy(); expect(validEntry(goodWaivedEntry)).toBeTruthy(); expect(validEntry(goodFlexibleEntry)).toBeTruthy(); }); test('should not be valid', () => { - expect(validEntry(badRegularEntry)).not.toBeTruthy(); expect(validEntry(badWaivedEntry)).not.toBeTruthy(); expect(validEntry(badFlexibleEntry)).not.toBeTruthy(); expect(validEntry(badFlexibleEntry2)).not.toBeTruthy();