Merge review/slice-7a-wardrobe (phases 29-31)
ci / server (push) Failing after 1m57s
ci / client (push) Failing after 17s

# Conflicts:
#	src/HSchool.Client/src/i18n/strings.ts
This commit is contained in:
Leonid Pershin
2026-08-20 06:39:09 +03:00
3 changed files with 54 additions and 3 deletions
+2 -2
View File
@@ -178,6 +178,7 @@ const ru = {
peopleTabApparel: 'Одежда',
peopleTabCarry: 'Ноша',
peopleTabNow: 'Сейчас',
peopleTabPortrait: 'Портрет',
peopleAtHome: 'дома',
peopleApparelFit: 'Уместность: {value}',
peopleLockerYes: 'Есть шкафчик',
@@ -190,7 +191,6 @@ const ru = {
peopleLogEvent: 'Событие',
peopleLogEmpty: 'Сегодня записей нет.',
peopleTabPortrait: 'Портрет',
peoplePortraitAvatar: 'Аватар',
peoplePortraitFull: 'В полный рост',
peoplePortraitCustom: 'Свой промпт',
@@ -507,6 +507,7 @@ const en: Messages = {
peopleTabApparel: 'Clothes',
peopleTabCarry: 'Carried',
peopleTabNow: 'Now',
peopleTabPortrait: 'Portrait',
peopleAtHome: 'home',
peopleApparelFit: 'Fit: {value}',
peopleLockerYes: 'Has a locker',
@@ -519,7 +520,6 @@ const en: Messages = {
peopleLogEvent: 'Event',
peopleLogEmpty: 'Nothing logged today.',
peopleTabPortrait: 'Portrait',
peoplePortraitAvatar: 'Avatar',
peoplePortraitFull: 'Full body',
peoplePortraitCustom: 'Custom prompt',
-1
View File
@@ -1,6 +1,5 @@
using System.Text.Json;
using HSchool.Content;
using HSchool.Content;
using HSchool.People;
using HSchool.Schedule;
using HSchool.Simulation;