Skip to content

Conversation

@Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Nov 1, 2021

Improved appearance and repair of text strings.

Before change:

obraz

After change:

obraz

In Polish 😁:

obraz

Solves Issue: #324 and #232.


Before change:

obraz

After change:

obraz


Before change:

obraz

After change:

obraz


Before change:

obraz

After change:

obraz


Before change:

obraz

After change:

obraz


Before change:

obraz

After change:

obraz


Before change:

obraz

After change:

obraz

Signed-off-by: Valdnet [email protected]

@Valdnet Valdnet requested a review from Rello November 18, 2021 08:16
@Valdnet
Copy link
Contributor Author

Valdnet commented Nov 18, 2021

@nickvergessen @juliushaertl @kesselb @Rello I am asking everyone for approval. It would be nice to add changes to a future version of NC 23.

Comment on lines +59 to +60
<p><?php p($l->t('Operating System').':'); ?> <strong id="numFilesStorage"><?php p($_['osname']); ?></strong></p>
<p><?php p($l->t('CPU').':'); ?>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<p><?php p($l->t('Operating System').':'); ?> <strong id="numFilesStorage"><?php p($_['osname']); ?></strong></p>
<p><?php p($l->t('CPU').':'); ?>
<p><?php p($l->t('Operating System:')); ?> <strong id="numFilesStorage"><?php p($_['osname']); ?></strong></p>
<p><?php p($l->t('CPU:')); ?>

etc so french translators can add their space before the colon

@Valdnet
Copy link
Contributor Author

Valdnet commented Nov 18, 2021

Corrected. Please approve and merge 😉.

@Valdnet
Copy link
Contributor Author

Valdnet commented Nov 24, 2021

@nickvergessen @juliushaertl @kesselb @Rello I am asking everyone for approval 😉.

@nickvergessen nickvergessen removed their request for review November 24, 2021 10:37
Valdnet and others added 3 commits November 26, 2021 11:36
Signed-off-by: Valdnet <[email protected]>

Co-authored-by: Thomas Citharel <[email protected]>
@Valdnet
Copy link
Contributor Author

Valdnet commented Nov 27, 2021

@tcitworld Thanks for checking. I added a condition for "SWAP". Please approval 😉.

@Valdnet Valdnet requested a review from tcitworld November 27, 2021 07:19
@Valdnet Valdnet self-assigned this Nov 28, 2021
@Valdnet Valdnet added the bug label Nov 28, 2021
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks much better design-wise, nice detail fixes! :)

@Valdnet
Copy link
Contributor Author

Valdnet commented Nov 30, 2021

Thanks 😉.

@Valdnet Valdnet merged commit 2d654b7 into master Nov 30, 2021
@delete-merged-branch delete-merged-branch bot deleted the Valdnet-patch-1 branch November 30, 2021 14:53
@nextcloud nextcloud deleted a comment from backportbot-nextcloud bot Dec 1, 2021
@Valdnet
Copy link
Contributor Author

Valdnet commented Dec 1, 2021

@nickvergessen Please do a manual backport for NC 22, 21 and 20. Bot won't do this 😬.

And is it still possible to attach the changes to NC23?

@nickvergessen
Copy link
Member

I won't do that. Not my area.

@Valdnet
Copy link
Contributor Author

Valdnet commented Dec 1, 2021

@juliushaertl Please do a manual backport for NC 22, 21 and 20. Bot won't do this 😬.

And is it still possible to attach the changes to NC23?

N4IR0 pushed a commit to hetzneronline/serverinfo that referenced this pull request Feb 10, 2022
Improved appearance and repair of text strings.

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139727055-e05263a1-7f60-4ddb-bd3c-9ad44828874c.png)

_After change:_

![obraz](https://user-images.githubusercontent.com/47037905/139806654-cd150768-60a4-42f5-80f6-b65e11dadc0c.png)

_In Polish 😁:_

![obraz](https://user-images.githubusercontent.com/47037905/139806684-f1eb6f30-0546-4c96-b7d4-4ed7e59b492d.png)

Solves Issue:  nextcloud#324 and nextcloud#232.

---

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139807160-a4df3351-e411-4a87-bda6-7d8f5f5d3fcc.png)

_After change:_

![obraz](https://user-images.githubusercontent.com/47037905/139807192-0817b755-7a14-4950-9a6c-e1b45124b76a.png)

---

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139727225-367be295-d843-4a99-be3e-801ae9472903.png)

_After change_:

![obraz](https://user-images.githubusercontent.com/47037905/139727261-b964cd42-b59c-41ca-828b-5760524109c6.png)

---

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139727293-a3ee4e16-5d96-4f42-ba40-1d19540da605.png)

_After change:_

![obraz](https://user-images.githubusercontent.com/47037905/139816641-3f74ff91-28ce-4f7f-b07c-a22ff6f545d9.png)

---

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139727341-e783bf1f-abcf-4388-9471-830b75aae973.png)

_After change:_

![obraz](https://user-images.githubusercontent.com/47037905/139727370-5d619ce9-e932-4250-8e70-a788fff8ae79.png)

---

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139727403-85a59cd9-7e56-46b9-ab05-c216d883d4ff.png)

_After change:_

![obraz](https://user-images.githubusercontent.com/47037905/143671623-48299c9a-0028-4f80-9d38-8d59b57ac544.png)

---

_Before change:_

![obraz](https://user-images.githubusercontent.com/47037905/139824967-31c59afd-c87c-4102-b9fe-cb8de91dff0b.png)

_After change:_

![obraz](https://user-images.githubusercontent.com/47037905/139825560-a29aa21a-37b6-45ef-8668-595c3cf5c0e5.png)

Signed-off-by: Valdnet <[email protected]>
Comment on lines -307 to +297
<?php p($l->t('Type:')); ?>
<?php p($l->t('Type').':'); ?>
Copy link
Contributor

Choose a reason for hiding this comment

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

The colon should always be part of the translated string, as it may be changed by the translation.
For instance in French a (small nonbreakable) space is expected before a double punctuation like a colon.

Copy link
Contributor Author

@Valdnet Valdnet Apr 26, 2022

Choose a reason for hiding this comment

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

Yes, you are absolutely right 👍, but in this case an exception is made, because using a colon in this PHP code with an entire text string means that the entire text string in the application is not displayed 😬. This was one of the problems that this change arose. I haven't found any other sensible solution to this problem, which doesn't mean it needs to be corrected.
I would like to ask developers who know more about PHP programming to look at this code, and maybe they will find a solution, and will be happy to implement it, so that French translators can correctly translate these text strings.

@nickvergessen could you have a look at it and advise us something?

@come-nc Unless you know the solution to this problem?

Copy link
Member

Choose a reason for hiding this comment

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

I already mentioned it here that this is necessary: https://github.com/nextcloud/serverinfo/pull/333/files#r752009811

Copy link
Member

Choose a reason for hiding this comment

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

Lemme checkout the branch and move it in, to see what breaks but it makes no sense to break

Copy link
Contributor Author

@Valdnet Valdnet Apr 26, 2022

Choose a reason for hiding this comment

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

I already mentioned it here that this is necessary: https://github.com/nextcloud/serverinfo/pull/333/files#r752009811

@nickvergessen Yes, I know this and I remember it, but after using a colon text string, I do not know why, but this text string is not displayed at all. This was a problem before. Cannot use a colon in a text string in PHP?

Copy link
Member

Choose a reason for hiding this comment

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants