translate fully

Author: leaftail1880

lang/en_US.json

@@ -150,7 +150,7 @@ export const ScreenDisplaySymbol = Symbol('screen_display')
 
 expand(Player.prototype, {
   get lang() {
-    return Language.ru_RU
+    return Language.en_US
   },
 
   isSimulated() {

lang/ru_RU.json

@@ -5,7 +5,6 @@ import { MinecraftItemTypes, MinecraftPotionLiquidTypes } from '@minecraft/vanil
 import { Items, totalCustomItems } from 'lib/assets/custom-items'
 import { textureData } from 'lib/assets/texture-data'
 import { translateTypeId } from 'lib/i18n/lang'
-import { Message } from 'lib/i18n/message'
 import { addNamespace, inspect, isKeyof, util, wrapLore } from 'lib/util'
 import { typeIdToDataId, typeIdToID } from '../assets/chest-ui-type-ids'
 import { BUTTON, showForm } from './utils'
@@ -113,7 +112,7 @@ export class ChestForm {
   constructor(sizeType: keyof typeof SIZES = 'small') {
     const [sizeName, size] = SIZES[sizeType]
 
-    this.titleText = sizeName
+    this.titleText = sizeName + '§0'
 
     for (let i = 0; i < size; i++) this.buttons.push({ text: '', icon: undefined })
   }

test.txt lang/source.txttest.txt renamed to lang/source.txt

@@ -1,9 +1,10 @@
 import { RawMessage, RawText } from '@minecraft/server'
 import { defaultLang, Language } from 'lib/assets/lang'
 import { Text, textUnitColorize } from './text'
-type I18nMessages = Record<string, Record<string, readonly string[]>>
+type I18nMessages = Record<string, Record<string, string | readonly string[]>>
 
 const extractedMessageIdsToLangTokes: Record<string, string> = {}
+
 const extractedCompiledMessages: I18nMessages = {}
 
 export type RawTextArg = string | RawText | Message | undefined | null
@@ -42,9 +43,9 @@ export class Message {
   }
 
   color(c: Text.Colors | Pick<Text.Static<unknown>, 'currentColors'>) {
-    if (this.postfixes.length) {
-      console.warn(`Color modificator for message ${this.id} will not be applied for postfixes ${this.postfixes}`)
-    }
+    // if (this.postfixes.length) {
+    //   console.warn(`Color modificator for message ${this.id} will not be applied for postfixes ${this.postfixes}`)
+    // }
 
     this.colors = 'currentColors' in c ? c.currentColors : c
     for (const arg of this.args) {
@@ -122,9 +123,10 @@ export class Message {
 
 export class I18nMessage extends Message {
   toString(language: Language): string {
+    const translated = extractedCompiledMessages[language]?.[this.id]
     return Message.string(
       language,
-      extractedCompiledMessages[language]?.[this.id] ?? this.template,
+      translated ? (Array.isArray(translated) ? translated : [translated]) : this.template,
       this.args,
       this.colors,
       this.postfixes,

src/lib/assets/lang-messages.ts

@@ -18,6 +18,12 @@ describe('i18n', () => {
     expect(i18n`Some string with ${i18n.time(3000)} and`.size(30).toString(Language.en_US)).toMatchInlineSnapshot(
       `"§7Some string with §f3 seconds§7 and§7 §7(§630§7)"`,
     )
+
+    expect(i18n`Гробовщику посвящается`.toString(Language.en_US)).toMatchInlineSnapshot(`"For Gravestoner"`)
+
+    expect(i18n`Вы были выгнаны из клана игроком '${1}'. Причина: ${2}`.toString(Language.en_US)).toMatchInlineSnapshot(
+      `"§7You were kicked from the clan by player '§61§7'. Reason: §62§7"`,
+    )
   })
 })
 
@@ -27,6 +33,10 @@ describe('text', () => {
       `"§7Some string §fthat colors§7 properly §65§7 times"`,
     )
     expect(i18n`Some string with ${player}`).toMatchInlineSnapshot(`"§7Some string with §fTest player name§7"`)
+
+    expect(i18n`Some string ${'§lthat colors'} properly ${5} times`).toMatchInlineSnapshot(
+      `"§7Some string §f§lthat colors§7 properly §65§7 times"`,
+    )
   })
 
   it('should create nested text', () => {

src/lib/extensions/player.ts

@@ -184,6 +184,7 @@ export function textUnitColorize(
 ): string {
   switch (typeof v) {
     case 'string':
+      if (v.includes('§l')) return unit + v + '§r'
       return unit + v
     case 'undefined':
       return ''

src/lib/form/chest.ts

@@ -7,6 +7,9 @@ declare global {
 
 globalThis.loaded = Date.now()
 
+//@ts-expect-error Define global
+globalThis.Intl = {}
+
 const reasons: Record<WatchdogTerminateReason, string> = {
   Hang: 'Скрипт завис',
   StackOverflow: 'Стэк переполнен',