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.

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

New emojis + update emoji keywords + different emoji categories + updated pot + update it language + new icons #57

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

amivaleo
Copy link
Contributor

Hi!

I updated all the things you can read in the title.

  • The emojis come from the website http://unicode.org/emoji/charts/full-emoji-list.html
  • I listed both the emojis and their keywords vertically, so it is easier to comment both.
  • I added a few categories: their icons are in the 'icons' folder, but I want you to notice that they are going to be inclued by default in the next adwaita icon set (which is exactly where I found them).
  • I uploaded the pot file using your and the italian translation using update-and-compile-translations.sh script and then I uploaded the italian translation.
  • Flags are listed in alphabetical order.

It's a lot of stuff. You might not appreciate all of them.
Just take a look and see what can be merged or rejected. :)

@maoschanz
Copy link
Owner

I listed both the emojis and their keywords vertically, so it is easier to comment

What is not easier is to understand what actually changed in the file by reading the diff...

Readability is more important than commenting with // instead of /**/, i prefered when there was 10 emojis per line

On a similar topic, changing some spaces/tabs in extension.js wasn't useful. I'll merge it but i'll probably change a few things

their icons are in the 'icons' folder, but I want you to notice that they are going to be inclued by default in the next adwaita icon set (which is exactly where I found them).

I don't have 3.32 files on my computer, could you add them all ? for example the actual food&drink icon instead of this thing i stole from the Caffeine extension

@amivaleo
Copy link
Contributor Author

What is not easier is to understand what actually changed in the file by reading the diff...

I basically re-wrote emojisCharacters.js and emojisKeywords.js again. I haven't just added/removed emojis/keywords. The /**/ instead of // are due to the fact that I wrote one file first and then I cloned that for writing the other one.

i prefered when there was 10 emojis per line

I thought it was easier this way: you can open both files and, if your text editor shows the line number, you can see that at the same line number you have the icon in one file and its keywords in the other one.

3.32 files on my computer, could you add them all

Me neither. I only took the missing icons from the current gtk master branch and put the in 'icons' folder. I can add all of them, if you want.
I just want to clarify that I didn't changed all the icons, I only changed a few of them and added the new one which are not in adwaita.
Do you stiil want me to add all the icons in 'icons' folder?

I'm sorry for messing up things...
I use gedit as text editor and I can't graphically see differences between tabs and spaces. My tab width is equivalent to two spaces. I'm not even sure what do you use by default, I should check right now.

Well...
Reject the merging.
I'll keep the changes in my local files.
Sorry.

@maoschanz
Copy link
Owner

I haven't just added/removed emojis/keywords.

Yes, and that's the issue: i can't see what has been added/removed, because almost every line in the file has changed. What have you added ? (new emojis ? which ones ?) What have you removed ? (and why ?)

I use gedit as text editor and I can't graphically see differences between tabs and spaces.

I use a gedit plugin named "spaces indicators" for that

@amivaleo
Copy link
Contributor Author

At some point I noticed that some emoticon was missing, like some grinning face.
I digged into your extension and I found out this link: http://unicode.org/emoji/charts/full-emoji-list.html
I took the complete current list of icons from that webpage and I put them in the extension. I commented out only those which are not correctly drawn (for example: England, Scotland and Wales flags are drawn as black flag yet, so I commented them out). They're still in the two files (go to line 182 in emojisCharacter.js for example) but they're commented.

It would've taken a lot of time to check and add only those missing icons.
I checked that you listed icons mostly in the same order as in that webpage, so I tried to do the same. I shuffled a few groups in order to 'correctly' categorize them.

It's still the same extension, and those two files still follow the same scheme you gave them, with the only exception that you have 1 emoji per line instead of 10. This, as I said, because I wanted to have the same line number for both the icon and its keywords: this should simplify any future adding of new keywords.

You seem so grumpy. I'm not forcing you to merge anything. I wanted to updated the list of emojis and propose what I consider a better categorization.
You can rejected everything. 🤷‍♂️ Don't need to 'scold' me.

@maoschanz
Copy link
Owner

You seem so grumpy.

I am lol, sorry, but it's not because of you, i really appreciate your work, but i've a ton of exams and no time to carefully review what has changed. I'll merge it, but probably during week 52: it will require time because i need to keep the current keywords, which as you can see contain both:

  • the former keyword list from unicode.org, i don't remember when they changed it, but it was longer so it covers more cases (like finding "pork" when searching "pig")
  • the current one (like in your file, but notice how they are 100% in lower case in mine)
  • the "special" keywords, all in caps, which are used by the extension for the skin tones/gender thing. Removing them breaks the whole skin tones/gender system.

That's why i would have prefer to see exactly what has changed, so i could have keep the new categories and emoji list, but with the current keywords list that i would have completed by comparing what emojis were added

@amivaleo
Copy link
Contributor Author

Understood.
Let me work on that. I'll try to merge the keywords in your master file with the ones in that webpage.
I will submit a better version then. Don't care about all this: focus on your exams.

@amivaleo
Copy link
Contributor Author

Hey man,
what do you think about using something like this https://docs.google.com/spreadsheets/d/1Agv6X-63K_8KqD-ZwyEo3F0xDjHv5EKiQ3YK0zVGS5M/edit#gid=0 in order to get keywords from users?
I mean: you could ask for some help and let users suggest keywords.
Then you could go through them and wisely copy&paste the 'best' ones.

@maoschanz
Copy link
Owner

i love the idea of "text smileys" as keywords, does it already work with the current code ?

@amivaleo
Copy link
Contributor Author

Yes. :)
I really like that.

What's to you think about sharing that spreadsheet and make it available to users so that they can add their suggested keywords?

@maoschanz
Copy link
Owner

Yes, i could add a link in the readme for example

@amivaleo
Copy link
Contributor Author

amivaleo commented Dec 24, 2018

Let me complete that spreadsheet and then I'll go back to you. :)

@amivaleo
Copy link
Contributor Author

amivaleo commented Dec 24, 2018

Done!
Now all the emojis are listed as well as their 'names' given here: http://unicode.org/emoji/charts/full-emoji-list.html

You should have the same permissions I have to edit everything.
Apart from me and you, the rest of the world can only edit the cells with a white background.

--- x ---
A few things:

  • if, in your extension, you type some letters which are part of one of the words in the name, they already 'work'. Let me explain this with an example: there's one emoji whose name is "grinning face with big eyes". You don't need to add "face" or "eyes" as additional keywords, because they're already in the name.
  • the emojis with a red background are those which are left out because they're not correctly shown with the standard emoji font type in gnome.

Thank you, maestro. :)
Best wishes for this period of holidays. Don't get too much grumpy! :D

@maoschanz
Copy link
Owner

You don't need to add "face" or "eyes" as additional keywords, because they're already in the name.

These redundant words were on the list from the unicode website, i keep them for translations (official translated names might not include reference to "face" or "eyes" even if it's pertinent)

@amivaleo
Copy link
Contributor Author

🤔
But these names are not supposed to be localized, am I right?
So, if "grinning face" is called "abc" in some X language, a X-native will not get that emoji if he types anything but "grinning" or "face".
But! If emoji's names will be translated in the .po files in your extension, then yes, it makes sense to add "face" and "grinning" as additional keywords to that emoji and so on.

@maoschanz
Copy link
Owner

If emoji's names will be translated

the important word here is "if" 😄

@amivaleo
Copy link
Contributor Author

Ok. Got it. :)
I'll keep playing with that spreadsheet. You can advertise that, if you want.

Hey!
Merry Christmas. 😊

@maoschanz
Copy link
Owner

Yes, merry Christmas 🎅

},

_addAllCategories: function() {
for (let i = 0; i< 9; i++) {
for (let i = 0; i< 11; i++) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe < this.emojiCategories.length (or even a forEach, for this case) would be more appropriate here (so in the future people don't need to worry about modifying this. The same goes for line 758 below.
I'm new to the project though, I don't know if there is any limitation to do this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants