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.

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: Change the URL of the blog in the footer #7388

Merged
merged 5 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions po/common/common.pot
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ msgstr ""

# Do not translate
msgctxt "footer_blog_link"
msgid "https://en.blog.openfoodfacts.org"
msgid "https://blog.openfoodfacts.org/en/"
msgstr ""

msgctxt "footer_code_of_conduct"
Expand Down Expand Up @@ -1644,8 +1644,8 @@ msgstr ""
# Do not change the lang code if the blog doesn't exist in your language
msgctxt "on_the_blog_content"
msgid ""
"<p>To learn more about <<site_name>>, visit <a href=\"https://en.blog."
"openfoodfacts.org\">our blog</a>!</p>\n"
"<p>To learn more about <<site_name>>, visit <a href=\"https://blog."
"openfoodfacts.org/en/\">our blog</a>!</p>\n"
"<p>Recent news:</p>\n"
msgstr ""

Expand Down
24 changes: 4 additions & 20 deletions po/common/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -746,22 +746,6 @@ msgctxt "fixme_product"
msgid "If the data is incomplete or incorrect, you can complete or correct it by editing this page."
msgstr "If the data is incomplete or incorrect, you can complete or correct it by editing this page."

msgctxt "footer"
msgid "<a href=\"https://world.openfoodfacts.org/legal\">Legal</a> -\n"
"<a href=\"https://world.openfoodfacts.org/terms-of-use\">Terms of Use</a> -\n"
"<a href=\"https://world.openfoodfacts.org/who-we-are\">Who we are</a> -\n"
"<a href=\"https://world.openfoodfacts.org/faq\">Frequently Asked Questions</a> -\n"
"<a href=\"https://openfoodfacts.uservoice.com/\">Ideas Forum</a> -\n"
"<a href=\"https://en.blog.openfoodfacts.org\">Blog</a> -\n"
"<a href=\"https://world.openfoodfacts.org/press-and-blogs\">Press and Blogs</a>\n"
msgstr "<a href=\"https://world.openfoodfacts.org/legal\">Legal</a> -\n"
"<a href=\"https://world.openfoodfacts.org/terms-of-use\">Terms of Use</a> -\n"
"<a href=\"https://world.openfoodfacts.org/who-we-are\">Who we are</a> -\n"
"<a href=\"https://world.openfoodfacts.org/faq\">Frequently Asked Questions</a> -\n"
"<a href=\"https://openfoodfacts.uservoice.com/\">Ideas Forum</a> -\n"
"<a href=\"https://en.blog.openfoodfacts.org\">Blog</a> -\n"
"<a href=\"https://world.openfoodfacts.org/press-and-blogs\">Press and Blogs</a>\n"

msgctxt "footer_and_the_facebook_group"
msgid "and the <a href=\"https://www.facebook.com/groups/openfoodfacts/\">Facebook group for contributors</a>"
msgstr "and the <a href=\"https://www.facebook.com/groups/openfoodfacts/\">Facebook group for contributors</a>"
Expand All @@ -772,8 +756,8 @@ msgstr "<<site_name>> blog"

# Do not translate
msgctxt "footer_blog_link"
msgid "https://en.blog.openfoodfacts.org"
msgstr "https://en.blog.openfoodfacts.org"
msgid "https://blog.openfoodfacts.org/en/"
msgstr "https://blog.openfoodfacts.org/en/"

msgctxt "footer_code_of_conduct"
msgid "Code of conduct"
Expand Down Expand Up @@ -1740,9 +1724,9 @@ msgstr "https://static.openfoodfacts.org/images/logos/logo-vertical-white-social

# Do not change the lang code if the blog doesn't exist in your language
msgctxt "on_the_blog_content"
msgid "<p>To learn more about <<site_name>>, visit <a href=\"https://en.blog.openfoodfacts.org\">our blog</a>!</p>\n"
msgid "<p>To learn more about <<site_name>>, visit <a href=\"https://blog.openfoodfacts.org/en/\">our blog</a>!</p>\n"
"<p>Recent news:</p>\n"
msgstr "<p>To learn more about <<site_name>>, visit <a href=\"https://en.blog.openfoodfacts.org\">our blog</a>!</p>\n"
msgstr "<p>To learn more about <<site_name>>, visit <a href=\"https://blog.openfoodfacts.org/en/\">our blog</a>!</p>\n"
"<p>Recent news:</p>\n"

msgctxt "on_the_blog_title"
Expand Down
2 changes: 1 addition & 1 deletion po/openbeautyfacts/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ msgid "<a href=\"https://world.openbeautyfacts.org/legal\">Legal</a> -\n"
"<a href=\"https://world.openbeautyfacts.org/who-we-are\">Who we are</a> -\n"
"<a href=\"https://world.openbeautyfacts.org/faq\">Frequently Asked Questions</a> -\n"
"<a href=\"https://openfoodfacts.uservoice.com/\">Ideas Forum</a> -\n"
"<a href=\"https://en.blog.openfoodfacts.org\">Blog</a> -\n"
"<a href=\"https://blog.openfoodfacts.org/en/\">Blog</a> -\n"
"<a href=\"https://world.openbeautyfacts.org/press-and-blogs\">Press and Blogs</a>\n"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion po/openbeautyfacts/openbeautyfacts.pot
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ msgid "A collaborative, free and open database of cosmetic products from around
msgstr ""

msgctxt "footer_wiki_link"
msgid "https://en.wiki.openbeautyfacts.org"
msgid "https://wiki.openfoodfacts.org"
msgstr ""

msgctxt "generic_name_example"
Expand Down