fix: Squashed commits of various fixes #8408, #8332, #8354, #6525, #3372 #8437

aadak99 · 2023-05-20T19:43:55Z

Squashed my commits together

#8408
Added YouTube link to producers menu for tutorials.
@alexgarel revised it and added a string so that the video tutorials could be translated.
***The only issue I ran into was, the link translation string needs to be added to common.po and common.pot, but I do not have permission to assist with that. It would need to be added for entry "video_tutorials"

#8332
Added producers link at the top nav bar.

#8354
Added correct link under Italian translation.

#6525
Made fix to typo aspect to aspects.

#3372
Updated world string to not change to FR on main English page of openfoodfacts

Fixes #8408, #8332, #8354, #6525, #3372

Sorry for duplicate entries, trying to clean things up a bit and get it organized. Should be better going forward!

alexgarel · 2023-05-23T07:58:07Z

Hi @aadak99, thanks for this PR. Normally you should also have modifications to po/common.pot and to po/common/en.po to add your translations strings but I don't see them in the PR.

aadak99 · 2023-05-23T12:27:20Z

Hi @aadak99, thanks for this PR. Normally you should also have modifications to po/common.pot and to po/common/en.po to add your translations strings but I don't see them in the PR.

I'll look into adding those now, didn't realize it had to be done through common.pot/.po. I thought it could be added directly into the translation website. Thanks for your help and patience, once I get familiar with more, I will be able to consistently help out.

aadak99

Added translatable string for video_tutorials

stephanegigandet · 2023-05-29T12:40:55Z

templates/web/common/site_layout.tt.html

@@ -216,6 +217,7 @@
 					<ul class="search_and_links">
 						<li><a href="[% lang('menu_discover_link') %]" class="top-bar-links">[% lang('menu_discover') %]</a></li>
 						<li><a href="[% lang('menu_contribute_link') %]" class="top-bar-links">[% lang('menu_contribute') %]</a></li>
+						<li><a href="[% lang('footer_producers_link') %]" class="top-bar-links">[% lang('footer_producers') %]</a></li>


I don't think we have room for this link at all resolutions / all languages. Maybe we could display it only on very large screens.

@aadak99 do you think you can tackle this ?

It's about adding a class "show-for-xlarge-up" for example. See https://get.foundation/sites/docs-v5/components/visibility.html

@stephanegigandet @alexgarel
I should be able to handle this as it is just an addition of a class. I'll have it done by tonight EST!

stephanegigandet

Thank you!

stephanegigandet · 2023-06-07T06:32:01Z

templates/web/common/site_layout.tt.html

@@ -64,6 +64,7 @@

 									<li><label>[% lang("resources") %]</label></li>
 									<li>
+										<li><a href="https://www.youtube.com/playlist?list=PLjAH-USadsF3xgSVfUUBS4we3XBr-1r55" target="_blank">lang("video_tutorials")</a></li>


This part of the code was recently moved by @MonalikaPatnaik in another file: web/common/producers_resources_list.tt.html , so we should add this new list item there.

)

* Make user deletion a minion job * Change message * Change way enqueue is called to avoid issues with tests * Perltidy fix * Rever PO file changes

…openfoodfacts#8479) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.59.7 to 5.59.8. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.59.8/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dfacts#8431) --------- Co-authored-by: Alex Garel <alex@garel.org>

We've never exported the recent_changes collection, which includes the history of all changes performed on OFF DB since the 11th of September, 2018. It's the most interesting data source to analyze contributor/apps impacts. This commit adds the automatic export of this collection as a JSONL gzipped file.

sonarqubecloud · 2023-06-08T13:11:34Z

SonarCloud Quality Gate failed.

1 Bug
0 Vulnerabilities
1 Security Hotspot
0 Code Smells

No Coverage information
0.0% Duplication

stephanegigandet

Thank you very much @aadak99 and @MonalikaPatnaik !

aadak99 · 2023-06-08T18:53:08Z

Thank you very much @aadak99 and @MonalikaPatnaik !

@alexgarel @MonalikaPatnaik @stephanegigandet
I appreciate everyone's help and patience with me, now that I understand mostly the process I will be helping out where I can!

stephanegigandet · 2023-06-09T16:41:09Z

I appreciate everyone's help and patience with me, now that I understand mostly the process I will be helping out where I can!

Thank you so much @aadak99! :)

alexgarel · 2023-06-16T07:54:47Z

Thanks for your contribution @aadak99, really appreciated !

aadak99 added 2 commits May 20, 2023 15:01

Added of YouTube link in producers menu dropdown

ae3f821

Added Nav Producers link with translation string

12a5645

aadak99 requested a review from a team as a code owner May 20, 2023 19:43

github-actions bot assigned aadak99 May 20, 2023

github-actions bot added product history We have kept 10 years of product revisions. This is useful to monitor edits & product improvements Template::Toolkit The templating toolkit used by product opener. The starting point for HTML/JS/CSS fixes. labels May 20, 2023

aadak99 and others added 2 commits May 23, 2023 08:51

Merge branch 'openfoodfacts:main' into htmlYouTubeTutorialsLink

d8297b9

Added translatable string for video_tutorials

f73a665

github-actions bot added the Translations We use a non-standard version of GetText, lack language variants support translate.openfoodfacts.org label May 23, 2023

aadak99 commented May 23, 2023

View reviewed changes

Updated Aspect -> Aspects

30d9de8

stephanegigandet reviewed May 29, 2023

View reviewed changes

aadak99 and others added 2 commits June 1, 2023 20:03

Merge branch 'main' into htmlYouTubeTutorialsLink

8b508fe

Edited producers link to only show on xLarge

bbff68e

github-actions bot added the 💥 Merge Conflicts 💥 Merge Conflicts label Jun 6, 2023

stephanegigandet approved these changes Jun 7, 2023

View reviewed changes

stephanegigandet reviewed Jun 7, 2023

View reviewed changes

teolemon and others added 11 commits June 8, 2023 18:30

labeling for nginx (openfoodfacts#8507)

a4e2083

chore: update conf/nginx.conf to match production nginx conf for off

8a5b07e

fix: Preventing Email Addresses as Entries in Fields (openfoodfacts#8452

a0a2e9f

)

feat: Run user deletion as a background task (openfoodfacts#8516)

b58c42d

* Make user deletion a minion job * Change message * Change way enqueue is called to avoid issues with tests * Perltidy fix * Rever PO file changes

chore: script to preprocess intermarche packaging excel file (openfoo…

43ee8bb

…dfacts#8431) --------- Co-authored-by: Alex Garel <alex@garel.org>

feat: Hide the Classic Packaging Field in Edit Mode (openfoodfacts#8500)

eb7ffae

feat: Added Pros' Meet-Ups link in Menu (openfoodfacts#8512)

dac1989

taxonomy: Ro translations (openfoodfacts#8521)

71d2ece

build: adapt Makefile to work for pro platform dev (openfoodfacts#8529)

6de8e9f

github-actions bot added 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies 🧪 tests Text 🧪 unit tests 👥 Users labels Jun 8, 2023

Merge branch 'main' into htmlYouTubeTutorialsLink

c4b2c78

stephanegigandet approved these changes Jun 8, 2023

View reviewed changes

stephanegigandet merged commit da644c3 into openfoodfacts:main Jun 8, 2023

openfoodfacts-bot mentioned this pull request Jun 8, 2023

chore(main): release 2.14.0 #8497

Merged

aadak99 deleted the htmlYouTubeTutorialsLink branch June 8, 2023 18:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Squashed commits of various fixes #8408, #8332, #8354, #6525, #3372 #8437

fix: Squashed commits of various fixes #8408, #8332, #8354, #6525, #3372 #8437

aadak99 commented May 20, 2023 •

edited

Loading

alexgarel commented May 23, 2023

aadak99 commented May 23, 2023

aadak99 left a comment

stephanegigandet May 29, 2023

alexgarel Jun 1, 2023

aadak99 Jun 1, 2023

stephanegigandet left a comment

stephanegigandet Jun 7, 2023

MonalikaPatnaik Jun 8, 2023

sonarqubecloud bot commented Jun 8, 2023

stephanegigandet left a comment

aadak99 commented Jun 8, 2023

stephanegigandet commented Jun 9, 2023

alexgarel commented Jun 16, 2023

fix: Squashed commits of various fixes #8408, #8332, #8354, #6525, #3372 #8437

fix: Squashed commits of various fixes #8408, #8332, #8354, #6525, #3372 #8437

Conversation

aadak99 commented May 20, 2023 • edited Loading

alexgarel commented May 23, 2023

aadak99 commented May 23, 2023

aadak99 left a comment

Choose a reason for hiding this comment

stephanegigandet May 29, 2023

Choose a reason for hiding this comment

alexgarel Jun 1, 2023

Choose a reason for hiding this comment

aadak99 Jun 1, 2023

Choose a reason for hiding this comment

stephanegigandet left a comment

Choose a reason for hiding this comment

stephanegigandet Jun 7, 2023

Choose a reason for hiding this comment

MonalikaPatnaik Jun 8, 2023

Choose a reason for hiding this comment

sonarqubecloud bot commented Jun 8, 2023

stephanegigandet left a comment

Choose a reason for hiding this comment

aadak99 commented Jun 8, 2023

stephanegigandet commented Jun 9, 2023

alexgarel commented Jun 16, 2023

aadak99 commented May 20, 2023 •

edited

Loading