Skip to content

Minor adjustments to a couple of text strings#493

Merged
Olf0 merged 18 commits intosailfishos-patches:masterfrom
tuplasuhveli:master
May 11, 2025
Merged

Minor adjustments to a couple of text strings#493
Olf0 merged 18 commits intosailfishos-patches:masterfrom
tuplasuhveli:master

Conversation

@tuplasuhveli
Copy link
Copy Markdown
Contributor

I have made changes according to the earlier discussion, see it here: #157 (comment)

Summarum:

  1. "Patch details" -> "Details"
  2. "Openrepos" -> "OpenRepos"
  3. "Sources" -> "Source code"
  4. "May conflict with:" -> "May conflict with the following Patches:"

@Olf0
Copy link
Copy Markdown
Contributor

Olf0 commented Mar 2, 2025

3. "Sources" -> "Source code"

Now that i am seeing these changes in context, I believe there are two different occurrences of this:

  • Places at which the stand-alone word "Sources" was used: AFAICS in all cases "Source code repository" is meant, correct?
  • Places which reference the "Sources and Issue Tracker" (AFAICS only once in the AboutPage.qml): Here I think this phrase fits well which I once developed for the SailfishOS:Chum GUI app's AboutPage: "Issue tracker for bug reports, feature suggestions and help requests"
    I.e. combined:
    Source code repository and issue tracker for bug reports, feature suggestions and help requests on GitHub
    You may have to insert additional line breaks for it to look right (this is QML-code, alter it on your device, reopen the corresponding app page and observe the visible changes), e.g.:
    "Source code repository and issue<br />tracker for bug reports, feature<br />suggestions and help requests<br /><a href=\"%1\">on GitHub</a>"
    Though in theory one should simply switch on automatic word wrap (= line breaks) in Qt and let Qt perform the line breaking. You may try replacing the <br />s by space characters and see if Qt does better on its own.

What do you think?


P.S.:
If you have checked out ("cloned") this git-branch locally and QT Linguist installed, I would be very glad if you run an lupdate src -ts translations/settings-patchmanager.ts in the root directory of the cloned repository) and push the changes back to this branch (here tuplasuhveli:master rsp. in git command line notation from the perspective of your local machine likely origin master). Reason: This translation is not "ID-based" (unfortunately) and the source code file line numbers referenced in the TS-files have become wildly off over time; luckily this does not seem to matter yet (i.e. no ambiguities introduced yet, which are unresolvable for Qt), but this may break with any new string change.

If you have no idea what I am talking about or simply do not know how to create and handle a local clone of this git-branch, please just mention that here and I will try to take care about this … some day (no idea when I may have time for this).

@Olf0 Olf0 self-requested a review March 2, 2025 18:43
@tuplasuhveli
Copy link
Copy Markdown
Contributor Author

tuplasuhveli commented Mar 3, 2025

  • Places at which the stand-alone word "Sources" was used: AFAICS in all cases "Source code repository" is meant, correct?

Correct! I didn't think of including the word "repository", but I don't mind adding it.

  • Source code repository and issue tracker for bug reports, feature suggestions and help requests on GitHub

That would be a good way to put it, although aesthetically I would prefer a string that fits in one line, like all the other "small titles" on the About page. I'll let you decide the way forward on this one.

I can take a look at the formatting. Note, that I'm using (dumol/PixelPerfect#10) font setup, so things might look a bit different on my phone.

Reason: This translation is not "ID-based" (unfortunately) and the source code file line numbers referenced in the TS-files have become wildly off over time

Ah, I noticed this and wondered, what it could be about. Good to know for future projects as well!

If you have no idea what I am talking about or simply do not know how to create and handle a local clone of this git-branch

I've never done this before, but I've read about lupdate and I have QT Linguist installed, so I could give this a try tomorrow. I'll let you know, if I can't handle the task by myself. After all, I don't mind learning new things :--)

@Olf0
Copy link
Copy Markdown
Contributor

Olf0 commented Mar 4, 2025

  • Places at which the stand-alone word "Sources" was used: AFAICS in all cases "Source code repository" is meant, correct?

Correct! I didn't think of including the word "repository", but I don't mind adding it.

Please do.

  • Source code repository and issue tracker for bug reports, feature suggestions and help requests on GitHub

That would be a good way to put it, although aesthetically I would prefer a string that fits in one line, like all the other "small titles" on the About page.

It is already covering two lines, I added just another explicit line break, because I did not have the time to test if it is rendered correctly (which always is just exemplary, anyway) and wanted to be on the safe side.

I can take a look at the formatting. Note, that I'm using (dumol/PixelPerfect#10) font setup, so things might look a bit different on my phone.

This (here) is only about text flow, i.e. when lines are broken where and how they are aligned (left, right, centred etc.). Yes, they might be rendered slightly differently arranged depending on screen-resolution and -size, fonts used, margins of all kinds etc. (when not using explicit, fixed locations for line breaks), but the basic text flow stays the same.
For documentation, see https://doc.qt.io/qt-5/qml-qtquick-text.html#wrapMode-prop

If you have no idea what I am talking about or simply do not know how to create and handle a local clone of this git-branch

I've never done this before, but I've read about lupdate and I have QT Linguist installed, so I could give this a try tomorrow. I'll let you know, if I can't handle the task by myself. After all, I don't mind learning new things :--)

👍 ❤️

Then wait with manually updating the source TS file with altered strings from the source code files, because that is what lupdate does for you.

@Olf0
Copy link
Copy Markdown
Contributor

Olf0 commented Apr 16, 2025

@tuplasuhveli, I remembered this and hence wondered, if triggering you to finish this is helpful?

@Olf0 Olf0 self-assigned this Apr 16, 2025
@Olf0
Copy link
Copy Markdown
Contributor

Olf0 commented Apr 30, 2025

Oh, I missed to ask @tuplasuhveli, have I left tasks open which block this, or are there tasks for which I may support you (e.g. to run lupdate and push the resulting changes, when you are ready with all the strings)?

@Olf0 Olf0 marked this pull request as draft May 10, 2025 20:30
Olf0 added 8 commits May 10, 2025 22:37
… "Source code repository and issue tracker for bug reports, feature suggestions and help requests", see for details: sailfishos-patches#493 (comment)
…le …

… in order to let `lupdate` run without complaints.
… `/usr/lib64/qt5/bin/lupdate src/ -ts translations/settings-patchmanager.ts`
…uting …

… `/usr/lib64/qt5/bin/lupdate src/ -ts translations/settings-patchmanager.ts` once more.
@Olf0 Olf0 marked this pull request as ready for review May 11, 2025 20:43
Copy link
Copy Markdown
Contributor

@Olf0 Olf0 left a comment

Choose a reason for hiding this comment

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

LGTM, now.

@Olf0 Olf0 merged commit 3986ea7 into sailfishos-patches:master May 11, 2025
1 check passed
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.

2 participants