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 for jekyll canonical URL construction #1039

Merged
merged 5 commits into from
Sep 10, 2024
Merged

Conversation

gilgongo
Copy link
Member

@gilgongo gilgongo commented Sep 8, 2024

This is to test whether the .zip version of the site renders the same as that of a local build, since we spotted a possible issue with that in with #1026

EDIT: Turned out that it was a quirk of the Jekyll Polyglot plugin that was only apparent when running jekyll build.

@gilgongo
Copy link
Member Author

gilgongo commented Sep 9, 2024

'base' input parameter is ignored when action is triggered by pull request event

Wonder what that means?

@pljones
Copy link
Contributor

pljones commented Sep 9, 2024

Yep, still gets

<link rel="canonical" hreflang="en" href="/sv-SE/wiki/Installation-for-Linux">

unfortunately. The jekyll serve shows "correctly" now for me.

I notice this in the build log under "Check for po4a cache":

Cache restored from key: Linux-po4a-0.68

Later, under "Build the site in the jekyll/builder container":

Bundler 2.3.25 is running, but your lockfile was generated with 2.5.18. Installing Bundler 2.5.18 and restarting using that version.

So it's picked up @softins' change. Based on the above, I guess we need to try deleting the cached po4a stuff and running ./_po4a-tools/po4a-create-all-targets.sh again with a fresh install.

@gilgongo

This comment was marked as resolved.

@gilgongo

This comment was marked as resolved.

@softins
Copy link
Member

softins commented Sep 10, 2024

If GitHub builds release, I think it would still be using the old Gemfile.lock, as my PR was only merged into next-release. We could cherry pick that commit into release?

@gilgongo

This comment was marked as resolved.

@gilgongo
Copy link
Member Author

gilgongo commented Sep 10, 2024

Ah, found it. Needed to use the static_href variable. Should be working now.

Will let somebody verify that independently but otherwise good to merge.

@gilgongo gilgongo changed the title Test for jekyll URL construction Fix for jekyll canonical URL construction Sep 10, 2024
@pljones
Copy link
Contributor

pljones commented Sep 10, 2024

<link rel="canonical" hreflang="en" href="/wiki/Installation-for-Linux">
<link rel="alternate" hreflang="sv-SE" href="/sv-SE/wiki/Installation-for-Linux">

Looks good!

@gilgongo gilgongo merged commit 93272c0 into next-release Sep 10, 2024
1 check passed
@gilgongo gilgongo deleted the jekyll-test branch September 10, 2024 18:10
@gilgongo
Copy link
Member Author

Oh.

  Conversion error: Jekyll::Converters::Markdown encountered an error while converting '_posts/2021-01-05-Jamulus-Sound-Devices.md/#excerpt':
                    No such file or directory @ rb_sysopen - /srv/jekyll/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/86/4d0f894f12a515b443a594ebf17e166e9e29842271eddd6981d54bd3a84081
  Liquid Exception: No such file or directory @ rb_sysopen - /srv/jekyll/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/86/4d0f894f12a515b443a594ebf17e166e9e29842271eddd6981d54bd3a84081 in /srv/jekyll/_layouts/kblist.html

@softins
Copy link
Member

softins commented Sep 10, 2024

Maybe clear the cache and try again?

@gilgongo
Copy link
Member Author

How do I do that?

@softins
Copy link
Member

softins commented Sep 10, 2024

I would guess just remove the .jekyll-cache directory. I think it should then get recreated. Maybe there is some mismatch between a new and an old cached file?

@gilgongo
Copy link
Member Author

Ah, OK. I re-ran the workflow and it worked on the second try.

@softins
Copy link
Member

softins commented Sep 11, 2024

Ah, OK. I re-ran the workflow and it worked on the second try.

Ah, I didn't realise you were talking about a Github workflow, rather than your local system.

pljones added a commit that referenced this pull request Sep 21, 2024
* Use newlines for code to help with copy-paste (#968)

* newlines help with copy-paste

* use tabs rather than 4 spaces

* three tics for copy button

* preferred markdown

* AUTO: Updated .po files

* Change jamulus-server to jamulus-headless (#969)

* Change jamulus-server to jamulus-headless

* Fix grammar

Co-authored-by: John Dempsey <[email protected]>

---------

Co-authored-by: John Dempsey <[email protected]>

* AUTO: Updated .po files

* Fix segmentation in 1-Index (#970)

* Update _config.yml

Make kramdown the markdown processor

* Update and rename 1-index.html to 1-index.md

* Update 1-index.md

* Update 1-de-index.html

* Rename 1-de-index.html to 1-de-index.md

* Update and rename 1-es-index.html to 1-es-index.md

* Update and rename 1-fr-index.html to 1-fr-index.md

* Update and rename 1-index.html to 1-index.md

* Update and rename 1-it-index.html to 1-it-index.md

* Update and rename 1-ko_KR-index.html to 1-ko_KR-index.md

* Update and rename 1-nb_NO-index.html to 1-nb_NO-index.md

* Update and rename 1-nl-index.html to 1-nl-index.md

* Update and rename 1-pt_BR-index.html to 1-pt_BR-index.md

* Update and rename 1-pt_PT-index.html to 1-pt_PT-index.md

* Update and rename 1-zh_CN-index.html to 1-zh_CN-index.md

* Fix segmentation in 1-Index

* Don't include processed .po files

* Correction

* Add comments

* Add comments

* Update _po4a-tools/po4a-update-templates.sh

Co-authored-by: Peter L Jones <[email protected]>

* Remove unneeded check

---------

Co-authored-by: Peter L Jones <[email protected]>

* AUTO: Updated .po files

* Revert "AUTO: Updated .po files"

This reverts commit a73218e.

* Revert "Fix segmentation in 1-Index (#970)"

This reverts commit 256a678.

* Translations update from Hosted Weblate (#975)

* Update Spanish translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Co-authored-by: gallegonovato <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/es/
Translation: Jamulus/Running-a-Server

* Update French translation using Weblate

Currently translated at 100.0% (165 of 165 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: Olivier Humbert <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/fr/
Translation: Jamulus/Directories
Translation: Jamulus/Running-a-Server

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Running-a-Server
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/

---------

Co-authored-by: gallegonovato <[email protected]>
Co-authored-by: Olivier Humbert <[email protected]>

* Fix segmentation in 1-Index 2nd attempt (#976)

* Update _config.yml

Make kramdown the markdown processor

* Update and rename 1-index.html to 1-index.md

* Update 1-index.md

* Update 1-de-index.html

* Rename 1-de-index.html to 1-de-index.md

* Update and rename 1-es-index.html to 1-es-index.md

* Update and rename 1-fr-index.html to 1-fr-index.md

* Update and rename 1-index.html to 1-index.md

* Update and rename 1-it-index.html to 1-it-index.md

* Update and rename 1-ko_KR-index.html to 1-ko_KR-index.md

* Update and rename 1-nb_NO-index.html to 1-nb_NO-index.md

* Update and rename 1-nl-index.html to 1-nl-index.md

* Update and rename 1-pt_BR-index.html to 1-pt_BR-index.md

* Update and rename 1-pt_PT-index.html to 1-pt_PT-index.md

* Update and rename 1-zh_CN-index.html to 1-zh_CN-index.md

* Fix segmentation in 1-Index

* Don't include processed .po files

* Correction

* Add comments

* Add comments

* Update _po4a-tools/po4a-update-templates.sh

Co-authored-by: Peter L Jones <[email protected]>

* Remove unneeded check

* AUTO: Updated .po files

---------

Co-authored-by: Peter L Jones <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* AUTO: Updated .po files

* Add changes to iOS install page

* Translations update from Hosted Weblate (#978)

* Update Installation-for-Linux.md adding PipeWire usage. (#980)

* AUTO: Updated .po files

* Apply suggestion

Co-authored-by: Peter L Jones <[email protected]>

* Update deprecated actions

* Replace banner image

* Add figure style

* Lang select (#11)

* Initial replacements testing OK so far

* Add language selection dropdown

* Don't store lang preference

* Align dropdown to the right. Remove unneeded code from fw.css

* Make dropdown scrollable

* Clean/move/improve css styling, add icon, lang sel. outline

* Remove unneeded css

* Show full lang names, automate adding langs

* AUTO: Add new language: (eu) #4

* Revert "AUTO: Add new language: (eu) #4"

This reverts commit 301c948.

* Correction

* AUTO: Add new language: (Basque) #5

* Update add-lang.yml

* AUTO: Add new language: (English (American)) #6

* Correction

* Revert language additions

* Correction

* Correction

* Update

* Update

* Add check

* Update error message

* Revert lang code hyphens

* Add changes by @gilgongo

* Combine with gilgongo's stuff

* Correct title check

* Correct pt-BR language codes

* Revert lang code changes

---------

Co-authored-by: Gilgongo <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Replace with simplified version

* Change add-lang message, remove suglang reference

* Improve accessibility

* Match text colour

* Make dropdown menu more compact

* Make dropdown standard html

* Replace with simplified version

Change add-lang message, remove suglang reference

Improve accessibility

Match text colour

Make dropdown menu more compact

Make dropdown standard html

* Add no-JS option

* Correction to no-JS list

* Make non-JS selection highlighted

* Add language-container to fw.css

* Correct translation readme

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/
Translation: Jamulus/Software-Manual

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/
Translation: Jamulus/Software-Manual

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/
Translation: Jamulus/Software-Manual

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Tips-Tricks-More
Translate-URL: https://hosted.weblate.org/projects/jamulus/tips-tricks-more/

* Rephrase sentence

Co-authored-by: Peter L Jones <[email protected]>

* Fix canonical/alternate links

* Fix canonical/alternate links

* Use class for figure

* Add class for home page img

* Better class name

Co-authored-by: ann0see <[email protected]>

* Better class name

Co-authored-by: ann0see <[email protected]>

* Removed lrelease and .qm files check-in from release process.

These steps no longer needed as .qm files are now compiled on the fly.

* AUTO: Updated .po files

* Update Release-Process.md

Co-authored-by: ann0see <[email protected]>

* Make current language non-selectable in non-JS mode

* Tidy up and fix non-selectable EN

* Update _includes/headtags.html

Co-authored-by: ann0see <[email protected]>

* Change po folders to new lang codes

* Bump rexml from 3.2.8 to 3.3.2

Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.2.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](ruby/rexml@v3.2.8...v3.3.2)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update dependencies

* Add connection setup and advanced setup screenshots

* Add connection setup and advanced setup screenshots in ES

* Mention connect via menu does not force disconnect

* Expand description of server list and say "directory"

* Add note about delete button

* Fix "My Profile" screenshot border

* AUTO: Updated .po files

* Fix syntax error

* Update dependencies

* AUTO: Add new language: sv: Svenska #999

* Revert "AUTO: Add new language: sv: Svenska #999"

This reverts commit 1eb8e58.

* AUTO: Add new language: sv-SE: Svenska #1022

* update-nl-images-for-3-11

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS

* Update Italian translation using Weblate

Currently translated at 100.0% (13 of 13 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/1-index/it/
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS
Translation: Jamulus/Startpage

* Update Dutch translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (31 of 31 strings)

Update Dutch translation using Weblate

Currently translated at 100.0% (16 of 16 strings)

Update Dutch translation using Weblate

Currently translated at 100.0% (27 of 27 strings)

Update Dutch translation using Weblate

Currently translated at 100.0% (12 of 12 strings)

Update Dutch translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Henk De Groot <[email protected]>
Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/nl/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/nl/
Translate-URL: https://hosted.weblate.org/projects/jamulus/server-bandwidth/nl/
Translate-URL: https://hosted.weblate.org/projects/jamulus/server-troubleshooting/nl/
Translate-URL: https://hosted.weblate.org/projects/jamulus/unregistered-servers/nl/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS
Translation: Jamulus/Running-a-Server
Translation: Jamulus/Server-Bandwidth
Translation: Jamulus/Server-Troubleshooting
Translation: Jamulus/Unregistered-Servers

* Update Spanish translation using Weblate

Currently translated at 100.0% (137 of 137 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: ignotus <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/es/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS
Translation: Jamulus/Software-Manual

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS

* Update Swedish translation using Weblate

Currently translated at 100.0% (16 of 16 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (27 of 27 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (12 of 12 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (31 of 31 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (56 of 56 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (137 of 137 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (137 of 137 strings)

Update Swedish translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: ann0see <[email protected]>
Co-authored-by: ignotus <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/client-troubleshooting/sv/
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/sv/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/sv/
Translate-URL: https://hosted.weblate.org/projects/jamulus/server-bandwidth/sv/
Translate-URL: https://hosted.weblate.org/projects/jamulus/server-troubleshooting/sv/
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/sv/
Translate-URL: https://hosted.weblate.org/projects/jamulus/unregistered-servers/sv/
Translation: Jamulus/Client-Troubleshooting
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS
Translation: Jamulus/Running-a-Server
Translation: Jamulus/Server-Bandwidth
Translation: Jamulus/Server-Troubleshooting
Translation: Jamulus/Software-Manual
Translation: Jamulus/Unregistered-Servers

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS

* Update Chinese (Simplified) translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/zh_Hans/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS
Translation: Jamulus/Running-a-Server

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-ios/
Translation: Jamulus/Directories
Translation: Jamulus/Installation-for-iOS

* Replace bundle id

* AUTO: Updated .po files

* Update German translation using Weblate

Currently translated at 100.0% (6 of 6 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/include-client-commands/de/
Translation: Jamulus/Include-Client-Commands

* Update Dutch translation using Weblate

Currently translated at 100.0% (49 of 49 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-linux/nl/
Translation: Jamulus/Installation-for-Linux

* Update Swedish translation using Weblate

Currently translated at 100.0% (159 of 159 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/sv/
Translation: Jamulus/Running-a-Server

* Update Portuguese (Portugal) translation using Weblate

Currently translated at 100.0% (13 of 13 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/1-index/pt_PT/
Translation: Jamulus/Startpage

* Identify canonical and alternate URLs (#1026)

Co-authored-by: ann0see <[email protected]>

* Update Gemfile version numbers

* Add closing / to standalone HTML tags, for po4a parser. (#1037)

The po4a XML parser seems to dislike standalone HTML tags such as <img> and <br>,
and this causes it to mis-parse tags that enclose them.

This commit changes <img> to <img/> and <br> to <br/>, which keeps the parser happy.

* AUTO: Updated .po files

* Fix for jekyll canonical URL construction (#1039)

* Add language directories in _data and wiki to .gitignore

Only en and en-no-translate are committed to Github

* Update download links on the website

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: John Dempsey <[email protected]>
Co-authored-by: ignotus <[email protected]>
Co-authored-by: Peter L Jones <[email protected]>
Co-authored-by: Weblate (bot) <[email protected]>
Co-authored-by: gallegonovato <[email protected]>
Co-authored-by: Olivier Humbert <[email protected]>
Co-authored-by: Julien Taverna <[email protected]>
Co-authored-by: Jonathan <[email protected]>
Co-authored-by: Gilgongo <[email protected]>
Co-authored-by: Tony Mountifield <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter L Jones <[email protected]>
Co-authored-by: Henk De Groot <[email protected]>
Co-authored-by: Henk De Groot <[email protected]>
Co-authored-by: ignotus <[email protected]>
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