Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 25 commits into from
Jun 8, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ae3f821
Added of YouTube link in producers menu dropdown
aadak99 May 20, 2023
12a5645
Added Nav Producers link with translation string
aadak99 May 20, 2023
d8297b9
Merge branch 'openfoodfacts:main' into htmlYouTubeTutorialsLink
aadak99 May 23, 2023
f73a665
Added translatable string for video_tutorials
aadak99 May 23, 2023
30d9de8
Updated Aspect -> Aspects
aadak99 May 23, 2023
8b508fe
Merge branch 'main' into htmlYouTubeTutorialsLink
aadak99 Jun 2, 2023
bbff68e
Edited producers link to only show on xLarge
aadak99 Jun 2, 2023
a4e2083
labeling for nginx (#8507)
teolemon Jun 2, 2023
8a5b07e
chore: update conf/nginx.conf to match production nginx conf for off
raphael0202 Jun 1, 2023
a0a2e9f
fix: Preventing Email Addresses as Entries in Fields (#8452)
MonalikaPatnaik Jun 5, 2023
b58c42d
feat: Run user deletion as a background task (#8516)
john-gom Jun 5, 2023
7578271
build(deps-dev): bump @typescript-eslint/parser from 5.59.7 to 5.59.8…
dependabot[bot] Jun 5, 2023
43ee8bb
chore: script to preprocess intermarche packaging excel file (#8431)
stephanegigandet Jun 5, 2023
eb7ffae
feat: Hide the Classic Packaging Field in Edit Mode (#8500)
MonalikaPatnaik Jun 5, 2023
dac1989
feat: Added Pros' Meet-Ups link in Menu (#8512)
MonalikaPatnaik Jun 6, 2023
71d2ece
taxonomy: Ro translations (#8521)
moon-rabbitOFF Jun 6, 2023
30375d4
chore: export recent changes collection (#8518)
raphael0202 Jun 6, 2023
6de8e9f
build: adapt Makefile to work for pro platform dev (#8529)
stephanegigandet Jun 6, 2023
6778187
chore: taxonomy updates (#8530)
aleene Jun 7, 2023
767e823
build: ban_abusive_ip.pl script (taken from off1) (#8474)
alexgarel Jun 7, 2023
9e65e91
fix: Restore Search Bar in Producers Platform (#8532)
MonalikaPatnaik Jun 7, 2023
8720115
taxonomy: Add Spanish/Catalan sugars for creatine products (#8491)
duhow Jun 7, 2023
b23bcbc
fix: remove warning in get_inherited_property_from_categories_tags (#…
stephanegigandet Jun 8, 2023
03ab59d
taxonomy: Added German variant of inositol (#8473)
c-schuhmann Jun 8, 2023
c4b2c78
Merge branch 'main' into htmlYouTubeTutorialsLink
MonalikaPatnaik Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions po/common/common.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2675,6 +2675,10 @@ msgctxt "users_without_products"
msgid "Products not added by %s"
msgstr ""

msgctxt "video_tutorials"
msgid "Video Tutorials"
msgstr ""

msgctxt "view"
msgid "view"
msgstr ""
Expand Down Expand Up @@ -4422,8 +4426,8 @@ msgid "Contributor"
msgstr "Contributor"

msgctxt "contributor_settings_description"
msgid "Those settings allow you to personalize some aspect of the website"
msgstr "Those settings allow you to personalize some aspect of the website"
msgid "Those settings allow you to personalize some aspects of the website"
msgstr "Those settings allow you to personalize some aspects of the website"

msgctxt "display_barcode_in_search"
msgid "Display barcode in search results"
Expand Down
8 changes: 6 additions & 2 deletions po/common/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2725,6 +2725,10 @@ msgctxt "users_without_products"
msgid "Products not added by %s"
msgstr "Products not added by %s"

msgctxt "video_tutorials"
msgid "Video Tutorials"
msgstr "Video Tutorials"

msgctxt "view"
msgid "view"
msgstr "view"
Expand Down Expand Up @@ -4423,8 +4427,8 @@ msgid "Contributor"
msgstr "Contributor"

msgctxt "contributor_settings_description"
msgid "Those settings allow you to personalize some aspect of the website"
msgstr "Those settings allow you to personalize some aspect of the website"
msgid "Those settings allow you to personalize some aspects of the website"
msgstr "Those settings allow you to personalize some aspects of the website"

msgctxt "display_barcode_in_search"
msgid "Display barcode in search results"
Expand Down
7 changes: 7 additions & 0 deletions templates/web/common/producers_resources_list.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
</a>
</li>
<li>

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

<a href="[% IF lc == "fr" %]
https://support.openfoodfacts.org/help/fr-fr/3-producers
[% ELSE %]
Expand Down
1 change: 1 addition & 0 deletions templates/web/common/site_layout.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,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 class="show-for-xlarge-up"><a href="[% lang('footer_producers_link') %]" class="top-bar-links">[% lang('footer_producers') %]</a></li>
<li class="flex-grid getapp"><a href="[% lang('get_the_app_link') %]" class="buttonbar button" style="top:0;">[% display_icon('phone_android') %] <span class="bt-text">[% lang('get_the_app') %]</span></a></li>
</ul>
</section>
Expand Down