worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix typo: newNoteRecivedNotification -> newNoteReceivedNotification

Browse source
This commit is contained in:
NoriDev 2023-06-05 17:16:00 +09:00
parent 99e4482a4f
commit 206ca5c90d
8 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
locales/en-US.yml
View file

@ -1,7 +1,7 @@
---
_lang_: "English"
useBoldFont: "Bold Text"
newNoteRecivedNotification: "New note notification"
newNoteReceivedNotification: "When receive a new note notification"
disableRightClick: "Prohibit right click"
useEnterToSend: "Press Enter to send"
useEnterToSendDescription: "When the option is enabled, you can use the Shift + Enter key for line break."
@ -1441,7 +1441,7 @@ _role:
and: "AND-Condition"
or: "OR-Condition"
not: "NOT-Condition"
_newNoteRecivedNotificationBehavior:
_newNoteReceivedNotificationBehavior:
default: "Default"
count: "Show number of notes"
none: "None"

4
locales/index.d.ts vendored
View file

@ -4,7 +4,7 @@
export interface Locale {
"_lang_": string;
"useBoldFont": string;
"newNoteRecivedNotification": string;
"newNoteReceivedNotification": string;
"disableRightClick": string;
"useEnterToSend": string;
"useEnterToSendDescription": string;
@ -1527,7 +1527,7 @@ export interface Locale {
"not": string;
};
};
"_newNoteRecivedNotificationBehavior": {
"_newNoteReceivedNotificationBehavior": {
"default": string;
"count": string;
"none": string;

4
locales/ja-JP.yml
View file

@ -1,7 +1,7 @@
_lang_: "日本語"
useBoldFont: "文字を太くする"
newNoteRecivedNotification: "新しいノート通知"
newNoteReceivedNotification: "新しいノート通知を表示するとき"
disableRightClick: "右クリックを禁止"
useEnterToSend: "Enterキーを押して送信"
useEnterToSendDescription: "オプションを有効にすると、行替えはShift＋Enterキーでできます。"
@ -1447,7 +1447,7 @@ _role:
or: "～または～"
not: "～ではない"
_newNoteRecivedNotificationBehavior:
_newNoteReceivedNotificationBehavior:
default: "デフォルト"
count: "ノート数表示"
none: "表示なし"

4
locales/ko-KR.yml
View file

@ -1,7 +1,7 @@
---
_lang_: "한국어"
useBoldFont: "볼드체 텍스트"
newNoteRecivedNotification: "새 노트 알림"
newNoteReceivedNotification: "새 노트 알림을 표시할 때"
disableRightClick: "우클릭 방지"
useEnterToSend: "Enter 키를 눌러 보내기"
useEnterToSendDescription: "옵션을 활성화하면 줄 바꿈은 Shift + Enter 키로 할 수 있어요."
@ -1442,7 +1442,7 @@ _role:
and: "다음을 모두 만족"
or: "다음을 하나라도 만족"
not: "다음을 만족하지 않음"
_newNoteRecivedNotificationBehavior:
_newNoteReceivedNotificationBehavior:
default: "기본"
count: "노트 수 표시"
none: "표시하지 않음"

12
packages/frontend/src/pages/settings/general.vue
View file

@ -215,11 +215,11 @@
<option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
<option value="none">{{ i18n.ts._serverDisconnectedBehavior.none }}</option>
</MkSelect>
<MkSelect v-model="newNoteRecivedNotificationBehavior">
<template #label>{{ i18n.ts.newNoteRecivedNotification }}</template>
<option value="default">{{ i18n.ts._newNoteRecivedNotificationBehavior.default }}</option>
<option value="count">{{ i18n.ts._newNoteRecivedNotificationBehavior.count }}</option>
<option value="none">{{ i18n.ts._newNoteRecivedNotificationBehavior.none }}</option>
<MkSelect v-model="newNoteReceivedNotificationBehavior">
<template #label>{{ i18n.ts.newNoteReceivedNotification }}</template>
<option value="default">{{ i18n.ts._newNoteReceivedNotificationBehavior.default }}</option>
<option value="count">{{ i18n.ts._newNoteReceivedNotificationBehavior.count }}</option>
<option value="none">{{ i18n.ts._newNoteReceivedNotificationBehavior.none }}</option>
</MkSelect>
<MkRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" easing>
<template #label>{{ i18n.ts.numberOfPageCache }}</template>
@ -316,7 +316,7 @@ const notificationStackAxis = computed(defaultStore.makeGetterSetter('notificati
const showTimelineReplies = computed(defaultStore.makeGetterSetter('showTimelineReplies'));
const useEnterToSend = computed(defaultStore.makeGetterSetter('useEnterToSend'));
const postFormVisibilityHotkey = computed(defaultStore.makeGetterSetter('postFormVisibilityHotkey'));
const newNoteRecivedNotificationBehavior = computed(defaultStore.makeGetterSetter('newNoteRecivedNotificationBehavior'));
const newNoteReceivedNotificationBehavior = computed(defaultStore.makeGetterSetter('newNoteReceivedNotificationBehavior'));
const fontSize = computed(defaultStore.makeGetterSetter('fontSize'));
const collapseDefault = computed(defaultStore.makeGetterSetter('collapseDefault'));

2
packages/frontend/src/pages/settings/preferences-backups.vue
View file

@ -89,7 +89,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
'mediaListWithOneImageAppearance',
'useEnterToSend',
'postFormVisibilityHotkey',
'newNoteRecivedNotificationBehavior',
'newNoteReceivedNotificationBehavior',
'collapseDefault',
];
const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [

4
packages/frontend/src/pages/timeline.vue
View file

@ -15,7 +15,7 @@
:enterFromClass="defaultStore.state.animation ? $style.transition_new_enterFrom : ''"
:leaveToClass="defaultStore.state.animation ? $style.transition_new_leaveTo : ''"
>
<div v-if="queue > 0 && defaultStore.state.newNoteRecivedNotificationBehavior === 'default'" :class="[$style.new, { [$style.showEl]: showEl && isMobile, [$style.reduceAnimation]: !defaultStore.state.animation }]"><button class="_buttonPrimary" :class="$style.newButton" @click="top()"><i class="ti ti-arrow-up"></i>{{ i18n.ts.newNoteRecived }}</button></div>
<div v-if="queue > 0 && defaultStore.state.newNoteReceivedNotificationBehavior === 'default'" :class="[$style.new, { [$style.showEl]: showEl && isMobile, [$style.reduceAnimation]: !defaultStore.state.animation }]"><button class="_buttonPrimary" :class="$style.newButton" @click="top()"><i class="ti ti-arrow-up"></i>{{ i18n.ts.newNoteRecived }}</button></div>
</transition>
<transition
:enterActiveClass="defaultStore.state.animation ? $style.transition_new_enterActive : ''"
@ -23,7 +23,7 @@
:enterFromClass="defaultStore.state.animation ? $style.transition_new_enterFrom : ''"
:leaveToClass="defaultStore.state.animation ? $style.transition_new_leaveTo : ''"
>
<div v-if="queue > 0 && defaultStore.state.newNoteRecivedNotificationBehavior === 'count'" :class="[$style.new, { [$style.showEl]: showEl && isMobile, [$style.reduceAnimation]: !defaultStore.state.animation }]"><button class="_buttonPrimary" :class="$style.newButton" @click="top()"><i class="ti ti-arrow-up"></i><I18n :src="i18n.ts.newNoteRecivedCount" textTag="span"><template #n>{{ queue }}</template></I18n></button></div>
<div v-if="queue > 0 && defaultStore.state.newNoteReceivedNotificationBehavior === 'count'" :class="[$style.new, { [$style.showEl]: showEl && isMobile, [$style.reduceAnimation]: !defaultStore.state.animation }]"><button class="_buttonPrimary" :class="$style.newButton" @click="top()"><i class="ti ti-arrow-up"></i><I18n :src="i18n.ts.newNoteRecivedCount" textTag="span"><template #n>{{ queue }}</template></I18n></button></div>
</transition>
<div :class="$style.tl">
<MkTimeline

2
packages/frontend/src/store.ts
View file

@ -347,7 +347,7 @@ export const defaultStore = markRaw(new Storage('base', {
where: 'device',
default: true,
},
newNoteRecivedNotificationBehavior: {
newNoteReceivedNotificationBehavior: {
where: 'device',
default: 'count' as 'default' | 'count' | 'none',
},