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

Jump to bottom

Category snippet localization #7183

Merged
merged 9 commits into from
Aug 9, 2021
Merged

Category snippet localization #7183

merged 9 commits into from
Aug 9, 2021

Conversation

Pomax
Copy link
Contributor

@Pomax Pomax commented Aug 5, 2021

Work in progress, but fixes the broken behaviour for PNI categories?

@mofodevops mofodevops temporarily deployed to foundation-s-category-s-auugug August 5, 2021 18:50 Inactive
Pomax
Pomax commented Aug 5, 2021
View reviewed changes
network-api/networkapi/settings.py
@@ -339,6 +339,7 @@
'blog_tags': 'networkapi.wagtailpages.templatetags.blog_tags',
'card_tags': 'networkapi.wagtailpages.templatetags.card_tags',
'class_tags': 'networkapi.wagtailpages.templatetags.class_tags',
'debug_tags': 'networkapi.wagtailpages.templatetags.debug_tags',
Copy link
Contributor Author

@Pomax Pomax Aug 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

slipping this in with the rest: having this around just makes life easier

TheoChevalier
TheoChevalier approved these changes Aug 5, 2021
View reviewed changes
Copy link
Contributor

@TheoChevalier TheoChevalier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working great!

The only thing I’ve noticed is it’s not falling back to English for categories that are not translated, but only in home or category pages.
Capture d’écran 2021-08-05 à 21 13 37

It does fallback in product pages:
Capture d’écran 2021-08-05 à 21 13 25

We will translate all categories in all locales anyway, but mentioning in case you intended to tackle that as well

@Pomax
Copy link
Contributor Author

Pomax commented Aug 5, 2021

We will translate all categories in all locales anyway, but mentioning in case you intended to tackle that as well

the fact that it's doing different things for homepage/category vs. product pages means it's probably close enough to a bug to be worth fixing =)

@mofodevops mofodevops temporarily deployed to foundation-s-category-s-8lnokl August 8, 2021 23:17 Inactive
@mofodevops mofodevops temporarily deployed to foundation-s-category-s-bykvcw August 9, 2021 17:29 Inactive
@Pomax Pomax changed the title [WIP?] Category snippet localization Category snippet localization Aug 9, 2021
Pomax
Pomax commented Aug 9, 2021
View reviewed changes
network-api/networkapi/wagtailpages/templatetags/localization.py
@@ -49,3 +51,20 @@ def get_local_language_names():
@register.simple_tag()
def get_unlocalized_url(page, locale):
return page.get_url().replace(f'/{locale}/', '/', 1)

# Force-relocalize a URL
@register.simple_tag()
Copy link
Contributor Author

@Pomax Pomax Aug 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit of a hack, and probably should not be necessary. But... it is? =(

@mofodevops mofodevops temporarily deployed to foundation-s-category-s-vurr3w August 9, 2021 17:44 Inactive
@Pomax
Copy link
Contributor Author

Pomax commented Aug 9, 2021

@TheoChevalier @KalobTaulien this should be ready for review, I'm not 100% on https://github.com/mozilla/foundation.mozilla.org/pull/7183/files#diff-4edb38b0ab78223309e545e5d159d907247579d18df094053b9b495fbecb82d8R1555-R1559 doing what it should be doing.

TheoChevalier
TheoChevalier reviewed Aug 9, 2021
View reviewed changes
Copy link
Contributor

@TheoChevalier TheoChevalier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, it works on the home/category pages, but on product pages it’s now listing categories in aaaaall languages:

Here that’s Entertainment in both English and French
Capture d’écran 2021-08-09 à 20 13 58

@TheoChevalier
Copy link
Contributor

@TheoChevalier @KalobTaulien this should be ready for review, I'm not 100% on https://github.com/mozilla/foundation.mozilla.org/pull/7183/files#diff-4edb38b0ab78223309e545e5d159d907247579d18df094053b9b495fbecb82d8R1555-R1559 doing what it should be doing.

But for hidden categories, it seem to work, I’ve translated a hidden category, and the translation is not showing up

@mofodevops mofodevops had a problem deploying to foundation-s-category-s-1dquus August 9, 2021 19:05 Failure
@Pomax
Copy link
Contributor Author

Pomax commented Aug 9, 2021 •
edited
Loading

@TheoChevalier c3d7861 should address those issues.

@Pomax Pomax temporarily deployed to foundation-s-category-s-1dquus August 9, 2021 19:07 Inactive
TheoChevalier
TheoChevalier approved these changes Aug 9, 2021
View reviewed changes
Copy link
Contributor

@TheoChevalier TheoChevalier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good now!

KalobTaulien
KalobTaulien approved these changes Aug 9, 2021
View reviewed changes
Copy link
Contributor

@KalobTaulien KalobTaulien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 🎉 Looks good to me!

@Pomax
Copy link
Contributor Author

Pomax commented Aug 9, 2021

💥

@Pomax Pomax merged commit 2fedad3 into wagtail-localize-2021 Aug 9, 2021
@Pomax Pomax deleted the category-snippet-localization branch August 9, 2021 20:19
@TheoChevalier TheoChevalier mentioned this pull request Aug 10, 2021
Merged
Pomax added a commit that referenced this pull request Aug 10, 2021
@Pomax
rebase fixes
373f8f9 
rebase fixes

fix the language picker by making sure 'next' is the right URL (#6780)

allow authenticated users to hit the wagtail localize endpoints (#6778)

* allow authenticated users to hit the wagtail localize endpoints

Updated migrations (#6795)

Enable pontoon integration for wagtail-localize (#6794)

* add wagtail_localize_git

* heroku ssh generation script

rebase fixes

Update settings.py

Update settings.py

Better 500 logging (#6836)

* allow forced logging of stack traces to console for 500 errors

* Update urls.py

* Update urls.py

blog fixes for the localize branch (#6840)

* blog fixes for the localize branch

* import

* oh flake8, you joker

Show locale in admin title (until a proper solution is released in Wagtail Core) (#6843)

rebase fixes

Redirect /pt to /pt-BR (#6854)

only create the locale, rather than cloning all pages, when creating a synced locale (#6853)

Campaign page translation fix (#6855)

Permanent pt-BR redirect (#6856)

Added localized URLs for every page through the FoundationMetadataPageMixin (#6849)

* Added localized URLs for every page through the FoundationMetadataPageMixin

* Cache sitemap

* Localized sitemaps

Make tests pass (#6872)

* Flake8

* Sitemap.xml test fix

Localization synching and creating management commands (#6866)

* Localization synching and creating management commands

* Don't lower strings; requires exact string matching now

Allow banner pages to be further localized (#6876)

Marked fields are sync or translatable (#6875)

* Marked fields are sync or translatable

* Oop

* Flake8

* Add petition synchronized fields

Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com>

Fix makemessages command for Django >= 3.1 (#6907)

Use localized wagtail-footnotes (#6913)

Localize missing fields for YT pages (#6923)

Translate article page titles (#6924)

Translate What You Can Do title (#6925)

address all acceptance criteria (#6930)

rebase fixes

update all homepage fragments to pull from localized content (#7067)

* update all homepage fragments to pull from localized content

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/news_you_can_use.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/spotlight_posts.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

Fix all the localized properties (#7068)

* update all homepage fragments to pull from localized content

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/news_you_can_use.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/spotlight_posts.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

* rest of the localized updates... I think

* forgot to save a file

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

Translatable PNI fields (#7075)

Translate 3 more PNI fields (#7081)

Localized limks in Related products section (#7125)

Localize PNI categories & products (#7124)

Translate Host controls field (#7123)

regenerating requirements.txt

.

migration renames

migration fixes

Override translatable fields for PNI home (#7146)

Localize title field on Default pages (#7147)

Bump wagtail-localize to 1.0rc3 (#7176)

Category snippet localization (#7183)

* category-snippet-localization

* well then

* Update network-api/networkapi/wagtailpages/templatetags/localization.py

* update based on Karl's advice

* some WIP removals

* show correct categories on product pages, and relocalize urls to point to use the correct locale

* let's not cache-clear

Restore product filtering per language (#7208)

Fix category fallthrough (#7212)

* make missing categories fall through to the EN version

* small docs update

* ???

* oops

* data-name should stay English
Pomax added a commit that referenced this pull request Aug 10, 2021
@Pomax
rebase fixes
4f8f2fc 
fix the language picker by making sure 'next' is the right URL (#6780)

allow authenticated users to hit the wagtail localize endpoints (#6778)

* allow authenticated users to hit the wagtail localize endpoints

Updated migrations (#6795)

Enable pontoon integration for wagtail-localize (#6794)

* add wagtail_localize_git

* heroku ssh generation script

rebase fixes

Update settings.py

Update settings.py

Better 500 logging (#6836)

* allow forced logging of stack traces to console for 500 errors

* Update urls.py

* Update urls.py

blog fixes for the localize branch (#6840)

* blog fixes for the localize branch

* import

* oh flake8, you joker

Show locale in admin title (until a proper solution is released in Wagtail Core) (#6843)

rebase fixes

Redirect /pt to /pt-BR (#6854)

only create the locale, rather than cloning all pages, when creating a synced locale (#6853)

Campaign page translation fix (#6855)

Permanent pt-BR redirect (#6856)

Added localized URLs for every page through the FoundationMetadataPageMixin (#6849)

* Added localized URLs for every page through the FoundationMetadataPageMixin

* Cache sitemap

* Localized sitemaps

Make tests pass (#6872)

* Flake8

* Sitemap.xml test fix

Localization synching and creating management commands (#6866)

* Localization synching and creating management commands

* Don't lower strings; requires exact string matching now

Allow banner pages to be further localized (#6876)

Marked fields are sync or translatable (#6875)

* Marked fields are sync or translatable

* Oop

* Flake8

* Add petition synchronized fields

Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com>

Fix makemessages command for Django >= 3.1 (#6907)

Use localized wagtail-footnotes (#6913)

Localize missing fields for YT pages (#6923)

Translate article page titles (#6924)

Translate What You Can Do title (#6925)

address all acceptance criteria (#6930)

rebase fixes

update all homepage fragments to pull from localized content (#7067)

* update all homepage fragments to pull from localized content

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/news_you_can_use.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/spotlight_posts.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

Fix all the localized properties (#7068)

* update all homepage fragments to pull from localized content

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/news_you_can_use.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

* Update network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/spotlight_posts.html

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

* rest of the localized updates... I think

* forgot to save a file

Co-authored-by: Kalob Taulien <4743971+KalobTaulien@users.noreply.github.com>

Translatable PNI fields (#7075)

Translate 3 more PNI fields (#7081)

Localized limks in Related products section (#7125)

Localize PNI categories & products (#7124)

Translate Host controls field (#7123)

regenerating requirements.txt

.

migration renames

migration fixes

Override translatable fields for PNI home (#7146)

Localize title field on Default pages (#7147)

Bump wagtail-localize to 1.0rc3 (#7176)

Category snippet localization (#7183)

* category-snippet-localization

* well then

* Update network-api/networkapi/wagtailpages/templatetags/localization.py

* update based on Karl's advice

* some WIP removals

* show correct categories on product pages, and relocalize urls to point to use the correct locale

* let's not cache-clear

Restore product filtering per language (#7208)

Fix category fallthrough (#7212)

* make missing categories fall through to the EN version

* small docs update

* ???

* oops

* data-name should stay English
Pomax added a commit that referenced this pull request Aug 11, 2021
@Pomax
rebase fixes
252c63d 
fix the language picker by making sure 'next' is the right URL (#6780)

allow authenticated users to hit the wagtail localize endpoints (#6778)

* allow authenticated users to hit the wagtail localize endpoints

Updated migrations (#6795)

Enable pontoon integration for wagtail-localize (#6794)

* add wagtail_localize_git

* heroku ssh generation script

rebase fixes

Update settings.py

Update settings.py

Better 500 logging (#6836)

* allow forced logging of stack traces to console for 500 errors

* Update urls.py

* Update urls.py

blog fixes for the localize branch (#6840)

* blog fixes for the localize branch

* import

* oh flake8, you joker

Show locale in admin title (until a proper solution is released in Wagtail Core) (#6843)

rebase fixes

Redirect /pt to /pt-BR (#6854)

only create the locale, rather than cloning all pages, when creating a synced locale (#6853)

Campaign page translation fix (#6855)

Permanent pt-BR redirect (#6856)

Added localized URLs for every page through the FoundationMetadataPageMixin (#6849)

* Added localized URLs for every page through the FoundationMetadataPageMixin

* Cache sitemap

* Localized sitemaps

Make tests pass (#6872)

* Flake8

* Sitemap.xml test fix

Localization synching and creating management commands (#6866)

* Localization synching and creating management commands

* Don't lower strings; requires exact string matching now

Allow banner pages to be further localized (#6876)

Marked fields are sync or translatable (#6875)

* Marked fields are sync or translatable

* Oop

* Flake8

* Add petition synchronized fields

Co-authored-by: Théo Chevalier <theo.chevalier11@gmail.com>

Fix makemessages command for Django >= 3.1 (#6907)

Use localized wagtail-footnotes (#6913)

Localize missing fields for YT pages (#6923)

Translate article page titles (#6924)

Translate What You Can Do title (#6925)

address all acceptance criteria (