Clean up languages [skip ci]

This commit is contained in:
James Cole
2024-01-07 07:02:28 +01:00
parent 8043c86942
commit 0d2ae8ae23
76 changed files with 1355 additions and 1367 deletions

View File

@@ -25,7 +25,6 @@ import {parseFromEntries} from "./shared/parse-from-entries.js";
import formatMoney from "../../util/format-money.js";
import Post from "../../api/v2/model/transaction/post.js";
import {getVariable} from "../../store/get-variable.js";
import {I18n} from "i18n-js";
import {loadTranslations} from "../../support/load-translations.js";
import {loadCurrencies} from "./shared/load-currencies.js";
import {loadBudgets} from "./shared/load-budgets.js";
@@ -46,14 +45,13 @@ import {processAttachments} from "./shared/process-attachments.js";
import {spliceErrorsIntoTransactions} from "./shared/splice-errors-into-transactions.js";
import Tags from "bootstrap5-tags";
import {addLocation} from "./shared/manage-locations.js";
import i18next from "i18next";
// TODO upload attachments to other file
// TODO fix two maps, perhaps disconnect from entries entirely.
// TODO group title
// TODO map location from preferences
// TODO field preferences
let i18n;
const urls = getUrls();
let transactions = function () {
@@ -272,21 +270,13 @@ let transactions = function () {
this.notifications.wait.show = false;
this.notifications.error.show = true;
this.formStates.isSubmitting = false;
this.notifications.error.text = i18n.t('firefly.errors_upload');
this.notifications.error.text = i18next.t('firefly.errors_upload');
console.error(event);
},
init() {
// get translations
// TODO loading translations could be better, but do this later.
Promise.all([getVariable('language', 'en_US')]).then((values) => {
i18n = new I18n();
const locale = values[0].replace('-', '_');
i18n.locale = locale;
loadTranslations(i18n, locale).then(() => {
this.addSplit();
});
});
this.addSplit();
// load currencies and save in form data.
loadCurrencies().then(data => {
this.formStates.loadingCurrencies = false;
@@ -389,7 +379,7 @@ let transactions = function () {
if (attachmentCount > 0) {
// if count is more than zero, system is processing transactions in the background.
this.notifications.wait.show = true;
this.notifications.wait.text = i18n.t('firefly.wait_attachments');
this.notifications.wait.text = i18next.t('firefly.wait_attachments');
return;
}
@@ -418,7 +408,7 @@ let transactions = function () {
this.notifications.success.show = true;
this.notifications.success.url = 'transactions/show/' + this.groupProperties.id;
this.notifications.success.text = i18n.t('firefly.stored_journal_js', {description: this.groupProperties.title});
this.notifications.success.text = i18next.t('firefly.stored_journal_js', {description: this.groupProperties.title});
if (this.formStates.resetButton) {
this.entries = [];
@@ -436,7 +426,7 @@ let transactions = function () {
this.notifications.success.show = false;
this.notifications.wait.show = false;
this.formStates.isSubmitting = false;
this.notifications.error.text = i18n.t('firefly.errors_submission', {errorMessage: data.message});
this.notifications.error.text = i18next.t('firefly.errors_submission', {errorMessage: data.message});
if (data.hasOwnProperty('errors')) {
this.entries = spliceErrorsIntoTransactions(i18n, data.errors, this.entries);
@@ -454,7 +444,7 @@ let transactions = function () {
liveServer: true,
clearEnd: true,
allowNew: true,
notFoundMessage: i18n.t('firefly.nothing_found'),
notFoundMessage: i18next.t('firefly.nothing_found'),
noCache: true,
fetchOptions: {
headers: {
@@ -469,7 +459,7 @@ let transactions = function () {
// addedSplit, is called from the HTML
// for source account
const renderAccount = function (item, b, c) {
return item.name_with_balance + '<br><small class="text-muted">' + i18n.t('firefly.account_type_' + item.type) + '</small>';
return item.name_with_balance + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.type) + '</small>';
};
addAutocomplete({
selector: 'input.ac-source',