-
Notifications
You must be signed in to change notification settings - Fork 84
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
Identify canonical and alternate URLs #1026
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really know enough so I'll defer to those who do.
@ignotus666 Just checking: nothing in the po4a scripts is affected by this, I take it? |
No, I shouldn't think so - if you can build and view the website offline and it works, then the po4a stuff should be fine. |
Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pljones Do you think we need to add anything else concerning the plug in?
Thanks |
Are we OK to merge? |
I don't think it's right... https://github.com/jamulussoftware/jamuluswebsite/actions/runs/10696055730
http://jamuluswebsite.drealm.info/sv-SE/wiki/Installation-for-Linux
I should have spotted that earlier, sorry! |
I think we can get rid of IE compatibility. Nobody should be using it anymore now. |
* 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 <1750243+mcfnord@users.noreply.github.com> --------- Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> * 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 <pljones@users.noreply.github.com> * Remove unneeded check --------- Co-authored-by: Peter L Jones <pljones@users.noreply.github.com> * 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 <fran-carro@hotmail.es> 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 <hosted@weblate.org> Co-authored-by: Olivier Humbert <trebmuh@tuxfamily.org> 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 <fran-carro@hotmail.es> Co-authored-by: Olivier Humbert <trebmuh@tuxfamily.org> * 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 <pljones@users.noreply.github.com> * Remove unneeded check * AUTO: Updated .po files --------- Co-authored-by: Peter L Jones <pljones@users.noreply.github.com> 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 <pljones@users.noreply.github.com> * 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 <gilgongo@phreak.co.uk> 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 <hosted@weblate.org> 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 <hosted@weblate.org> 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 <hosted@weblate.org> 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 <pljones@users.noreply.github.com> * 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 <20726856+ann0see@users.noreply.github.com> * Better class name Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> * 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 <20726856+ann0see@users.noreply.github.com> * Make current language non-selectable in non-JS mode * Tidy up and fix non-selectable EN * Update _includes/headtags.html Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> * 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] <support@github.com> * 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 <hosted@weblate.org> 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 <hosted@weblate.org> 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 <hosted@weblate.org> Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> 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 <weblate@hdegroot.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> 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 <hosted@weblate.org> Co-authored-by: ignotus <ignotus666@users.noreply.hosted.weblate.org> 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 <hosted@weblate.org> 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 <hosted@weblate.org> Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> Co-authored-by: ignotus <ignotus666@users.noreply.hosted.weblate.org> 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 <hosted@weblate.org> 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 <hosted@weblate.org> 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 <hosted@weblate.org> Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com> 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 <hosted@weblate.org> 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 <20726856+ann0see@users.noreply.github.com> 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 <20726856+ann0see@users.noreply.github.com> 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 <20726856+ann0see@users.noreply.github.com> 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 <20726856+ann0see@users.noreply.github.com> 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 <20726856+ann0see@users.noreply.github.com> * 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] <support@github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> Co-authored-by: ignotus <darylo1@hotmail.com> Co-authored-by: Peter L Jones <pljones@users.noreply.github.com> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: gallegonovato <fran-carro@hotmail.es> Co-authored-by: Olivier Humbert <trebmuh@tuxfamily.org> Co-authored-by: Julien Taverna <jujudusud@gmail.com> Co-authored-by: Jonathan <4561747+gilgongo@users.noreply.github.com> Co-authored-by: Gilgongo <gilgongo@phreak.co.uk> Co-authored-by: Tony Mountifield <tony@mountifield.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter L Jones <peter.l.jones.dymlyd@gmail.com> Co-authored-by: Henk De Groot <13550012+henkdegroot@users.noreply.github.com> Co-authored-by: Henk De Groot <weblate@hdegroot.com> Co-authored-by: ignotus <ignotus666@users.noreply.hosted.weblate.org>
(The Google docs on this are confusing because they also address things that don't apply to us, so I hope I have the following right!)
Short description of changes
We regard the English version of a page as always being the canonical version. So no other languages should be marked as canonical URLs to content that also exits in English. Alternate URLs are other language versions of the English content.
Context
This should fix an issue which (I think!) Google has when one or more URLs have similar content. For example, if https://jamulus/[lang]/wiki/Installation-for-Linux is partially translated, we need to tell Google that it should regard https://jamulus/wiki/Installation-for-Linux as the canonical version. NOTE: It's possible that this problem was a symptom of us not having correct
hreflang
codes, but using theserel
tags seems to be best practice in our case.Removed a "rel=canonical" tag from the index pages because we should not put that outside of the HTML head.
Also removed the
x-default-hreflang
, as we don't have a language-switching page.Does this need translation?
May need to update the language index pages? Otherwise no?
Checklist