taxonomy: Add even more synonyms to jp_allergens_1

[Naruyoko]

What

Extends #9502, referring to the same document.

[benbenben2]

ERROR - ja:サケ already is associated to en:salmons (categories) - ja:サケ cannot be mapped to entry en:mackerels

Suggested change

	ja:サケ, 鮭, しゃけ, シャケ
	ja:鮭, しゃけ, シャケ

[benbenben2]

サケ appears 2 times in the same file, for different categories. This is the reason why the test fails.
After looking at wikipedia page and translation, I suggest to remove it from mackerels and keep it for salmons.
What do you think?

[Naruyoko]

Right, I should have moved サバ etc. there instead, but probably copied the wrong parts of the line. Actually, the correct translations for mackerels were already there, but for some reason assigned to en:Mackerel fillets.

[Naruyoko]

I pushed a fix.

[Naruyoko]

It looks like there are still conflicts in the taxonomy. Some of them seem to be unrelated to my changes, but others are relevant here, for example ビーフ. I fixed some of the easy ones (and hopefully all the ones that I broke here), preferring to designate to the parent entries.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (af42534) 49.03% compared to head (d37a272) 49.03%.

Additional details and impacted files

@@               Coverage Diff               @@
##           jp_allergens_1    #9505   +/-   ##
===============================================
  Coverage           49.03%   49.03%           
===============================================
  Files                  66       66           
  Lines               20434    20434           
  Branches             4905     4905           
===============================================
  Hits                10019    10019           
  Misses               9147     9147           
  Partials             1268     1268           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[benbenben2]

It looks like there are still conflicts in the taxonomy. Some of them seem to be unrelated to my changes, but others are relevant here, for example ビーフ. I fixed some of the easy ones (and hopefully all the ones that I broke here), preferring to designate to the parent entries.

Try to click on "update branch" in your PR. That should merge with new PR that have been merged. And hopefully remove the failed test and the POD error.

[Naruyoko]

It looks like there are still conflicts in the taxonomy. Some of them seem to be unrelated to my changes, but others are relevant here, for example ビーフ. I fixed some of the easy ones (and hopefully all the ones that I broke here), preferring to designate to the parent entries.

Try to click on "update branch" in your PR. That should merge with new PR that have been merged. And hopefully remove the failed test and the POD error.

I don't see the button, which I think is because I'm trying to merge into jp_allergens_1 rather than main. Should I merge main into mine instead?

[benbenben2]

It looks like there are still conflicts in the taxonomy. Some of them seem to be unrelated to my changes, but others are relevant here, for example ビーフ. I fixed some of the easy ones (and hopefully all the ones that I broke here), preferring to designate to the parent entries.

Try to click on "update branch" in your PR. That should merge with new PR that have been merged. And hopefully remove the failed test and the POD error.

I don't see the button, which I think is because I'm trying to merge into jp_allergens_1 rather than main. Should I merge main into mine instead?

I just clicked on the button for the pr jp_allergens_1 to main. Let's see if it changes something. Otherwise, you can try to pr directly to main as you suggested.

[sonarcloud]

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[benbenben2]

@Naruyoko, maybe that could be easier to make your pr to main directly instead of my branch.
At your place I would try to rollback to previous commit where there was only your changes and apply those changes in a new branch based on main branch.

[Naruyoko]

@Naruyoko, maybe that could be easier to make your pr to main directly instead of my branch. At your place I would try to rollback to previous commit where there was only your changes and apply those changes in a new branch based on main branch.

Okay. I made a new PR.

[Naruyoko]

Replaced by #9594.