diff --git a/CHANGELOG.md b/CHANGELOG.md index 032ec2d58..d71bafff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ unrekleassaf * 表示言語を切り替えられるように * グループに招待されたときの通知を追加 * フランス語と関西弁を有効に +* OSネイティブの絵文字を使用オプションを追加 ### 🐛Fixes * リストを追加するとエラーが出る問題を修正 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 71cbd5663..02992b3b6 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -388,6 +388,7 @@ or: "もしくは" uiLanguage: "UIの表示言語" groupInvited: "グループに招待されました" aboutX: "{x}について" +useOsNativeEmojis: "OSネイティブの絵文字を使用" _ago: unknown: "謎" diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index f17351a6f..c8e0ae6d7 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -18,7 +18,7 @@
  1. - + {{ emoji.emoji }} ({{ emoji.aliasOf }}) @@ -130,8 +130,8 @@ export default Vue.extend({ return (this.$refs.suggests as Element).children; }, - useOsDefaultEmojis(): boolean { - return this.$store.state.device.useOsDefaultEmojis; + useOsNativeEmojis(): boolean { + return this.$store.state.device.useOsNativeEmojis; } }, diff --git a/src/client/components/emoji.vue b/src/client/components/emoji.vue index 7784a1bf1..277ba1a07 100644 --- a/src/client/components/emoji.vue +++ b/src/client/components/emoji.vue @@ -1,7 +1,7 @@ @@ -53,8 +53,8 @@ export default Vue.extend({ return this.customEmoji ? `:${this.customEmoji.name}:` : this.char; }, - useOsDefaultEmojis(): boolean { - return this.$store.state.device.useOsDefaultEmojis && !this.isReaction; + useOsNativeEmojis(): boolean { + return this.$store.state.device.useOsNativeEmojis && !this.isReaction; }, ce() { diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue index 90803636b..5ab2ce91b 100644 --- a/src/client/pages/settings/general.vue +++ b/src/client/pages/settings/general.vue @@ -23,8 +23,10 @@ {{ $t('markAsReadAllTalkMessages') }}
    - - {{ $t('reduceUiAnimation') }} + {{ $t('reduceUiAnimation') }} + + {{ $t('useOsNativeEmojis') }} +
    @@ -81,6 +83,11 @@ export default Vue.extend({ get() { return !this.$store.state.device.animation; }, set(value) { this.$store.commit('device/set', { key: 'animation', value: !value }); } }, + + useOsNativeEmojis: { + get() { return this.$store.state.device.useOsNativeEmojis; }, + set(value) { this.$store.commit('device/set', { key: 'useOsNativeEmojis', value }); } + }, }, watch: { diff --git a/src/client/store.ts b/src/client/store.ts index 711b808d5..0bfcd07cc 100644 --- a/src/client/store.ts +++ b/src/client/store.ts @@ -31,7 +31,7 @@ const defaultDeviceSettings = { lang: null, loadRawImages: false, alwaysShowNsfw: false, - useOsDefaultEmojis: false, + useOsNativeEmojis: false, autoReload: false, accounts: [], recentEmojis: [],