From 1f42a81eefccaf35376179fcde0e0cc6a45dd1b4 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Thu, 26 Jan 2023 00:55:12 +0900
Subject: [PATCH] Fix #829

---
 app/js/common/time.ts    | 3 ++-
 app/js/tl/announParse.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/js/common/time.ts b/app/js/common/time.ts
index adb562f213..23ab9c7f0d 100644
--- a/app/js/common/time.ts
+++ b/app/js/common/time.ts
@@ -2,8 +2,9 @@ import $ from 'jquery'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import 'dayjs/locale/ja'
+import 'dayjs/locale/en'
 dayjs.extend(relativeTime)
-dayjs.locale('ja')
+dayjs.locale(globalThis.useLang === 'ja' || globalThis.useLang === 'ja-KS' ? 'ja' : 'en')
 
 const timeUpdate = () => {
 	$('time.timeago').each(function (i, elem) {
diff --git a/app/js/tl/announParse.ts b/app/js/tl/announParse.ts
index 74c33adc65..53cd0ec0f7 100644
--- a/app/js/tl/announParse.ts
+++ b/app/js/tl/announParse.ts
@@ -107,7 +107,7 @@ export function emojiReactionDef(target: string) {
 	}
 	const acctId = $('#post-acct-sel').val()?.toString()
 	const id = $('#reply').val()?.toString()
-	if (!id || !acctId) return Swal.fire('Error')
+	if (!id || !acctId) return
 	announReaction(id, acctId, false, emoji)
 	clear()
 	hide()