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:
kjay to complete current work on the recipe page and post the first patch.- Translation into Spanish - Please use this Google Sheet
- Look at the idea of where the recipe will be promoted through Umami
Attached is a screenshot of the recipe page (work in progress) which includes one of Anna's original images, yum!
Comment | File | Size | Author |
---|---|---|---|
#33 | interdiff_27_33.txt | 199 bytes | anmolgoyal74 |
#33 | umami-recipe-hummus-3080692-33.patch | 106.34 KB | anmolgoyal74 |
#27 | umami-recipe-hummus-3080692-27.patch | 106.06 KB | vulcanr |
#27 | interdiff-25-27.txt | 1.3 KB | vulcanr |
#25 | interdiff-11-25.txt | 1 KB | vulcanr |
Issue fork drupal-3080692
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
Comment #2
shaalThank 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.
Comment #3
kjay CreditAttribution: kjay commentedHere's a first patch.
Comment #4
shaalThank 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?
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
Comment #5
shaalComment #6
shaalComment #9
nitesh624Assigning to myself as its not updated since last 8 months. @kjay
Comment #10
nitesh624Comment #11
nitesh624Comment #13
shaal@nitesh624 thank you for working on this.
Can you please add interdiff file that will show the changes from the previous patch?
Comment #14
nitesh624hi @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
Comment #15
shaalPerhaps 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
Comment #16
nitesh624@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
Comment #17
nitesh624Comment #18
nitesh624Comment #19
priyanka.sahni CreditAttribution: priyanka.sahni at Srijan | A Material+ Company for Drupal India Association commentedComment #20
priyanka.sahni CreditAttribution: priyanka.sahni at Srijan | A Material+ Company for Drupal India Association commentedVerified and tested by applying the patch #11.
Getting warning while applying the 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.
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 Spanish Recipe-
Comment #21
priyanka.sahni CreditAttribution: priyanka.sahni at Srijan | A Material+ Company for Drupal India Association commentedComment #22
markconroy CreditAttribution: markconroy at Annertech commentedI'm getting the same errors when applying the patch from #11
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.
Comment #24
markconroy CreditAttribution: markconroy at Annertech commentedAdding Europe2020 tag.
Comment #25
vulcanr CreditAttribution: vulcanr as a volunteer and at Annertech commentedUploading patch and interdiff.
Comment #26
markconroy CreditAttribution: markconroy at Annertech commentedHi @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).Comment #27
vulcanr CreditAttribution: vulcanr as a volunteer and at Annertech commentedAdding quotation on the string, so commas can be displayed in the string
Comment #28
vulcanr CreditAttribution: vulcanr as a volunteer and at Annertech commentedChanging tag
Comment #29
markconroy CreditAttribution: markconroy at Annertech commentedPatch applies fine, tests have passed. Thanks for working on this @vulcanr @priyanka.sahni @nitesh624 @shaal @kjay
Let's mark it RTBC
Comment #30
lauriiiThere are some CI failures on the most recent patch.
Comment #31
markconroy CreditAttribution: markconroy at Annertech commentedHi @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.
Comment #32
markconroy CreditAttribution: markconroy at Annertech commented@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?
Comment #33
anmolgoyal74 CreditAttribution: anmolgoyal74 at OpenSense Labs for DrupalFit commentedAdded
Za'atar
to/core/misc/cspell/dictionary.txt.
Comment #34
vulcanr CreditAttribution: vulcanr as a volunteer and at Annertech commentedJust tested #33. Woks as expected.
Comment #35
vulcanr CreditAttribution: vulcanr as a volunteer and at Annertech commentedMarking as RTBC - Sorry for the duplicated comment.
Comment #39
kjay CreditAttribution: kjay commentedPatch applies and has passed tests, marking as RTBC.
Comment #40
ckrinaMoving back to Needs work per the feedback.
Comment #42
nitesh624Working on this, will get back with update by tomorrow.
Comment #44
nitesh624Comment #45
markconroy CreditAttribution: markconroy at Annertech commentedLooks like @ckrina's comment that "400g tin chickpeas in water" is definitely not Spanish has not been fixed.
Comment #50
RassoniRaised MR against 10 branch. And addressed unresolved #1301 MR feeback points.
Comment #51
smustgrave CreditAttribution: smustgrave at Mobomo commentedMR 3837 appears to address the "400g tin chickpeas in water" into spanish.
Comment #52
lauriiiWe 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.Comment #53
RassoniAddressed #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.
Comment #54
markconroy CreditAttribution: markconroy at Annertech commentedThanks very much @Rassoni
Comment #55
markconroy CreditAttribution: markconroy at Annertech commentedComment #56
lauriiiDiscussed 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.