日付の表現を変更

TeamSekai · Apr 27, 2024 · 8172cad · 8172cad
1 parent 70ef413
commit 8172cad
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 5 deletions.
diff --git a/language/default.json b/language/default.json
@@ -114,7 +114,32 @@
 		},
 		"defaultValues": {
 			"graphLabel": "value"
-		}
+		},
+		"dayNames": [
+			"日曜日",
+			"月曜日",
+			"火曜日",
+			"水曜日",
+			"木曜日",
+			"金曜日",
+			"土曜日"
+		],
+		"dayLabels": ["日", "月", "火", "水", "木", "金", "土"],
+		"monthNames": [
+			"1月",
+			"2月",
+			"3月",
+			"4月",
+			"5月",
+			"6月",
+			"7月",
+			"8月",
+			"9月",
+			"10月",
+			"11月",
+			"12月"
+		],
+		"dateFormat": "${year}年${month}${date}日${day}"
 	},
 	"commands": {
 		"cal": {

diff --git a/language/en.json b/language/en.json
@@ -114,7 +114,32 @@
 		},
 		"defaultValues": {
 			"graphLabel": "value"
-		}
+		},
+		"dayNames": [
+			"Sunday",
+			"Monday",
+			"Tuesday",
+			"Wednesday",
+			"Thursday",
+			"Friday",
+			"Saturday"
+		],
+		"dayLabels": ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
+		"monthNames": [
+			"January",
+			"February",
+			"March",
+			"April",
+			"May",
+			"June",
+			"July",
+			"August",
+			"September",
+			"October",
+			"November",
+			"December"
+		],
+		"dateFormat": "${day}, ${month} ${date}, ${year}"
 	},
 	"commands": {
 		"cal": {

diff --git a/language/ja.json b/language/ja.json
@@ -114,7 +114,32 @@
 		},
 		"defaultValues": {
 			"graphLabel": "value"
-		}
+		},
+		"dayNames": [
+			"日曜日",
+			"月曜日",
+			"火曜日",
+			"水曜日",
+			"木曜日",
+			"金曜日",
+			"土曜日"
+		],
+		"dayLabels": ["日", "月", "火", "水", "木", "金", "土"],
+		"monthNames": [
+			"1月",
+			"2月",
+			"3月",
+			"4月",
+			"5月",
+			"6月",
+			"7月",
+			"8月",
+			"9月",
+			"10月",
+			"11月",
+			"12月"
+		],
+		"dateFormat": "${year}年${month}${date}日${day}"
 	},
 	"commands": {
 		"cal": {

diff --git a/packages/misc/commands/date.ts b/packages/misc/commands/date.ts
@@ -1,9 +1,12 @@
 import { CompoundCommandBuilder } from '../../../common/CompoundCommand';
+import { Day } from '../util/calendar';
 
 const builder = new CompoundCommandBuilder('date', '時刻の計算と表示');
 
-builder.subcommand('now', '現在時刻を表示').build(async (i) => {
-	await i.reply(new Date().toString());
+builder.subcommand('now', '現在時刻を表示').build(async (interaction) => {
+	const date = new Date();
+	const day = new Day(date.getFullYear(), date.getMonth(), date.getDate());
+	await interaction.reply(day.toHumanReadable());
 });
 
 builder

diff --git a/packages/misc/util/calendar.ts b/packages/misc/util/calendar.ts
@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { LANG, strFormat } from '../../../util/languages';
 
 export const DayOfWeek = Object.freeze({
 	Sunday: 0,
@@ -64,9 +65,22 @@ export class Day {
 		return `${this.year}/${this.month + 1}/${this.date}`;
 	}
 
+	toHumanReadable() {
+		return strFormat(LANG.common.dateFormat, {
+			year: this.year,
+			month: LANG.common.monthNames[this.month],
+			date: this.date,
+			day: LANG.common.dayNames[this.day],
+		});
+	}
+
 	isHoliday() {
 		return holidays.has(this.toString());
 	}
+
+	holiday(): string | null {
+		return holidays.get(this.toString()) ?? null;
+	}
 }
 
 export type Week = { [K in DayOfWeek]: Day } & Array<Day>;