絵文字ピッカーで顔文字を分離

mei23 · Feb 5, 2020 · cd753af · cd753af
1 parent 22f2b12
commit cd753af
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 114 deletions.
diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -605,6 +605,7 @@ common/views/components/emoji-picker.vue:
   remote-emoji: "Remote Custom Emoji"
   load-remote: "Load"
   no-category: "No category"
+  face: "Face mark"
   people: "People"
   animals-and-nature: "Animals & Nature"
   food-and-drink: "Food & drink"

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -646,8 +646,9 @@ common/views/components/emoji-picker.vue:
   recent-emoji: "最近使った絵文字"
   custom-emoji: "カスタム絵文字"
   remote-emoji: "リモートカスタム絵文字"
-  load-remote: "読み込み"
+  load-remote: "ロード"
   no-category: "カテゴリなし"
+  face: "顔文字"
   people: "人"
   animals-and-nature: "動物&自然"
   food-and-drink: "食べ物&飲み物"

diff --git a/src/client/app/common/views/components/emoji-picker.vue b/src/client/app/common/views/components/emoji-picker.vue
@@ -76,7 +76,7 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { emojilist } from '../../../../../misc/emojilist';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
-import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory } from '@fortawesome/free-solid-svg-icons';
+import { faAsterisk, faUser, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag } from '@fortawesome/free-regular-svg-icons';
 import { groupBy } from '../../../../../prelude/array';
 
@@ -102,10 +102,15 @@ export default Vue.extend({
 				text: this.$t('custom-emoji'),
 				icon: faAsterisk,
 				isActive: true
+			}, {
+				name: 'face',
+				text: this.$t('face'),
+				icon: ['far', 'laugh'],
+				isActive: false
 			}, {
 				name: 'people',
 				text: this.$t('people'),
-				icon: ['far', 'laugh'],
+				icon: faUser,
 				isActive: false
 			}, {
 				name: 'animals_and_nature',