diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 81a0dc4fa3..f4437ee8ed 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -46,6 +46,7 @@ - 「이미 본 리노트를 간략화하기」 옵션의 기본값을 꺼짐으로 설정 - 이벤트 기능 (misskey-dev/misskey#10628) - プレイにAPI Tokenを要求できる関数を追加 (misskey-dev/misskey#10949) +- 절대 시간 표기 (sakura-tel/milkey#69) ### Client - (Friendly) 일부 페이지를 제외하고 플로팅 버튼을 표시하지 않음 diff --git a/locales/index.d.ts b/locales/index.d.ts index 77ee09f9bd..4e3cf165d0 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1117,6 +1117,7 @@ export interface Locale { "thisFlashRequiresTheFollowingPermissions": string; "doYouWantToAllowThisPlayToAccessYourAccount": string; "translateProfile": string; + "enableAbsoluteTime": string; "_group": { "leader": string; "banish": string; diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index df694ea823..24a4bc2865 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1114,6 +1114,7 @@ additionalPermissionsForFlash: "Play에 대한 추가 권한" thisFlashRequiresTheFollowingPermissions: "이 Play는 다음 권한을 요구해요" doYouWantToAllowThisPlayToAccessYourAccount: "이 Play가 계정에 접근하도록 허용할까요?" translateProfile: "프로필 번역하기" +enableAbsoluteTime: "절대 시간 표기 사용" _group: leader: "그룹 주인" banish: "추방" diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index fecb8a08ef..4141cb359b 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -37,7 +37,8 @@ diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index c3e9377634..55602abfc1 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -32,7 +32,8 @@ diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue index 8ad60e6d49..f77d403acd 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -28,7 +28,8 @@ - + +
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue index 048fedefb9..336e985164 100644 --- a/packages/frontend/src/components/MkNotification.vue +++ b/packages/frontend/src/components/MkNotification.vue @@ -45,7 +45,8 @@ {{ i18n.ts._notification.achievementEarned }} {{ notification.header }} - + +
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 86aa59581f..ed99aa76ee 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -60,6 +60,7 @@ + {{ i18n.ts.enableAbsoluteTime }}
@@ -332,6 +333,7 @@ const collapseDefault = computed(defaultStore.makeGetterSetter('collapseDefault' const requireRefreshBehavior = computed(defaultStore.makeGetterSetter('requireRefreshBehavior')); const hideAvatarsInNote = computed(defaultStore.makeGetterSetter('hideAvatarsInNote')); const showTranslateButtonInNote = computed(defaultStore.makeGetterSetter('showTranslateButtonInNote')); +const enableAbsoluteTime = computed(defaultStore.makeGetterSetter('enableAbsoluteTime')); watch(lang, () => { miLocalStorage.setItem('lang', lang.value as string); diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 34b09b6f19..4a3284f4f5 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -383,6 +383,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'device', default: true, }, + enableAbsoluteTime: { + where: 'device', + default: false, + }, // - Settings/CherryPick nicknameEnabled: {