Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-20 23:36:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Emoji popover in non-English localizations #1189

Browse source
This commit is contained in:
Ben Gotow 2018-11-03 18:48:49 -07:00
parent 79d6491808
commit 2175de0c7c
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/src/components/composer-editor/emoji-toolbar-popover.jsx
View file

@ -5,6 +5,19 @@ import { localized } from 'mailspring-exports';
import categorizedEmojiList from './categorized-emoji';
import { getEmojiImagePath } from './emoji-plugins';
const LocalizedCategoryNames = {
People: localized('People'),
Nature: localized('Nature'),
'Food and Drink': localized('Food and Drink'),
Activity: localized('Activity'),
'Travel and Places': localized('Travel and Places'),
Objects: localized('Objects'),
Symbols: localized('Symbols'),
Flags: localized('Flags'),
'Frequently Used': localized('Frequently Used'),
'Search Results': localized('Search Results'),
};
export default class EmojiToolbarPopover extends React.Component {
static displayName = 'EmojiToolbarPopover';
@ -78,10 +91,10 @@ export default class EmojiToolbarPopover extends React.Component {
this.setState(
{
categorizedEmoji: {
[localized('Search Results')]: searchMatches,
'Search Results': searchMatches,
},
categoryPositions: {
[localized('Search Results')]: {
'Search Results': {
top: 25,
bottom: 25 + Math.ceil(searchMatches.length / 8) * 24,
},
@ -108,22 +121,22 @@ export default class EmojiToolbarPopover extends React.Component {
let categorizedEmoji = categorizedEmojiList;
const categoryPositions = {};
let categoryNames = [
localized('People'),
localized('Nature'),
localized('Food and Drink'),
localized('Activity'),
localized('Travel and Places'),
localized('Objects'),
localized('Symbols'),
localized('Flags'),
'People',
'Nature',
'Food and Drink',
'Activity',
'Travel and Places',
'Objects',
'Symbols',
'Flags',
];
const frequentlyUsedEmoji = []; //EmojiStore.frequentlyUsedEmoji();
if (frequentlyUsedEmoji.length > 0) {
categorizedEmoji = { [localized('Frequently Used')]: frequentlyUsedEmoji };
categorizedEmoji = { ['Frequently Used']: frequentlyUsedEmoji };
for (const category of Object.keys(categorizedEmojiList)) {
categorizedEmoji[category] = categorizedEmojiList[category];
}
categoryNames = [localized('Frequently Used')].concat(categoryNames);
categoryNames = ['Frequently Used'].concat(categoryNames);
}
// Calculates where each category should be (variable because Frequently
// Used may or may not be present)
@ -256,7 +269,7 @@ export default class EmojiToolbarPopover extends React.Component {
position.x = 18;
position.y += 48;
}
ctx.fillText(category, position.x, position.y);
ctx.fillText(LocalizedCategoryNames[category] || category, position.x, position.y);
position.x = 18;
position.y += 48;