From 7d878c87eb0c12b6034da760f93fe356553206ba Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 22:51:17 +0000 Subject: [PATCH 1/7] fix translations failing --- .../src/server/budget/cleanup-template.ts | 22 ++++++++----------- .../src/server/budget/goaltemplates.ts | 11 +++------- packages/loot-core/src/server/main.ts | 9 ++------ packages/loot-core/src/server/mutators.ts | 5 +---- packages/loot-core/src/server/sheet.ts | 5 ++--- 5 files changed, 17 insertions(+), 35 deletions(-) diff --git a/packages/loot-core/src/server/budget/cleanup-template.ts b/packages/loot-core/src/server/budget/cleanup-template.ts index 9c016fd031c..ea1266b81c1 100644 --- a/packages/loot-core/src/server/budget/cleanup-template.ts +++ b/packages/loot-core/src/server/budget/cleanup-template.ts @@ -1,6 +1,3 @@ -// @ts-strict-ignore -import { t } from 'i18next'; - import { Notification } from '../../client/state-types/notifications'; import * as monthUtils from '../../shared/months'; import * as db from '../db'; @@ -115,7 +112,7 @@ async function applyGroupCleanups( }); } } else { - warnings.push(groupName + t(' has no matching sink categories.')); + warnings.push(groupName + ' has no matching sink categories.'); } sourceGroups = sourceGroups.filter(c => c.group !== groupName); groupLength = sourceGroups.length; @@ -220,7 +217,7 @@ async function processCleanup(month: string): Promise { }); num_sources += 1; } else { - warnings.push(category.name + t(' does not have available funds.')); + warnings.push(category.name + ' does not have available funds.'); } const carryover = await db.first( `SELECT carryover FROM zero_budgets WHERE month = ? and category = ?`, @@ -287,7 +284,8 @@ async function processCleanup(month: string): Promise { const budgetAvailable = await getSheetValue(sheetName, `to-budget`); if (budgetAvailable <= 0) { - warnings.push(t('Global: No funds are available to reallocate.')); + console.log('Global: No funds are available to reallocate.'); + // warnings.push(t('Global: No funds are available to reallocate.')); } //fill sinking categories @@ -322,19 +320,19 @@ async function processCleanup(month: string): Promise { return { type: 'error', sticky: true, - message: t('There were errors interpreting some templates:'), + message: 'There were errors interpreting some templates:', pre: errors.join('\n\n'), }; } else if (warnings.length) { return { type: 'warning', - message: t('Global: Funds not available:'), + message: 'Global: Funds not available:', pre: warnings.join('\n\n'), }; } else { return { type: 'message', - message: t('All categories were up to date.'), + message: 'All categories were up to date.', }; } } else { @@ -344,15 +342,13 @@ async function processCleanup(month: string): Promise { if (errors.length) { return { sticky: true, - message: t('{applied} There were errors interpreting some templates:', { - applied, - }), + message: `${applied} There were errors interpreting some templates:`, pre: errors.join('\n\n'), }; } else if (warnings.length) { return { type: 'warning', - message: t('Global: Funds not available:'), + message: 'Global: Funds not available:', pre: warnings.join('\n\n'), }; } else { diff --git a/packages/loot-core/src/server/budget/goaltemplates.ts b/packages/loot-core/src/server/budget/goaltemplates.ts index b1cc0d01ef0..01b890d46ff 100644 --- a/packages/loot-core/src/server/budget/goaltemplates.ts +++ b/packages/loot-core/src/server/budget/goaltemplates.ts @@ -1,6 +1,3 @@ -// @ts-strict-ignore -import { t } from 'i18next'; - import { Notification } from '../../client/state-types/notifications'; import * as monthUtils from '../../shared/months'; import * as db from '../db'; @@ -190,13 +187,13 @@ async function processTemplate( if (catObjects.length === 0 && errors.length === 0) { return { type: 'message', - message: t('Everything is up to date'), + message: 'Everything is up to date', }; } if (errors.length > 0) { return { sticky: true, - message: t('There were errors interpreting some templates:'), + message: 'There were errors interpreting some templates:', pre: errors.join(`\n\n`), }; } @@ -247,8 +244,6 @@ async function processTemplate( return { type: 'message', - message: t('Successfully applied templates to {length} categories', { - length: catObjects.length, - }), + message: `Successfully applied templates to ${catObjects.length} categories`, }; } diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts index 3a69c56886e..a4965372f69 100644 --- a/packages/loot-core/src/server/main.ts +++ b/packages/loot-core/src/server/main.ts @@ -3,7 +3,6 @@ import './polyfills'; import * as injectAPI from '@actual-app/api/injected'; import * as CRDT from '@actual-app/crdt'; -import { t } from 'i18next'; import { v4 as uuidv4 } from 'uuid'; import { createTestBudget } from '../mocks/budget'; @@ -1088,18 +1087,14 @@ function handleSyncError(err, acct) { accountId: acct.id, message: err.reason ? err.reason - : t( - 'Account “{acctName}” is not linked properly. Please link it again.', - { acctName: acct.name }, - ), + : `Account “${acct.name}” is not linked properly. Please link it again.`, }; } return { accountId: acct.id, - message: t( + message: 'There was an internal error. Please get in touch https://actualbudget.org/contact for support.', - ), internal: err.stack, }; } diff --git a/packages/loot-core/src/server/mutators.ts b/packages/loot-core/src/server/mutators.ts index 6c8fc834ff8..fa4a55b44b2 100644 --- a/packages/loot-core/src/server/mutators.ts +++ b/packages/loot-core/src/server/mutators.ts @@ -1,6 +1,3 @@ -// @ts-strict-ignore -import { t } from 'i18next'; - import { captureException, captureBreadcrumb } from '../platform/exceptions'; import { sequential } from '../shared/async'; import { type HandlerFunctions, type Handlers } from '../types/handlers'; @@ -123,7 +120,7 @@ export function getMutatorContext() { if (currentContext == null) { captureBreadcrumb({ category: 'server', - message: t('Recent methods: ') + _latestHandlerNames.join(', '), + message: 'Recent methods: ' + _latestHandlerNames.join(', '), }); // captureException(new Error('getMutatorContext: mutator not running')); diff --git a/packages/loot-core/src/server/sheet.ts b/packages/loot-core/src/server/sheet.ts index 476e62af9e5..b0729ba5cdf 100644 --- a/packages/loot-core/src/server/sheet.ts +++ b/packages/loot-core/src/server/sheet.ts @@ -1,6 +1,5 @@ // @ts-strict-ignore import { type Database } from '@jlongster/sql.js'; -import { t } from 'i18next'; import { captureBreadcrumb } from '../platform/exceptions'; import * as sqlite from '../platform/server/sqlite'; @@ -133,7 +132,7 @@ export async function loadSpreadsheet( } captureBreadcrumb({ - message: t('loading spreaadsheet'), + message: 'loading spreaadsheet', category: 'server', }); @@ -163,7 +162,7 @@ export async function loadSpreadsheet( } captureBreadcrumb({ - message: t('loaded spreaadsheet'), + message: 'loaded spreaadsheet', category: 'server', }); From 4202ba1be8a0ed862c980c2b72e7f45c2fd5ce55 Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 22:52:24 +0000 Subject: [PATCH 2/7] release notes --- upcoming-release-notes/3830.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 upcoming-release-notes/3830.md diff --git a/upcoming-release-notes/3830.md b/upcoming-release-notes/3830.md new file mode 100644 index 00000000000..a4ca4e25fda --- /dev/null +++ b/upcoming-release-notes/3830.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MikesGlitch] +--- + +Fix broken translations in worker files From bd84d1324106f7b192671c599bb183e8f9d50023 Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 22:55:20 +0000 Subject: [PATCH 3/7] blasphemy --- packages/loot-core/src/server/mutators.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/loot-core/src/server/mutators.ts b/packages/loot-core/src/server/mutators.ts index fa4a55b44b2..f5eac7b1d80 100644 --- a/packages/loot-core/src/server/mutators.ts +++ b/packages/loot-core/src/server/mutators.ts @@ -1,3 +1,4 @@ +// @ts-strict-ignore import { captureException, captureBreadcrumb } from '../platform/exceptions'; import { sequential } from '../shared/async'; import { type HandlerFunctions, type Handlers } from '../types/handlers'; From 7dbe7861d5217398e1638a38052580e7ea030fd3 Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 22:58:09 +0000 Subject: [PATCH 4/7] more blasphemy --- packages/loot-core/src/server/budget/cleanup-template.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/loot-core/src/server/budget/cleanup-template.ts b/packages/loot-core/src/server/budget/cleanup-template.ts index ea1266b81c1..8d62d7b01fe 100644 --- a/packages/loot-core/src/server/budget/cleanup-template.ts +++ b/packages/loot-core/src/server/budget/cleanup-template.ts @@ -1,3 +1,4 @@ +// @ts-strict-ignore import { Notification } from '../../client/state-types/notifications'; import * as monthUtils from '../../shared/months'; import * as db from '../db'; From d89d83698f7d3c4f20793228c3054b2484f9cbf1 Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 22:58:49 +0000 Subject: [PATCH 5/7] putting warning back --- packages/loot-core/src/server/budget/cleanup-template.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/loot-core/src/server/budget/cleanup-template.ts b/packages/loot-core/src/server/budget/cleanup-template.ts index 8d62d7b01fe..8c1b109212c 100644 --- a/packages/loot-core/src/server/budget/cleanup-template.ts +++ b/packages/loot-core/src/server/budget/cleanup-template.ts @@ -285,8 +285,7 @@ async function processCleanup(month: string): Promise { const budgetAvailable = await getSheetValue(sheetName, `to-budget`); if (budgetAvailable <= 0) { - console.log('Global: No funds are available to reallocate.'); - // warnings.push(t('Global: No funds are available to reallocate.')); + warnings.push('Global: No funds are available to reallocate.'); } //fill sinking categories From 352dbbeb4ab76413f28b0c0280ac9248e27c7e5d Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 23:02:01 +0000 Subject: [PATCH 6/7] last heretic act --- packages/loot-core/src/server/budget/goaltemplates.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/loot-core/src/server/budget/goaltemplates.ts b/packages/loot-core/src/server/budget/goaltemplates.ts index 01b890d46ff..f0509ccbb2a 100644 --- a/packages/loot-core/src/server/budget/goaltemplates.ts +++ b/packages/loot-core/src/server/budget/goaltemplates.ts @@ -1,3 +1,4 @@ +// @ts-strict-ignore import { Notification } from '../../client/state-types/notifications'; import * as monthUtils from '../../shared/months'; import * as db from '../db'; From a3b7ed88dbed74819cf1e5e7bc56cfbd9a9b9c02 Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Wed, 13 Nov 2024 23:12:38 +0000 Subject: [PATCH 7/7] making the world a better place --- packages/loot-core/src/server/sheet.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/loot-core/src/server/sheet.ts b/packages/loot-core/src/server/sheet.ts index b0729ba5cdf..106e59812fd 100644 --- a/packages/loot-core/src/server/sheet.ts +++ b/packages/loot-core/src/server/sheet.ts @@ -132,7 +132,7 @@ export async function loadSpreadsheet( } captureBreadcrumb({ - message: 'loading spreaadsheet', + message: 'loading spreadsheet', category: 'server', }); @@ -162,7 +162,7 @@ export async function loadSpreadsheet( } captureBreadcrumb({ - message: 'loaded spreaadsheet', + message: 'loaded spreadsheet', category: 'server', });