We have a great new Umami demo recipe for homemade hummus that has kindly been donated by Anna Christoforou (https://www.instagram.com/annaskitchentableshrewsbury/), who is also happy for us to use her amazing image of the dish.

The recipe is ideal for adding to Umami because it is so simple and looks and tastes great. We also discussed on the weekly OOTB call the idea of using this recipe to create a short video for demo of core media.

Tasks remaining:

Attached is a screenshot of the recipe page (work in progress) which includes one of Anna's original images, yum!

Umami demo hummus recipe work in progress.

Issue fork drupal-3080692

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

kjay created an issue. See original summary.

shaal’s picture

Thank you @kjay, it looks great!

I'm thinking that we should have the patch AND the Spanish translation in this issue.
Start with patch in English, we'll get volunteers to help translating it to Spanish, and then we'll update the patch to include both languages.

kjay’s picture

Here's a first patch.

shaal’s picture

Thank you @kjay, I tested your patch and it works great.
When running git apply -v umami-recipe-hummus-3080692-3.patch I received a few error messages.
Could this be because of the image file which is part of the patch?

Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/images/hummus-umami.jpg...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/hummus-umami.html...
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/images/hummus-umami.jpg cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/hummus-umami.html cleanly.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

I created a google-doc to manage the translation to Spanish, and when the translations gets approved we'll create a new patch to include both English and Spanish.
https://docs.google.com/spreadsheets/d/13pRJx7RzQdf3wlVk9ZTyCaSxj9nuhp5c...

I attached the screenshot of the recipe after I applied patch #3

shaal’s picture

Issue summary: View changes
shaal’s picture

Issue summary: View changes

Version: 8.8.x-dev » 8.9.x-dev

Drupal 8.8.0-alpha1 will be released the week of October 14th, 2019, which means new developments and disruptive changes should now be targeted against the 8.9.x-dev branch. (Any changes to 8.9.x will also be committed to 9.0.x in preparation for Drupal 9’s release, but some changes like significant feature additions will be deferred to 9.1.x.). For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

Version: 8.9.x-dev » 9.1.x-dev

Drupal 8.9.0-beta1 was released on March 20, 2020. 8.9.x is the final, long-term support (LTS) minor release of Drupal 8, which means new developments and disruptive changes should now be targeted against the 9.1.x-dev branch. For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

nitesh624’s picture

Assigning to myself as its not updated since last 8 months. @kjay

nitesh624’s picture

Assigned: kjay » nitesh624
nitesh624’s picture

Status: Needs review » Needs work

The last submitted patch, 11: umami-recipe-hummus-3080692-11.patch, failed testing. View results

shaal’s picture

@nitesh624 thank you for working on this.
Can you please add interdiff file that will show the changes from the previous patch?

nitesh624’s picture

FileSize
33.3 KB

hi @shaal thanks for quick reply. I couldn't create interdiff betweeb #3 and #11 . Can you please help me?
getting below error when running command

interdiff_failed

shaal’s picture

Perhaps your patch included a reroll? that would usually be the reason interdiff wouldn't work.

In those cases I use regular diff between the 2 patches, here's an explanation about that -
https://www.drupal.org/documentation/git/interdiff#reroll

nitesh624’s picture

FileSize
97 bytes

@shaal this file i got after running diff -u umami-recipe-hummus-3080692-3.patch umami-recipe-hummus-3080692-11.patch > reroll_diff_3-11.txt

nitesh624’s picture

nitesh.kumar@pg01g1ud:/var/www/html/D-9.1.x-umami$ git apply --check patches/umami/umami-recipe-hummus-3080692-3.patch
error: patch failed: core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv:8
error: core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv: patch does not apply
nitesh624’s picture

Assigned: nitesh624 » Unassigned
Status: Needs work » Needs review
priyanka.sahni’s picture

Assigned: Unassigned » priyanka.sahni
priyanka.sahni’s picture

Verified and tested by applying the patch #11.

Getting warning while applying the patch.
After Patch

Please find the below observations:
The text highlighted in yellow in this doc link "https://docs.google.com/spreadsheets/d/1sr3f6u-m50OpEQn1C4_bxDPQvEvPrKKj..." is not there in the English and Spanish Recipe Content Type.

After Patch

Steps to test -
1. Go to admin site.
2. Go to admin/content.
3. Filter out the Recipe content type.
4. Verify the content for English(Fresh and tasty homemade hummus) and Spanish(Hummus fresco y sabroso casero) Recipe.

After Patch English Recipe-

After Patch

After Patch Spanish Recipe-

After Patch

priyanka.sahni’s picture

Assigned: priyanka.sahni » Unassigned
markconroy’s picture

Status: Needs review » Needs work

I'm getting the same errors when applying the patch from #11

$ git apply -v ../_patches/umami-recipe-hummus-3080692-11.patch 
../_patches/umami-recipe-hummus-3080692-11.patch:40: trailing whitespace.
"T?o6ڋHTɖ(E<?W??? 
../_patches/umami-recipe-hummus-3080692-11.patch:102: trailing whitespace.
???????P??E?_)"?d????&?ߡ?"?+;?X?Kȅ?,??e?q??ξƬ??n??%dc?L???b?D?>???ݗ?F]?T)?%??cӼ'E?vv??"8\W'???6Wf?%?????H?(Ң??I"?1?F?[k????ԍR4???2oq%?ɿ???\?|?o?+P?pv1?YՎ4??U?O??i??B?#???(???hs?v??X??^K?e??p?>ɾ?"??i??=???"u??x?x??!?tdKI?6?F?d??ѫ>?^?J????m?#?J??^{??"(??H)!??C?7~K?6"Ŗ??K?zBeY-&??
../_patches/umami-recipe-hummus-3080692-11.patch:168: trailing whitespace.
?Q??ZSB홡!?/??ܾ?
../_patches/umami-recipe-hummus-3080692-11.patch:248: trailing whitespace.
7?
../_patches/umami-recipe-hummus-3080692-11.patch:273: trailing whitespace.
?g_,????????镰f;
                ?;h?{?a?Q??y?PiW???eТ??㉚??3??)?s?Sm9* 
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/images/hummus-umami.jpg...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/media/image.csv...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/hummus-umami.html...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/recipe.csv...
Checking patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/recipe_instructions/hummus-umami.html...
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/images/hummus-umami.jpg cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/media/image.csv cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/hummus-umami.html cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/recipe.csv cleanly.
Applied patch core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/recipe_instructions/hummus-umami.html cleanly.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

I have a feeling those whitespace errors are coming from the images that are embedded inside the patch. If that's the case, I think we can ignore them.

Most of the text that is missing in the English/Spanish reported by @priyanka.sahni is in the patch as far as I can see from doing a "search and find" in my text editor. The only one not there is the Spanish translation of the image alt text. If someone can add that, I can test again.

Version: 9.1.x-dev » 9.2.x-dev

Drupal 9.1.0-alpha1 will be released the week of October 19, 2020, which means new developments and disruptive changes should now be targeted for the 9.2.x-dev branch. For more information see the Drupal 9 minor version schedule and the Allowed changes during the Drupal 9 release cycle.

markconroy’s picture

Issue tags: +Europe2020

Adding Europe2020 tag.

vulcanr’s picture

Uploading patch and interdiff.

markconroy’s picture

Hi @vulcanr

Thanks for this patch. It looks like there you need to put your alt text into a quote since there is a comma in it. Without this, the import thinks everything after the comma is the name of the author (and since we don't have an author of that name, the translation is not created).

vulcanr’s picture

Adding quotation on the string, so commas can be displayed in the string

vulcanr’s picture

Status: Needs work » Needs review

Changing tag

markconroy’s picture

Status: Needs review » Reviewed & tested by the community

Patch applies fine, tests have passed. Thanks for working on this @vulcanr @priyanka.sahni @nitesh624 @shaal @kjay

Let's mark it RTBC

lauriii’s picture

Status: Reviewed & tested by the community » Needs work

There are some CI failures on the most recent patch.

markconroy’s picture

Hi @lauriii

The failure seems to be a word "Za'tar" that the CI doesn't know about. Is that a false positive?

The only other thing I can think of here is that the jpg files are causing a whitespace issue, but again that would be a false positive.

markconroy’s picture

@vulcanr

It looks like Za'atar is not in the allowed words in our dictionary at /core/misc/cspell/dictionary.txt.

Wanna create a new patch and interdiff adding that word to the dictionary and I can test it again then?

anmolgoyal74’s picture

Added Za'atar to /core/misc/cspell/dictionary.txt.

vulcanr’s picture

Just tested #33. Woks as expected.

vulcanr’s picture

Status: Needs review » Reviewed & tested by the community

Marking as RTBC - Sorry for the duplicated comment.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 33: umami-recipe-hummus-3080692-33.patch, failed testing. View results

Version: 9.2.x-dev » 9.3.x-dev

Drupal 9.2.0-alpha1 will be released the week of May 3, 2021, which means new developments and disruptive changes should now be targeted for the 9.3.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

kjay’s picture

Status: Needs work » Reviewed & tested by the community

Patch applies and has passed tests, marking as RTBC.

ckrina’s picture

Status: Reviewed & tested by the community » Needs work

Moving back to Needs work per the feedback.

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.0-rc1 was released on November 26, 2021, which means new developments and disruptive changes should now be targeted for the 9.4.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

nitesh624’s picture

Assigned: Unassigned » nitesh624

Working on this, will get back with update by tomorrow.

nitesh624’s picture

Assigned: nitesh624 » Unassigned
Status: Needs work » Needs review
markconroy’s picture

Status: Needs review » Needs work

Looks like @ckrina's comment that "400g tin chickpeas in water" is definitely not Spanish has not been fixed.

Version: 9.4.x-dev » 9.5.x-dev

Drupal 9.4.0-alpha1 was released on May 6, 2022, which means new developments and disruptive changes should now be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.5.x-dev » 10.1.x-dev

Drupal 9.5.0-beta2 and Drupal 10.0.0-beta2 were released on September 29, 2022, which means new developments and disruptive changes should now be targeted for the 10.1.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Rassoni made their first commit to this issue’s fork.

Rassoni’s picture

Status: Needs work » Needs review

Raised MR against 10 branch. And addressed unresolved #1301 MR feeback points.

smustgrave’s picture

Status: Needs review » Reviewed & tested by the community
Issue tags: +Needs Review Queue Initiative

MR 3837 appears to address the "400g tin chickpeas in water" into spanish.

lauriii’s picture

Status: Reviewed & tested by the community » Needs work

We need to update core/profiles/demo_umami/modules/demo_umami_content/default_content/LICENCE.txt with the appropriate license for the image. However, I'm not sure what's the process for that since based on the issue summary, I'm not certain if the author of the image has a Drupal.org account.

Rassoni’s picture

Status: Needs work » Needs review

Addressed #52 feedback point. Tried to locate the (Anna Christoforou) author's Drupal org account, but not able to locate the user(Anna Christoforou). For consistency, follow the contents of the license text file and mention the user with the user's image.

markconroy’s picture

Status: Needs review » Reviewed & tested by the community

Thanks very much @Rassoni

markconroy’s picture

lauriii’s picture

Status: Reviewed & tested by the community » Needs work

Discussed with @catch about this issue since it involves relicensing pictures from a person who is not involved on the issue. We agreed that to be able to proceed here, we need a written statement from the author of the picture/recipe that we can ship the picture under CC BY-SA 4.0.

Version: 10.1.x-dev » 11.x-dev

Drupal core is moving towards using a “main” branch. As an interim step, a new 11.x branch has been opened, as Drupal.org infrastructure cannot currently fully support a branch named main. New developments and disruptive changes should now be targeted for the 11.x branch, which currently accepts only minor-version allowed changes. For more information, see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.