Skip to content

Commit

Permalink
SX Design: remove Emoji component
Browse files Browse the repository at this point in the history
Followup after: adeira/universe#3081

Seems like the `Emoji` wrapper is not necessary and, in fact, it's worse
than just leaving the emoji alone.

adeira-source-id: 502e260a957fec61bc05d822e7d6e6ccfafc7394
  • Loading branch information
mrtnzlml authored and adeira-github-bot committed Jan 29, 2022
1 parent 2e4fc83 commit 9f8f4cc
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 68 deletions.
17 changes: 4 additions & 13 deletions src/Rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as React from 'react';
import sx from '@adeira/sx';
import { Emoji, Link } from '@adeira/sx-design';
import { Link } from '@adeira/sx-design';
import fbt from 'fbt';

import socialLinks from './socialLinks';
Expand All @@ -12,13 +12,7 @@ export default function Rules(): React.Node {
<ol className={styles('orderedList')}>
<li className={styles('listItem')}>
<fbt desc="Rule number 1">
Be careful when entering the café so that the cats do not run away.{' '}
<fbt:param name="pleading face emoji">
<Emoji
symbol="🥺"
label={<fbt desc="pleading face emoji description">pleading face</fbt>}
/>
</fbt:param>
Be careful when entering the café so that the cats do not run away. 🥺
</fbt>
</li>
<li className={styles('listItem')}>
Expand All @@ -34,11 +28,8 @@ export default function Rules(): React.Node {
</li>
<li className={styles('listItem')}>
<fbt desc="Rule number 4">
We encourage you to take pictures.{' '}
<fbt:param name="thumbs up emoji">
<Emoji symbol="👍" label={<fbt desc="thumbs up emoji description">thumbs up</fbt>} />
</fbt:param>{' '}
But prefer to take them without a flash. Don’t forget to tag us on your Instagram{' '}
We encourage you to take pictures. 👍 But prefer to take them without a flash. Don’t
forget to tag us on your Instagram{' '}
<fbt:param name="instagram account">
<Link href={socialLinks.instagramURL} target="_blank">
@kochkacafe
Expand Down
6 changes: 2 additions & 4 deletions translations/out/es-MX.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
"3TjrEK": "Malteadas",
"47O6Le": "Especialidades",
"3UUYVx": "Mezclas de té orgánico",
"4fVsgD": "Ten mucho cuidado cuando entres a la cafetería para que los gatos no se salgan. {pleading face emoji}",
"3yeTl7": "cara suplicando",
"31VuEv": "Be careful when entering the café so that the cats do not run away. 🥺",
"1Ecrlw": "Puedes jugar con los gatos y divertirte con ellos, pero por favor respeta su espacio, no los obligues a hacer cosas que no quieran y no los jales de la cola o de los bigotes.",
"1edhuR": "Procura no despertarlos o interrumpirlos mientras comen.",
"2bOs4x": "Toma todas las fotos que quieras, de preferencia sin flash. {thumbs up emoji} No olvides etiquetarnos en Instagram {instagram account}.",
"8TTw8": "pulgar hacia arriba",
"3HWES1": "We encourage you to take pictures. 👍 But prefer to take them without a flash. Don’t forget to tag us on your Instagram {instagram account}.",
"1rB60E": "Nuestros gatos tienen comida especial para cuidar su salud y la puedes comprar con nosotros. La comida para humanos puede ser peligrosa para ellos. Te pedimos que no los alimentes con tu comida.",
"UZaJx": "Los gatos son muy sensibles. Ten cuidado de no hacer ruidos fuertes o repentinos porque se pueden espantar.",
"1AIMqs": "No puedes traer a tus mascotas. Te recomendamos dejarlas en casa.",
Expand Down
74 changes: 23 additions & 51 deletions translations/source_strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -338,40 +338,26 @@
},
{
"hashToText": {
"xqoguQxnoeLWkiZgd66KQA==": "Be careful when entering the café so that the cats do not run away. {pleading face emoji}"
"ma2mGfydLQ0QoMlyrlx9vw==": "Be careful when entering the café so that the cats do not run away. 🥺"
},
"filepath": "src/Rules.js",
"line_beg": 14,
"col_beg": 8,
"line_end": 22,
"line_end": 16,
"col_end": 14,
"desc": "Rule number 1",
"project": "",
"type": "text",
"jsfbt": "Be careful when entering the café so that the cats do not run away. {pleading face emoji}"
},
{
"hashToText": {
"9EZBLtMJ+LsOzBwQeGG4Cg==": "pleading face"
},
"filepath": "src/Rules.js",
"line_beg": 19,
"col_beg": 21,
"line_end": 19,
"col_end": 84,
"desc": "pleading face emoji description",
"project": "",
"type": "text",
"jsfbt": "pleading face"
"jsfbt": "Be careful when entering the café so that the cats do not run away. 🥺"
},
{
"hashToText": {
"AZBk0HF6F8GgThvh5h0vdg==": "Feel free to play with the cats and have fun. But please, respect their space and do not force them to do things they do not want, such as pulling their tails, whiskers, etc."
},
"filepath": "src/Rules.js",
"line_beg": 25,
"line_beg": 19,
"col_beg": 8,
"line_end": 28,
"line_end": 22,
"col_end": 14,
"desc": "Rule number 2",
"project": "",
Expand All @@ -383,9 +369,9 @@
"2fSycF0Q8vnGGrk4RLeKLg==": "Try not to wake up our cats or interrupt them while they are having a snack."
},
"filepath": "src/Rules.js",
"line_beg": 31,
"line_beg": 25,
"col_beg": 8,
"line_end": 33,
"line_end": 27,
"col_end": 14,
"desc": "Rule number 3",
"project": "",
Expand All @@ -394,40 +380,26 @@
},
{
"hashToText": {
"J1dL7HxnyAvHJhntHYe5gA==": "We encourage you to take pictures. {thumbs up emoji} But prefer to take them without a flash. Don’t forget to tag us on your Instagram {instagram account}."
"wu4QLM8Jq2jZKhUWrIPg2g==": "We encourage you to take pictures. 👍 But prefer to take them without a flash. Don’t forget to tag us on your Instagram {instagram account}."
},
"filepath": "src/Rules.js",
"line_beg": 36,
"line_beg": 30,
"col_beg": 8,
"line_end": 47,
"line_end": 38,
"col_end": 14,
"desc": "Rule number 4",
"project": "",
"type": "text",
"jsfbt": "We encourage you to take pictures. {thumbs up emoji} But prefer to take them without a flash. Don’t forget to tag us on your Instagram {instagram account}."
},
{
"hashToText": {
"7tmFQF2JXgkmR904Ip7auw==": "thumbs up"
},
"filepath": "src/Rules.js",
"line_beg": 39,
"col_beg": 38,
"line_end": 39,
"col_end": 93,
"desc": "thumbs up emoji description",
"project": "",
"type": "text",
"jsfbt": "thumbs up"
"jsfbt": "We encourage you to take pictures. 👍 But prefer to take them without a flash. Don’t forget to tag us on your Instagram {instagram account}."
},
{
"hashToText": {
"5iTUS9k7jab+evPuLeeh7A==": "Our cats have a special healthy food which you can buy from us. Human food might be dangerous for them. Please don’t feed them with your food."
},
"filepath": "src/Rules.js",
"line_beg": 50,
"line_beg": 41,
"col_beg": 8,
"line_end": 53,
"line_end": 44,
"col_end": 14,
"desc": "Rule number 5",
"project": "",
Expand All @@ -439,9 +411,9 @@
"/T78HImOiKKs6J26mVLuaQ==": "Cats are very sensitive. Be careful with loud and sudden noises, which could scare them."
},
"filepath": "src/Rules.js",
"line_beg": 56,
"line_beg": 47,
"col_beg": 8,
"line_end": 58,
"line_end": 49,
"col_end": 14,
"desc": "Rule number 6",
"project": "",
Expand All @@ -453,9 +425,9 @@
"U98Bttt6bmp1PmUACerVug==": "Leave your pets at home. Other pets are not allowed here."
},
"filepath": "src/Rules.js",
"line_beg": 61,
"line_beg": 52,
"col_beg": 8,
"line_end": 61,
"line_end": 52,
"col_end": 97,
"desc": "Rule number 7",
"project": "",
Expand All @@ -467,9 +439,9 @@
"itv8A/4Pvi/UCI1hEPlLpQ==": "We are not responsible for any injuries caused by our cats - they are very playful, and they do not mean it. Pay special attention to your kids. Feel free to ask for medical aid when needed."
},
"filepath": "src/Rules.js",
"line_beg": 64,
"line_beg": 55,
"col_beg": 8,
"line_end": 68,
"line_end": 59,
"col_end": 14,
"desc": "Rule number 8",
"project": "",
Expand All @@ -481,9 +453,9 @@
"eEHP2QM079xkRqVGx7HUlQ==": "Hygiene is important. Wash your hand when playing with our cats."
},
"filepath": "src/Rules.js",
"line_beg": 71,
"line_beg": 62,
"col_beg": 8,
"line_end": 73,
"line_end": 64,
"col_end": 14,
"desc": "Rule number 9",
"project": "",
Expand All @@ -495,9 +467,9 @@
"4EOS7M5k/RGGg6oLo32EHw==": "Please, follow our rules. Misbehaving guests will be asked to leave."
},
"filepath": "src/Rules.js",
"line_beg": 76,
"line_beg": 67,
"col_beg": 8,
"line_end": 78,
"line_end": 69,
"col_end": 14,
"desc": "Rule number 10",
"project": "",
Expand Down

0 comments on commit 9f8f4cc

Please sign in to comment.