Skip to content

Comments

Fix bad embedded quotes in strings.#989

Merged
ann0see merged 4 commits intojamulussoftware:masterfrom
softins:fix-bad-quoting
Feb 14, 2021
Merged

Fix bad embedded quotes in strings.#989
ann0see merged 4 commits intojamulussoftware:masterfrom
softins:fix-bad-quoting

Conversation

@softins
Copy link
Member

@softins softins commented Feb 13, 2021

Embedded quotes were included in strings by doubling them: ""
This doesn't work in C++, so changed to \"

Embedded quotes were included in strings by doubling them: `""`
This doesn't work in C++, so changed to `\"`
@softins softins requested review from ann0see and pljones February 13, 2021 13:30
Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

From my first impression, everything seems to be ok.

// prepare update check info label (invisible by default)
lblUpdateCheck->setText ( "<font color=""red""><b>" + QString ( APP_NAME ) + " " +
lblUpdateCheck->setText ( "<font color=\"red\"><b>" + QString ( APP_NAME ) + " " +
tr ( "software upgrade available" ) + "</b></font>" );
Copy link
Member

Choose a reason for hiding this comment

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

Probably worth another issue, but I think, this should be changed to something like "software upgrade available. Install the new version from the website."

@ann0see ann0see self-requested a review February 13, 2021 15:18
@ann0see ann0see requested a review from pljones February 14, 2021 10:03
@ann0see ann0see added this to the Release 3.7.0 milestone Feb 14, 2021
Copy link
Collaborator

@pljones pljones left a comment

Choose a reason for hiding this comment

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

I'm assuming there's a reason the .qm files are there.

@ann0see
Copy link
Member

ann0see commented Feb 14, 2021

I'm assuming there's a reason the .qm files are there.

Yes: see: #989 (comment)

Once we do a new release, these files will probably need to be recreated. I saw that in the debian repo, some improvements have been made to this: https://sources.debian.org/patches/jamulus/3.6.2+dfsg1-2/use-lrelease.diff/

I will merge this now.

@ann0see ann0see merged commit 5971438 into jamulussoftware:master Feb 14, 2021
@softins
Copy link
Member Author

softins commented Feb 14, 2021

I'm assuming there's a reason the .qm files are there.

The .qm files are generated from the .ts files, but there are no Makefile rules to do that (not sure why not) - it's a manual process by running lrelease *.ts, and the make process assumes the .qm files are already in place and up to date. Since the repo already contained the .qm files, I made sure they were updated and checked back in. That will need to happen again when we have the translations updated for the next release.

@softins softins deleted the fix-bad-quoting branch February 14, 2021 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Triage

Development

Successfully merging this pull request may close these issues.

4 participants