We have a new recipe to add to Umami - Chicken souvlaki with couscous. Big thanks to Anna Christoforou who has been helping me to produce new content for Umami and she has kindly provided this recipe and image for us to use in Umami.

This recipe is also being used for a video that we have both produced to help demonstrate core Media in Umami #3088253.

The first step is to get this recipe into Umami. The first draft and image is attached and a patch is in the works.

Umami demo recipe image - chicken souvlaki and couscous

Issue fork drupal-3092662

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:

Comments

kjay created an issue. See original summary.

kjay’s picture

Status: Active » Needs review
StatusFileSize
new108.75 KB

And here's the first patch with a few minor improvements to the supplied text.

kjay’s picture

A screenshot helps...

Screenshot of current patch for this recipe applied to Umami

shaal’s picture

Thank you, it looks delicious!

I used grammarly.com to find spelling mistakes and (american?) grammar suggestions.
I updated the CSV and the instruction html file accordingly.

Umami comes with this responsive image style - Large 3:2 2x (1536x1024)
So we'll probably need higher resolution of the original image for this recipe.
(if you view this image at 100% you will see how pixelerated it got by this image style)

What's Umami's writing rules regarding using cm. vs inches? can/should we use both?
What's Umami's writing rules regarding using measurements in cups (the american way) vs grams? can/should we use both?

andrewmacpherson’s picture

Yum!

Re. #4: The writing style was covered in an early issue, but it doesn't appear to answer all the questions about units.
I don't think we should mix imperial and metric units, but I don't know what the outcome was on which one to use. (At least, not from the proposed resolution there; it might be worth reviewing all the comments again.)

The cups (volume) vs. grams (mass) for measuring powders seems weird to many British readers, but at least it's a well known Americanism. I think it's becoming easier to purchase measuring cups over here in the last decade. We settled on U.S. English for the writing style, so I think we'd probably go for cups as the measurement style?

shaal’s picture

...hmmm
Should we add a little javascript code that converts on the fly imperial and metric units?
(can even save a cookie according to user's last chosen preference)

kjay’s picture

Thanks @shaal and @andrewmacpherson for the reviews.

Image resolution:

I think it would be great to be using a higher image resolution but it would need to apply to every image ideally. The history on this one was that we wanted to avoid Drupal's package file size growing too much with the introduction of the Umami demo. So we decided on 768px wide being the maximum resolution of source image until #2936841: Remove images from demo_umami profile and download upon installation instead resolved this problem by no longer needing to bundle all images into the demo.

Does Umami now using Media provide us a route that we could explore using larger resolution images as a follow up and fix them all in one hit? That may overlap nicely with the improved images I am working on. Is it simple enough to install images from remote sources on install so long as we can find a suitable home for them?

In the mean time, given we have more content arriving I would suspect we'll be required to keep file sizes as low as we can and sticking with the grainy compromise we have may be the best option?

Writing style

Recipes that have already been included use metric volume and weight, and imperial for sizes. Agreed that this is a mix and given we are writing American English may well need changing. How about we follow the style we've already set and create a follow up if there is a need to switch the volume and weight values across all content? Attached is a patch that adjusts to use inches for size (see the vegan chocolate brownies recipe).

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.

markconroy’s picture

Status: Needs review » Reviewed & tested by the community

This looks delicious and the patch looks splendid as well.

I'm going to mark this as RTBC and then we can look at VIDEO IN MEDIA!!! That will be exciting!

Thanks for working on this @kjay @shaal @andrewmacpherson

lauriii’s picture

Issue summary: View changes
Status: Reviewed & tested by the community » Needs work
StatusFileSize
new2.78 MB

The recipe looks great! Looking forward to trying it someday myself 😋


I noticed this adds English text and link to the recipe in English to the front page on the Spanish translation. We should open another issue to exclude nodes that are not translated from the front page list. We probably should either block this issue on that new issue or add Spanish translation.

markconroy’s picture

I noticed that, but presumed it was done in this way to showcase what happens when a recipe is not translated.

I'm happy for us to leave it like this, OR for us to create a follow-up issue and postpone this until we merge the follow-up.

shaal’s picture

I think this behavior is intentional, by another issue #3068721: Umami demo views should display items from all languages
We can have a larger discussion, what kind of multilingual features we would like to demo, because there are so many options, and every websites might have different reasons to display all content vs only the selected language.

markconroy’s picture

Status: Needs work » Reviewed & tested by the community

Let's put this back to RTBC in that case.

lauriii’s picture

In my opinion that could potentially make sense in some other use case, but it seems strange to have one of the recipes highlighted on the frontpage displayed in an incorrect language. Since it seems like I was having an opposing argument on #3068721: Umami demo views should display items from all languages too, I asked the product managers to weigh in on this to make a decision.

gábor hojtsy’s picture

It would be great IMHO to translate the article, rather than attempt to come up with some elaborate multilingual strategy. I don't think that is necessarily a show-stopper for committing this patch though as the patch also opens the door for inclusion of the video, if I understand that right?

markconroy’s picture

@Gábor Hojtsy yes, that's correct. This patch is our first that will use video.

We can easily create a follow-up to translate the recipe then.

Shall we commit this so?

xjm’s picture

It sounds like we should at least have a followup for the translation?

shaal’s picture

We discussed in the past, the great opportunity of introducing some content that did not get translated, as it is a reality in multilingual websites, and allow demonstrate Drupal's behavior around these cases.

But that might surface some interesting new features we might consider adding to Drupal core, to provide a better support for multilingual websites.

@berdir has many ideas around that :)

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.

quietone’s picture

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

The latest patch here, #7, is being tested on Drupal 8.9.x. It needs to be updated for 9.3.x. Adding tag for a reroll. Sorry folks.

gábor hojtsy’s picture

If there is a plan to do a real multilingual demo, then it would be great to see that. I think it would probably have been possible to find volunteers to translate the recipe in the past month or so either here or in a followup. (Or alternately formulate a plan on how Umami pivots to a fully multilingual demo, which I think would be significantly harder to achieve).

Would be great to move forward with this, so we can get the video demo in :)

ravi.shankar’s picture

Issue tags: -Needs reroll

Removing Needs Reroll tag as patch #7 apply on Drupal 9.3.x.

Needs works for CSpell fails in the following files:
core/profiles/demo_umami/modules/demo_umami_content/default_content/LICENCE.txt
core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/media/image.csv
core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv

kjay’s picture

I've created an issue for getting this recipe translated at #3240901: Provide Spanish translation for the Chicken Souvlaki recipe for the Umami demo. Hopefully we can work the translation into this patch.

I also noticed that I made a mistake in the patch with the ingredient list not following Umami's standard of quantity followed by item. I've fixed that in the translation spreadsheet.

Assigning this issue to myself to fix the ingredients list.

shaal’s picture

@kjay, I left previous comments #11and #19 regarding (NOT getting) translation for this content.
I still believe that having some content in one language and not the other, will bring a whole new level of showcasing what's possible with Drupal multilingual features.
What do you think?

kjay’s picture

@shaal, since translation as a follow up seems to be acceptable to get this moved forward, I created the follow up. Given this recipe will have the video and hopefully be promoted as a result, I think it makes sense that we present it as promoted Spanish content when a translation is available.

In terms of having content that is not translated, since Drupal supports that and since it's already happening for other languages (as per #15), I agree that it's a use case that we should cater for, with Umami demonstrating a UX that makes sense of that feature.

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

paulocs’s picture

Status: Needs work » Needs review

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.

smustgrave’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll

Or the MR should be updated for 10.1

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

rpayanm’s picture

Status: Needs work » Needs review
Issue tags: -Needs reroll
smustgrave’s picture

Status: Needs review » Needs work
Issue tags: +Needs issue summary update, +Needs Review Queue Initiative

This issue is being reviewed by the kind folks in Slack, #need-reveiw-queue. We are working to keep the size of Needs Review queue [2700+ issues] to around 200, following Review a patch or merge require as a guide.

Tested this out with a fresh drupal install with the umami theme.

I do see the new recipe Chicken souvlaki (looks delicious)

Sending this back to NW though for an issue summary update. Not entirely clear what is being included.

This recipe is also being used for a video that we have both produced to help demonstrate core Media in Umami

Does that mean there should be a video I see the next sentence said this is the first step. Is there a follow up for the video?

Would be super helpful to use the standard template about what exactly is being proposed in this ticket. Helps the committer later.

xjm’s picture

Hiding old patches and MRs for clarity.

The proposal is pretty simple -- add this recipe to the default content that ships with the Umami demo profile. I don't think there's any dearth of information missing from the IS:
https://www.drupal.org/docs/umami-drupal-demonstration-installation-profile

Code review and manual testing are the next steps.

shaal’s picture

The original purpose of adding this recipe to Umami, was to demonstrate Drupal's ability to display a video.
A special video was produced by @kjay. I watched the draft version of that video, which was awesome! I don't think @kjay published the finished version of the video.

markconroy’s picture

@shaal you are correct about the video.

It's a pity we don't have this patch merged yet, it was such as cool feature to demo and the video looked great. Let's get this closed out and merged as soon as we can.

@kjay can you remember where the video is/was and how we can get it into this patch?

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.

Version: 11.x-dev » main

Drupal core is now using the main branch as the primary development branch. New developments and disruptive changes should now be targeted to the main branch.

Read more in the announcement.