mirror of
https://github.com/frappe/books.git
synced 2024-11-09 23:30:56 +00:00
incr: translate schema translateables
This commit is contained in:
parent
0d6d5860d2
commit
4810396434
@ -3,9 +3,12 @@ import { Fyo } from 'fyo';
|
||||
import { DatabaseDemux } from 'fyo/demux/db';
|
||||
import { ValueError } from 'fyo/utils/errors';
|
||||
import Observable from 'fyo/utils/observable';
|
||||
import { translateSchema } from 'fyo/utils/translation';
|
||||
import { Field, RawValue, SchemaMap } from 'schemas/types';
|
||||
import { getMapFromList } from 'utils';
|
||||
import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
|
||||
import { schemaTranslateables } from 'utils/translationHelpers';
|
||||
import { LanguageMap } from 'utils/types';
|
||||
import { Converter } from './converter';
|
||||
import {
|
||||
DatabaseDemuxConstructor,
|
||||
@ -26,7 +29,7 @@ export class DatabaseHandler extends DatabaseBase {
|
||||
converter: Converter;
|
||||
#demux: DatabaseDemuxBase;
|
||||
dbPath?: string;
|
||||
schemaMap: Readonly<SchemaMap> = {};
|
||||
#schemaMap: SchemaMap = {};
|
||||
observer: Observable<never> = new Observable();
|
||||
fieldValueMap: Record<string, Record<string, Field>> = {};
|
||||
|
||||
@ -42,6 +45,10 @@ export class DatabaseHandler extends DatabaseBase {
|
||||
}
|
||||
}
|
||||
|
||||
get schemaMap(): Readonly<SchemaMap> {
|
||||
return this.#schemaMap;
|
||||
}
|
||||
|
||||
get isConnected() {
|
||||
return !!this.dbPath;
|
||||
}
|
||||
@ -61,7 +68,7 @@ export class DatabaseHandler extends DatabaseBase {
|
||||
}
|
||||
|
||||
async init() {
|
||||
this.schemaMap = (await this.#demux.getSchemaMap()) as Readonly<SchemaMap>;
|
||||
this.#schemaMap = (await this.#demux.getSchemaMap()) as SchemaMap;
|
||||
|
||||
for (const schemaName in this.schemaMap) {
|
||||
const fields = this.schemaMap[schemaName]!.fields!;
|
||||
@ -70,9 +77,17 @@ export class DatabaseHandler extends DatabaseBase {
|
||||
this.observer = new Observable();
|
||||
}
|
||||
|
||||
async translateSchemaMap(languageMap?: LanguageMap) {
|
||||
if (languageMap) {
|
||||
translateSchema(this.#schemaMap, languageMap, schemaTranslateables);
|
||||
} else {
|
||||
this.#schemaMap = (await this.#demux.getSchemaMap()) as SchemaMap;
|
||||
}
|
||||
}
|
||||
|
||||
purgeCache() {
|
||||
this.dbPath = undefined;
|
||||
this.schemaMap = {};
|
||||
this.#schemaMap = {};
|
||||
this.fieldValueMap = {};
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { LanguageMap } from 'utils/types';
|
||||
import { LanguageMap, UnknownMap } from 'utils/types';
|
||||
import {
|
||||
getIndexFormat,
|
||||
getIndexList,
|
||||
@ -95,3 +95,41 @@ export function setLanguageMapOnTranslationString(
|
||||
) {
|
||||
TranslationString.prototype.languageMap = languageMap;
|
||||
}
|
||||
|
||||
export function translateSchema(
|
||||
map: UnknownMap | UnknownMap[],
|
||||
languageMap: LanguageMap,
|
||||
translateables: string[]
|
||||
) {
|
||||
if (Array.isArray(map)) {
|
||||
for (const item of map) {
|
||||
translateSchema(item, languageMap, translateables);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof map !== 'object') {
|
||||
return;
|
||||
}
|
||||
|
||||
for (const key of Object.keys(map)) {
|
||||
const value = map[key];
|
||||
if (
|
||||
typeof value === 'string' &&
|
||||
translateables.includes(key) &&
|
||||
languageMap[value]?.translation
|
||||
) {
|
||||
map[key] = languageMap[value].translation;
|
||||
}
|
||||
|
||||
if (typeof value !== 'object') {
|
||||
continue;
|
||||
}
|
||||
|
||||
translateSchema(
|
||||
value as UnknownMap | UnknownMap[],
|
||||
languageMap,
|
||||
translateables
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -1,16 +1,17 @@
|
||||
import fs from 'fs/promises';
|
||||
import path from 'path';
|
||||
import { UnknownMap } from 'utils/types';
|
||||
import { generateCSV, parseCSV } from '../utils/csvParser';
|
||||
import {
|
||||
getIndexFormat,
|
||||
getWhitespaceSanitized,
|
||||
schemaTranslateables,
|
||||
} from '../utils/translationHelpers';
|
||||
|
||||
const translationsFolder = path.resolve(__dirname, '..', 'translations');
|
||||
const PATTERN = /(?<!\w)t`([^`]+)`/g;
|
||||
|
||||
type Content = { fileName: string; content: string };
|
||||
type UnknownMap = Record<string, unknown>;
|
||||
|
||||
function shouldIgnore(p: string, ignoreList: string[]): boolean {
|
||||
const name = p.split(path.sep).at(-1) ?? '';
|
||||
@ -229,11 +230,7 @@ async function getTStringsFromJsonFileList(
|
||||
.then((content) => {
|
||||
const schema = JSON.parse(content) as Record<string, unknown>;
|
||||
const tStrings: string[] = [];
|
||||
pushTStringsFromSchema(schema, tStrings, [
|
||||
'label',
|
||||
'description',
|
||||
'placeholder',
|
||||
]);
|
||||
pushTStringsFromSchema(schema, tStrings, schemaTranslateables);
|
||||
return tStrings;
|
||||
})
|
||||
.then((ts) => {
|
||||
@ -250,11 +247,11 @@ async function getTStringsFromJsonFileList(
|
||||
function pushTStringsFromSchema(
|
||||
map: UnknownMap | UnknownMap[],
|
||||
array: string[],
|
||||
translateable: string[]
|
||||
translateables: string[]
|
||||
) {
|
||||
if (Array.isArray(map)) {
|
||||
for (const item of map) {
|
||||
pushTStringsFromSchema(item, array, translateable);
|
||||
pushTStringsFromSchema(item, array, translateables);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -265,7 +262,7 @@ function pushTStringsFromSchema(
|
||||
|
||||
for (const key of Object.keys(map)) {
|
||||
const value = map[key];
|
||||
if (translateable.includes(key) && typeof value === 'string') {
|
||||
if (translateables.includes(key) && typeof value === 'string') {
|
||||
array.push(value);
|
||||
}
|
||||
|
||||
@ -276,7 +273,7 @@ function pushTStringsFromSchema(
|
||||
pushTStringsFromSchema(
|
||||
value as UnknownMap | UnknownMap[],
|
||||
array,
|
||||
translateable
|
||||
translateables
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -65,6 +65,7 @@ async function fetchAndSetLanguageMap(code: string) {
|
||||
showToast({ type: 'error', message });
|
||||
} else {
|
||||
setLanguageMapOnTranslationString(languageMap);
|
||||
fyo.db.translateSchemaMap(languageMap);
|
||||
}
|
||||
|
||||
return success;
|
||||
|
@ -1,3 +1,4 @@
|
||||
export const schemaTranslateables = ['label', 'description', 'placeholder'];
|
||||
export function getIndexFormat(inp: string | string[]) {
|
||||
// converts:
|
||||
// ['This is an ', ,' interpolated ',' string.'] and
|
||||
|
@ -1,3 +1,4 @@
|
||||
export type UnknownMap = Record<string, unknown>;
|
||||
export type Translation = { translation: string; context?: string };
|
||||
export type LanguageMap = Record<string, Translation>;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user