mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix translation from :skin-tone-X: where X is greater than 1

Browse source
This commit is contained in:
Scott Nonnenberg 2019-05-29 17:48:53 -07:00
parent 3d06a815c9
commit 99faac3549
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/components/emoji/lib.ts
View file

@ -169,8 +169,8 @@ export function convertShortName(shortName: string, skinTone: number = 0) {
return ''; return '';
} }
if (skinTone && base.skin_variations) { if (skinTone > 0 && base.skin_variations) {
const toneKey = skinTones[0]; const toneKey = skinTones[skinTone - 1];
const variation = base.skin_variations[toneKey]; const variation = base.skin_variations[toneKey];
if (variation) { if (variation) {
return unifiedToEmoji(variation.unified); return unifiedToEmoji(variation.unified);
@ -181,7 +181,7 @@ export function convertShortName(shortName: string, skinTone: number = 0) {
} }
export function replaceColons(str: string) { export function replaceColons(str: string) {
return str.replace(/:[a-z0-9-_+]+:(?::skin-tone-[1-4]:)?/gi, m => { return str.replace(/:[a-z0-9-_+]+:(?::skin-tone-[1-5]:)?/gi, m => {
const [shortName = '', skinTone = '0'] = m const [shortName = '', skinTone = '0'] = m
.replace('skin-tone-', '') .replace('skin-tone-', '')
.split(':') .split(':')