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

Make <img> in 1-Index-html translatable #1025

Closed
wants to merge 116 commits into from

Conversation

ignotus666
Copy link
Contributor

@ignotus666 ignotus666 commented Aug 16, 2024

Short description of changes
This adds an option to the po4a script to make the content of the <img> tag translatable - it was being skipped by po4a and made it impossible to show localised screenshots of the main mixer window on the homepage. It also makes it possible to easily add an arbitrary number of options in future if needed.

I made a small change to the EN version of 1-Index.md to trigger an update of the .po files. I think the change was necessary anyway as not everyone might have 5 users in their screenshot.

Context: Fixes an issue? Related issues
This problem was pointed out by @henkdegroot on Discord.

Status of this Pull Request
Tested and working

What is missing until this pull request can be merged?
Any Weblate PRs have to be merged first.

Does this need translation?

YES.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I'm sure that this Pull Request goes to the correct branch

github-actions bot and others added 30 commits September 3, 2023 20:45
* newlines help with copy-paste

* use tabs rather than 4 spaces

* three tics for copy button

* preferred markdown
* Change jamulus-server to jamulus-headless

* Fix grammar

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

---------

Co-authored-by: John Dempsey <[email protected]>
* 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]>
* 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]>
* 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>
Co-authored-by: Peter L Jones <[email protected]>
* 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>
weblate and others added 21 commits August 30, 2024 21:14
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
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
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
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
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
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
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
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
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
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
…1-index

Translations update from Hosted Weblate
…angeBundleId

Change bundle ID to app.jamulussoftware.*
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
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
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
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
@@ -29,7 +29,7 @@ Jamulus lets you play, rehearse, or jam with your friends, your band, or anyone
<div class="fx-col-100-xs">
<figure class="mainbannerfig">
<a href="wiki/Getting-Started">
<img src="{% include img/en-screenshots/main-screen-medium.inc %}" style="border: 5px solid grey;" id="jamulusbanner" loading="lazy" alt="A screenshot of the main mixer window showing five people from different countries connected.">
<img src="{% include img/en-screenshots/main-screen-medium.inc %}" style="border: 5px solid grey;" id="jamulusbanner" loading="lazy" alt="A screenshot of the main mixer window showing five people from different countries connected.">
Copy link
Member

Choose a reason for hiding this comment

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

This file needs rebasing due to the change in #1037. That should fix the conflict reported by GH below.

@ann0see
Copy link
Member

ann0see commented Sep 30, 2024

@ignotus666 please open a new PR with your changes...

@ignotus666
Copy link
Contributor Author

Yes, will do.

@ignotus666 ignotus666 closed this Sep 30, 2024
@ignotus666 ignotus666 deleted the img-trans branch September 30, 2024 20:45
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.

9 participants