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

Added localized URLs for every page through the FoundationMetadataPageMixin #6849

Merged
merged 4 commits into from
Jun 15, 2021

Conversation

KalobTaulien
Copy link
Contributor

@KalobTaulien KalobTaulien commented Jun 9, 2021

Closes #6848

Link to sample test page: Heroku timeout is too short to create localized pages. You'll need to verify on localhost.

Steps to reproduce problem

  1. inv new-db (from master branch)
  2. Sign into the admin
  3. Create a new locale and sync them all from the English pages we have
  4. Go to http://localhost:8000/en/sitemap.xml and notice there are no non-english pages (routes prefixed with /en/ but not with anything else)

Steps to fix problem

  1. git checkout 6848-localized-sitemap-urls
  2. Sign into the admin
  3. Create a new locale and sync them all form the English pages we have
  4. Go to http://localhost:8000/en/sitemap.xml and notice there are now just English pages in this sitemap, and /es/sitemap.xml for Spanish-only pages (if you chose that locale in the setting). Note: If they don't show up, try removing the caching from the URL in this PR then reloading your sitemap.xml view.

Acceptance criteria

  • sitemap.xml needs to have all the available links to each page for every locale
  • Check that sitemap.xml url is cached quite heavily.

@mofodevops mofodevops temporarily deployed to foundation-s-6848-local-ztsflv June 9, 2021 20:45 Inactive
@KalobTaulien KalobTaulien marked this pull request as ready for review June 9, 2021 22:47
@mofodevops mofodevops temporarily deployed to foundation-s-6848-local-d3hk57 June 9, 2021 22:47 Inactive
@danielfmiranda
Copy link
Collaborator

Note: have been receiving an error when trying to sync languages in step #2
image

@mofodevops mofodevops temporarily deployed to foundation-s-6848-local-d3hk57 June 14, 2021 17:00 Inactive
@mofodevops mofodevops temporarily deployed to foundation-s-6848-local-d3hk57 June 14, 2021 21:57 Inactive
@KalobTaulien
Copy link
Contributor Author

We might want to consider adding a /sitemap.xml that links to /en/sitemap.xml, /es/sitemap.xml, /de/sitemap.xml etc etc. This way GoogleBot and other search engines won't be ultra surprised that that /sitemap.xml has changed.

Alternatively, we can just submit the localized sitemaps to Google Search Console and Google will keep track of the sitemaps for us.

Copy link
Collaborator

@danielfmiranda danielfmiranda left a comment

Choose a reason for hiding this comment

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

Hi Kalob, thanks for tagging me on this change and for the easy to follow instructions! I have followed them and can confirm that the translated pages are showing in the /es/ url and the original english pages are on /en/.

Approving!

@danielfmiranda danielfmiranda merged commit 8f0655d into wagtail-localize-2021 Jun 15, 2021
@danielfmiranda danielfmiranda deleted the 6848-localized-sitemap-urls branch June 15, 2021 17:00
Pomax pushed a commit that referenced this pull request Jul 27, 2021
…eMixin (#6849)

* Added localized URLs for every page through the FoundationMetadataPageMixin

* Cache sitemap

* Localized sitemaps
Pomax added a commit that referenced this pull request Aug 10, 2021
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
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
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

Moved consts inside of functions to prevent runtime/migration conflicts (#7215)

* Moved consts inside of functions to prevent runtime/migration conflicts

* That's better
Pomax added a commit that referenced this pull request Aug 11, 2021
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

Moved consts inside of functions to prevent runtime/migration conflicts (#7215)

* Moved consts inside of functions to prevent runtime/migration conflicts

* That's better

rebase and flakefix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants