Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Added emoji category translations #7125

Merged
merged 13 commits into from
Jan 12, 2022
Merged

Fix: Added emoji category translations #7125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
14c145d
fix: Changed the title to translation key
mananjadhav Jan 11, 2022
b3ee832
fix: replaced the code with translate function
mananjadhav Jan 11, 2022
e9853d4
fix: Updated translations for es
mananjadhav Jan 11, 2022
a2734a0
fix: Added translation to native code as well
mananjadhav Jan 11, 2022
b57f01c
fix: Added food & drinks
mananjadhav Jan 11, 2022
2aa425f
fix: Added dynamic spacing for category names
mananjadhav Jan 11, 2022
1aecb6b
fix: Removed hardcoded spaces and added new category
mananjadhav Jan 11, 2022
abac75c
Merge branch 'main' of https://github.com/mananjadhav/App into fix/em…
mananjadhav Jan 11, 2022
ea2c6bd
fix: Code cleanup
mananjadhav Jan 11, 2022
39853fb
fix: Updated spanish translation
mananjadhav Jan 12, 2022
deb283d
fix: Add dynamic spaces when no frequently used emojis exist
mananjadhav Jan 12, 2022
d25031b
Merge branch 'fix/emoji-category-translations' of https://github.com/…
mananjadhav Jan 12, 2022
dcf4dde
fix: Added early return
mananjadhav Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 11 additions & 235 deletions assets/emojis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,9 @@ const skinTones = [{

const emojis = [
{
code: 'Smileys & People',
code: 'smileysAndPeople',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '😀',
keywords: [
Expand Down Expand Up @@ -2801,30 +2780,9 @@ const emojis = [
],
},
{
code: 'Animals & Nature',
code: 'animalsAndNature',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '🐵',
keywords: [
Expand Down Expand Up @@ -3615,6 +3573,10 @@ const emojis = [
'wind',
],
},
{
code: 'foodAndDrinks',
header: true,
},
{
code: '🍇',
keywords: [
Expand Down Expand Up @@ -4366,42 +4328,9 @@ const emojis = [
],
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: 'Travel & Places',
code: 'travelAndPlaces',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '🌍',
keywords: [
Expand Down Expand Up @@ -6227,51 +6156,9 @@ const emojis = [
],
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: 'Activities',
code: 'activities',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '🎃',
keywords: [
Expand Down Expand Up @@ -7011,42 +6898,9 @@ const emojis = [
],
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: 'Objects',
code: 'objects',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '🔇',
keywords: [
Expand Down Expand Up @@ -8455,48 +8309,9 @@ const emojis = [
],
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: 'Symbols',
code: 'symbols',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '🏧',
keywords: [
Expand Down Expand Up @@ -10093,48 +9908,9 @@ const emojis = [
],
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: 'Flags',
code: 'flags',
header: true,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: CONST.EMOJI_SPACER,
},
{
code: '🏁',
keywords: [
Expand Down
11 changes: 11 additions & 0 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,17 @@ export default {
},
emojiPicker: {
skinTonePickerLabel: 'Change default skin tone',
headers: {
frequentlyUsed: 'Frequently Used',
smileysAndPeople: 'Smileys & People',
animalsAndNature: 'Animals & Nature',
foodAndDrinks: 'Food & Drinks',
travelAndPlaces: 'Travel & Places',
activities: 'Activities',
objects: 'Objects',
symbols: 'Symbols',
flags: 'Flags',
},
},
newRoomPage: {
newRoom: 'New Room',
Expand Down
11 changes: 11 additions & 0 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,17 @@ export default {
},
emojiPicker: {
skinTonePickerLabel: 'Elige el tono de piel por defecto',
headers: {
frequentlyUsed: 'Usado frecuentemente',
smileysAndPeople: 'Emoticonos y personas',
animalsAndNature: 'Animales y naturaleza',
foodAndDrinks: 'Alimentos y bebidas',
travelAndPlaces: 'Viajes y lugares',
activities: 'Actividades',
objects: 'Objetos',
symbols: 'Símbolos',
flags: 'Banderas',
},
},
newRoomPage: {
newRoom: 'Nueva sala de chat',
Expand Down
Loading