merge: 최신 main을 모바일 턴 입력 수정에 통합한다

2026-08-21 22:50:54 +00:00
parent b04f7b5534 9d8823a502
commit a2e9ac5754
5 changed files with 36 additions and 5 deletions
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { JosaUtil } from '@sammo-ts/common/util/JosaUtil';
 import { computed, onMounted, reactive, ref, watch } from 'vue';
 import SortableStringList from '../components/ui/SortableStringList';
 import { trpc } from '../utils/trpc';
@@ -365,7 +366,7 @@ const dieOnPrestart = async () => {
 };

 const dropItem = (item: { key: ItemSlotKey; slotName: string; displayName: string | null; code: string | null }) =>
-    confirmMutation(`${item.displayName ?? item.slotName}을(를) 버리시겠습니까?`, () =>
+    confirmMutation(`${JosaUtil.put(item.displayName ?? item.slotName, '을')} 버리시겠습니까?`, () =>
        trpc.general.dropItem.mutate({ itemType: item.key })
    );

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { formatServerDateTime } from '@sammo-ts/common/time/ServerDateTime';
+import { JosaUtil } from '@sammo-ts/common/util/JosaUtil';
 import { computed, onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { formatReservedCommandBrief } from '../components/command/reservedCommandBrief';
@@ -59,6 +60,8 @@ const sortOptions = [
    '규모',
 ].map((label, index) => ({ value: index + 1, label }));
 const officerLabels: Record<OfficerLevel, string> = { 4: '태수', 3: '군사', 2: '종사' };
+const appointmentDescription = (city: City, general: SecretGeneral, level: OfficerLevel): string =>
+    `${JosaUtil.put(general.name, '을')} ${city.name} ${JosaUtil.put(officerLabels[level], '으로')} 임명`;
 const generalsForCity = (cityId: number) => data.value?.generals.filter((general) => general.cityId === cityId) ?? [];
 const secretGeneralsForCity = (cityId: number) =>
    secretData.value?.generals.filter((general) => general.cityId === cityId) ?? [];
@@ -262,7 +265,7 @@ const appointCityOfficer = async (city: City, general: SecretGeneral, level: Off
            destCityId: city.id,
            officerLevel: level,
        });
-        showSuccessToast(`${general.name}을(를) ${city.name} ${officerLabels[level]}로 임명했습니다.`);
+        showSuccessToast(`${appointmentDescription(city, general, level)}했습니다.`);
        try {
            await refreshIntegratedData();
        } catch (cause) {
@@ -652,7 +655,7 @@ onMounted(async () => {
                                                :disabled="
                                                    !canAppoint(city.id, general.id, level) || pendingAppointment !== ''
                                                "
-                                                :aria-label="`${general.name}을(를) ${city.name} ${officerLabels[level]}로 임명`"
+                                                :aria-label="appointmentDescription(city, general, level)"
                                                @click="appointCityOfficer(city, general, level)"
                                            >
                                                {{ officerLabels[level].slice(0, 1) }}