Problem/Motivation

#2939908: Add an article to Umami - Dairy-free chocolate was proposed to add an article about Dairy Free Chocolate to the Umami demo. This article contained a recipe at the end. This should not be contained in the article itself but a separate Recipe node in its own right.

This issue is a follow on to create the Recipe node.

Proposed resolution

Take the article as proposed in https://www.drupal.org/project/drupal/issues/2939908#comment-12774442, and create a standalone recipe from the base of the new article it adds. Reuse the image from the article for the recipe.

Remaining tasks

All the things.

User interface changes

None.

API changes

None.

Data model changes

None.

Comments

Eli-T created an issue. See original summary.

eli-t’s picture

danharper’s picture

Working on this as part of distributed sprint NWDUG

g.weston’s picture

Add vegan chocolate recipe to umami.

g.weston’s picture

Status: Active » Needs review

Needs review

g.weston’s picture

Updated image filename to be inline with issue 2939908.

siliconmeadow’s picture

Status: Needs review » Reviewed & tested by the community

LGTM :-)

eli-t’s picture

Status: Reviewed & tested by the community » Needs work
Related issues: +#2940146: Standardize writing style for Umami in English

Thanks @danharper and @g.weston!

This still needs some tweaks however.

  1. The title of the recipe is in Title Case. All other recipes have titles in Sentence case
  2. The ingredients should not be replicated in the Recipe Instruction field
  3. A rich, smooth vegan chocolate confection is a joyous thing.

    needs a comma after smooth

  4. Measure the coconut oil and ensure the oil is used at room temperature.

    Is this necessary? Oil is at room temperature if you keep it in a room. No-one keeps oil in the fridge or freezer. Maybe you were keeping it in a pantry in an outbuilding? Seems niche. Also, having steps to measure things are redundant - we list the quantity needed in the ingredients list and assume that people are going to measure them. Let's just bin this step off.

  5. Once the paste is thoroughly heated through, put the paste back into the food processor and add the salt, icing sugar, coconut milk and the scraped vanilla pod seeds. Blend until smooth.

    Requires a serial comma after coconut milk. See #2940146: Standardize writing style for Umami in English.

  6. In fact there are other areas in this recipe that need serial commas, suggest review against the standards.
  7. Once the chocolate has set,

    As the previous step was to chill until set, we don't need this

spitzialist’s picture

Assigned: Unassigned » spitzialist

I'll create a patch for the mentioned changes.

spitzialist’s picture

Assigned: spitzialist » Unassigned
Status: Needs work » Needs review
StatusFileSize
new69.19 KB

Created patch with suggested changes from Eli-T in comment #8.
In summary, the changes include:

  • Title casing
  • Removed ingredients from instruction field
  • Removed unnecessary steps
  • Added serial commas
eli-t’s picture

Status: Needs review » Needs work

This is nearly there! Thanks @spitzialist, everything from #8 is addressed, but I have noticed one more thing.

The list of ingredients has "Three quarters cup" / "Two thirds cup". We don't ever spell out numbers - we always use numerals. There is no reason to spell these out just because they are fractions, so I suggest changing these to "3/4 cup" and "2/3 cup" respectively.

hardikpandya’s picture

Status: Needs work » Needs review
StatusFileSize
new2.77 KB
new3.19 KB

Status: Needs review » Needs work

The last submitted patch, 12: 3001610-12.patch, failed testing. View results

spitzialist’s picture

Thanks @Eli-T for the comment. As I looked through the other recipes, I realized that we usually use measurements in "g" an "ml" instead of "cups". As I am based in Europe, this is also more familiar for me. What is the general consents here? Should we translate everyhting to metric measurements?

eli-t’s picture

@spitzialist the writing style is targeted at US English, who are quite accustomed to measuring things in cups, so this is fine as is.

eli-t’s picture

Patch in #12 has removed the vegan-chocolate.jpg file and the vegan-milk-chocolate.html file. These should be restored.

spitzialist’s picture

Assigned: Unassigned » spitzialist

I'll provide a patch shortly.

spitzialist’s picture

Assigned: spitzialist » Unassigned
Status: Needs work » Needs review
StatusFileSize
new69.17 KB

Patch created with source from comment #10. Changed spelled out numbers to fractions as suggested in comment #11 and #15.

eli-t’s picture

Status: Needs review » Reviewed & tested by the community

My comments in #11 are addressed. No more reason to hold this back. Thanks everyone!

lauriii’s picture

Status: Reviewed & tested by the community » Needs work
  1. +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/LICENCE.txt
    @@ -9,10 +9,10 @@ heritage-carrots.jpg by Keith Jay
    -pineapple-placeholder-10.jpg by Keith Jay
    

    Unrelated change

  2. +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/vegan-milk-chocolate.html
    @@ -0,0 +1,9 @@
    +    <li>Form the paste into balls, bars, or whatever shape you want.</li>
    

    It feels like "whatever shape you want" is a bit too informal for this context. How about "or any shape you want"?

laravz’s picture

Status: Needs work » Needs review
StatusFileSize
new106.17 KB

Removed unrelated change and altered text to @lauriii's suggestion.

Edit: path does not apply due to binary file issues

Status: Needs review » Needs work

The last submitted patch, 21: umami-vegan-milk-chocolate-recipe-3001610-21.patch, failed testing. View results

laravz’s picture

Status: Needs work » Needs review
StatusFileSize
new69.02 KB
volkswagenchick’s picture

Issue tags: +badcamp 2018

badcamp 2018

spitzialist’s picture

Status: Needs review » Reviewed & tested by the community

Patch #22 looks good and addresses the changes proposed by @laurii in comment #20-21.

I get two warnings:

git apply -v umami-vegan-milk-chocolate-recipe-3001610-22.patch
umami-vegan-milk-chocolate-recipe-3001610-22.patch:86: trailing whitespace.
▒9▒▒▒p▒r▒T▒▒$▒▒n▒▒▒]Z▒▒.▒▒▒▒Nz!▒N▒B
                 H▒▒5#▒"▒Z▒2▒62▒▒Y▒▒ʆaxR▒I▒▒6▒▒窱-*▒▒   ▒▒|M▒
umami-vegan-milk-chocolate-recipe-3001610-22.patch:236: trailing whitespace.
▒▒▒▒i▒

In my opinion those are fine and are due to the binary jpg in the patch.

eli-t’s picture

The only reason I haven't +1 this is the indentation in the new html file is different to all the existing recipes. I'm trying to find where we got the 2 space standard on now.

plach’s picture

Tested this and looks great, however I noticed that the HTML file names have an -umami suffix and it seems that normally HTML and the related JPG files have the same name.

Let's quickly fix these inconsistencies and the one mentioned in #26 and get this in :)

plach’s picture

Status: Reviewed & tested by the community » Needs work
heykarthikwithu’s picture

Status: Needs work » Needs review
StatusFileSize
new68.98 KB
new2.04 KB

Fixed the inconsistencies in the patch.

plach’s picture

Status: Needs review » Needs work

#27 was not addressed.

Btw, also the LICENSE.TXT file needs to be updated when renaming JPGs.

spitzialist’s picture

Status: Needs work » Needs review
StatusFileSize
new69.05 KB
new4.45 KB
  • Added suffix "-umami" to file names of JPG and HTML files as suggested in comment #27
  • Changed License file accordingly as suggested in comment #30

Status: Needs review » Needs work

The last submitted patch, 31: 3001610-31.patch, failed testing. View results

spitzialist’s picture

Status: Needs work » Needs review
StatusFileSize
new2.77 KB
new2.77 KB

Forgot to rename one file link which is fixed now.

spitzialist’s picture

Assigned: Unassigned » spitzialist
Status: Needs review » Needs work
spitzialist’s picture

Assigned: spitzialist » Unassigned
Status: Needs work » Needs review
StatusFileSize
new2.77 KB
new69.23 KB

The patch was corrupt and I needed to update it.

Status: Needs review » Needs work

The last submitted patch, 35: 3001610-35.patch, failed testing. View results

spitzialist’s picture

Status: Needs work » Needs review

Re run test, looks good.

Status: Needs review » Needs work

The last submitted patch, 35: 3001610-35.patch, failed testing. View results

laravz’s picture

The (re)test dispatcher contains the following errors:

error: core/profiles/demo_umami/modules/demo_umami_content/default_content/images/vegan-chocolate-umami.jpg: No such file or directory
error: core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/vegan-milk-chocolate-umami.html: No such file or directory
16:36:35 Patch Error
16:36:35 The patch attempt returned an error.  Error code: 1
16:36:35 Patch Failed to Apply

This is due to the patch being incorrect. Instead of adding the files:
--- /dev/null
+++ b/core/profiles/demo_umami/.../vegan-chocolate-umami.jpg

The patch attempts to alter the non-existing files. Could you upload a patch where the files are added instead of altered?

spitzialist’s picture

Assigned: Unassigned » spitzialist
spitzialist’s picture

Assigned: spitzialist » Unassigned
Status: Needs work » Needs review
StatusFileSize
new69.06 KB

I fixed the existing issue from my last commits 31, 35. Sorry for the long time I needed to upload a new version and my beginner mistakes ;-) I hope everything works now and all open tasks from #27 and #30 and #39 are resolved.

spitzialist’s picture

StatusFileSize
new4.46 KB

Added interdiff between #29 and #41.

stratosf1’s picture

Testing at The University of Edinburgh D8 Contribution Day #uoe-d8-contribution

stratosf1’s picture

StatusFileSize
new69.08 KB
new130.93 KB

I have tested patch #41 and there was a file name inconsistency between the .jpg and the .html files. So, created a new patch and everything looks to be fine. Only caveat is that the interdiff between #41 and #44 seems larger than previously. Just to note, this is my first ever Drupal contribution so please be gentle.

mairi’s picture

StatusFileSize
new613.8 KB
new217.08 KB

I've been mentoring @stratosf1 at the University of Edinburgh #uoe-d8-contribution. I've tested his patch on a clean installation of 8.7.x and the new recipe looks good (screenshots attached).

The file names for jpg & html are matching for me - vegan-milk-chocolate-umami.html and vegan-milk-chocolate-umami.jpg.

laravz’s picture

Status: Needs review » Reviewed & tested by the community
Issue tags: +Needs change record

I believe patch #44 resolves all the issues mentioned in the last comments (License.txt has been altered (#30), -umami suffix has been added (#27), additional indentation has been removed (#26)). The tests have passed as well and @mairi has manually tested the patch on a clean installation, so I'm switching this issue to Reviewed en tested.

For now, we need to need to discuss whether we should create a change record to describe the changes that were made.

eli-t’s picture

Why does this need a change record?

laravz’s picture

Issue tags: -Needs change record

Well, there's actually no necessity to add a change record. I prefer at least thinking about it in the discussion since there was a change record for the initial addition of the demo_umami profile.

The patch mostly adds files and only alters LICENSE.txt and recipes.csv, so it might not actually impact anyone. In this case, it should probably be fine to not have a change record. Do you agree? (I'll remove the tag for now)

alexpott’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll

This uses the same image as #2939908: Add an article to Umami - Dairy-free chocolate did which has now landed. Which on one hand is great because we have a media re-use case in Umami! So once the media library lands moving to it seems like a great idea. On the other it does mean we're adding two images completely the same :(

Also all the other recipes have an image from making the recipe. Is that the case here? If so kudos to making the wrappers!

We need a reroll and a decision on the image.

alexpott’s picture

I also suspect that the current image name - vegan-milk-chocolate-umami is claiming to be a photo of the recipe on the umami site so it is not that that needs looking into.

vacho’s picture

StatusFileSize
new69.12 KB

Patch rerolled to update the work on this case.

vacho’s picture

Issue tags: -Needs reroll
eli-t’s picture

eli-t’s picture

Status: Needs work » Postponed

Postponed as we are freezing the Umami content so it can be translated.

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

Drupal 8.7.0-alpha1 will be released the week of March 11, 2019, which means new developments and disruptive changes should now be targeted against the 8.8.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

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.

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.

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.

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.

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.

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.

quietone’s picture

Status: Postponed » Postponed (maintainer needs more info)
Issue tags: -Novice

Comment #54 leads me to think that this is now outdated. Is it?

quietone’s picture

Status: Postponed (maintainer needs more info) » Closed (outdated)

There has been no work here for 6 years, or a response to the query in the last comment to confirm the need for this issue.

If there is work to do here, then either re-open the issue or open a new issue and reference this one. If the choice is to use this issue then add a comment change make sure to change the issue status to 'Active'.