diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index cbcf67fa46ff..1b09d2c610a7 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -152,7 +152,6 @@ common: show-via: "zobrazit přes" reduce-motion: "Snížit pohyb v rozhraní" this-setting-is-this-device-only: "Pouze pro toto zařízení" - use-os-default-emojis: "Použít výchozí emoji systému" line-width: "Hrubka línie" line-width-thin: "Úzka" line-width-normal: "Běžná" diff --git a/locales/en-US.yml b/locales/en-US.yml index b897893e3f5d..cf48e3635c92 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -197,7 +197,6 @@ common: show-via: "Show via" reduce-motion: "Reduce motion in UI" this-setting-is-this-device-only: "Only for this device" - use-os-default-emojis: "Use the OS default Emojis" line-width: "Line thickness" line-width-thin: "Thin" line-width-normal: "Regular" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 955d7d347e01..c2352ea332c5 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -103,7 +103,6 @@ common: tags: "Etiquetas" blocking: "Bloquear" password: "Contraseña" - use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo" line-width: "Grosor de línea" line-width-thick: "Grosor" font-size: "Tamaño del texto" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 190fbe168cd1..f86e0e37dd20 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -137,7 +137,6 @@ common: show-via: "Afficher via" reduce-motion: "Réduire les animations dans l’interface utilisateur" this-setting-is-this-device-only: "Uniquement sur cet appareil" - use-os-default-emojis: "Utiliser les émojis standards du système" line-width: "Epaisseur du trait" line-width-thin: "Fine" line-width-normal: "Normale" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 076a00c920bd..ed67f79df875 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -208,7 +208,6 @@ common: show-via: "viaを表示する" reduce-motion: "UIの動きを減らす" this-setting-is-this-device-only: "このデバイスのみ" - use-os-default-emojis: "OS標準の絵文字を使用" line-width: "線の太さ" line-width-thin: "細い" line-width-normal: "普通" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 51efd9d2ecb1..6db844b8823c 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -152,7 +152,6 @@ common: show-via: "via 표시하기" reduce-motion: "UI의 애니메이션 줄이기" this-setting-is-this-device-only: "이 장치만" - use-os-default-emojis: "운영체제의 기본 이모지 사용" line-width: "선 두께" line-width-thin: "얇음" line-width-normal: "보통" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index b5dc6773a31b..c5a082301c1f 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -152,7 +152,6 @@ common: show-via: "显示 via" reduce-motion: "减弱UI中的动画效果" this-setting-is-this-device-only: "设置仅在本设备中生效" - use-os-default-emojis: "使用设备系统默认的表情符号" line-width: "线条宽度" line-width-thin: "细" line-width-normal: "正常" diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index 3edaddfc225d..5401f2e34043 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -17,8 +17,7 @@
  1. - - {{ emoji.emoji }} + ({{ emoji.aliasOf }})
    2. @@ -92,10 +91,6 @@ export default Vue.extend({ items(): HTMLCollection { return (this.$refs.suggests as Element).children; }, - - useOsDefaultEmojis(): boolean { - return this.$store.state.device.useOsDefaultEmojis; - } }, updated() { diff --git a/src/client/app/common/views/components/emoji.vue b/src/client/app/common/views/components/emoji.vue index 2c0cf6eaf231..d8077ebbe372 100644 --- a/src/client/app/common/views/components/emoji.vue +++ b/src/client/app/common/views/components/emoji.vue @@ -1,7 +1,6 @@ @@ -51,10 +50,6 @@ export default Vue.extend({ title(): string { return this.customEmoji ? `:${this.customEmoji.name}:` : this.char; }, - - useOsDefaultEmojis(): boolean { - return this.$store.state.device.useOsDefaultEmojis && !this.isReaction; - } }, watch: { diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue index b8d66b26b8c7..2a2c37491c9c 100644 --- a/src/client/app/common/views/components/settings/settings.vue +++ b/src/client/app/common/views/components/settings/settings.vue @@ -39,7 +39,6 @@ {{ $t('@._settings.contrasted-acct') }} {{ $t('@._settings.show-full-acct') }} {{ $t('@._settings.show-via') }} - {{ $t('@._settings.use-os-default-emojis') }} {{ $t('@._settings.i-like-sushi') }}
    @@ -396,11 +395,6 @@ export default Vue.extend({ return emojis; }, - useOsDefaultEmojis: { - get() { return this.$store.state.device.useOsDefaultEmojis; }, - set(value) { this.$store.commit('device/set', { key: 'useOsDefaultEmojis', value }); } - }, - reduceMotion: { get() { return this.$store.state.device.reduceMotion; }, set(value) { this.$store.commit('device/set', { key: 'reduceMotion', value }); } diff --git a/src/client/app/store.ts b/src/client/app/store.ts index 71a08093cc52..3b6b6c544a14 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -75,7 +75,6 @@ const defaultDeviceSettings = Object.assign({ postStyle: 'standard', navbar: 'top', mobileNotificationPosition: 'bottom', - useOsDefaultEmojis: false, disableShowingAnimatedImages: true, expandUsersPhotos: true, expandUsersActivity: true,