Skip to content

Fix appearance and some bugs #333

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.

Sign up for GitHub

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

Merged
Valdnet merged 16 commits into from
Nov 30, 2021
Merged

Fix appearance and some bugs #333

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9147f0c
Fix "settings-admin.php"
Valdnet Nov 1, 2021
a6e8c56
Fix style.scss
Valdnet Nov 1, 2021
a7f2330
Fix "script.js"
Valdnet Nov 1, 2021
81349f3
Fix memory display
Valdnet Nov 1, 2021
8b3ac99
Fix display of "Unknown Processor"
Valdnet Nov 1, 2021
8ea3dfd
Add information about an unknown processor
Valdnet Nov 2, 2021
ab51c27
Change case of letter
Valdnet Nov 2, 2021
0bd9f4b
Correct code
Valdnet Nov 2, 2021
d996b3d
l10n: Change size of letters
Valdnet Nov 2, 2021
aa37606
Improve appearance in "External monitoring tool"
Valdnet Nov 2, 2021
5b01894
Improve appearance in "External monitoring tool"
Valdnet Nov 2, 2021
3084c2f
Concatenate a colon with a text string
Valdnet Nov 18, 2021
d1da34a
Add an argument
Valdnet Nov 26, 2021
31deaa8
Added condition for "SWAP"
Valdnet Nov 27, 2021
fbb6c29
Fall back from exporting colons from text string
Valdnet Nov 27, 2021
25f7dcc
l10n: Change "Mails" to "Emails"
Valdnet Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fall back from exporting colons from text string 
Signed-off-by: Valdnet <[email protected]>
  • Loading branch information
@Valdnet
Valdnet authored Nov 27, 2021
commit fbb6c29dc3c42b41b7507a781039cd34332fd0ac
36 changes: 18 additions & 18 deletions templates/settings-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ function FormatMegabytes(int $byte): string {
</h2>
</div>
<div class="col col-12">
<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').':'); ?>
Comment on lines +59 to +60
Copy link
Member

@nickvergessen nickvergessen Nov 18, 2021

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

<?php if ($_['cpu'] !== 'Unknown Processor'): ?>
<strong id="numFilesStorage"><?php p($_['cpu']) ?></strong></p>
<?php else: ?>
<strong id="numFilesStorage"><?php p($l->t('Unknown Processor')) ?></strong></p>
<?php endif; ?>
<p><?php p($l->t('Memory:')); ?>
<p><?php p($l->t('Memory').':'); ?>
<?php if ($memory->getMemTotal() > 0): ?> <strong id="numFilesStorage"><?php p(FormatMegabytes($memory->getMemTotal())) ?></strong></p>
<?php endif; ?>
<p><?php p($l->t('Server time:')); ?> <strong id="numFilesStorage"><span class="info" id="servertime"></span></strong></p>
<p><?php p($l->t('Uptime:')); ?> <strong id="numFilesStorage"><span class="info" id="uptime"></span></strong></p>
<p><?php p($l->t('Server time').':'); ?> <strong id="numFilesStorage"><span class="info" id="servertime"></span></strong></p>
<p><?php p($l->t('Uptime').':'); ?> <strong id="numFilesStorage"><span class="info" id="uptime"></span></strong></p>
</div>
</div>
</div>
Expand Down Expand Up @@ -142,10 +142,10 @@ function FormatMegabytes(int $byte): string {
<?php p($l->t('You will get a notification once one of your disks is nearly full.')); ?>
</div>

<p><?php p($l->t('Files:')); ?> <strong id="numFilesStorage"><?php p($_['storage']['num_files']); ?></strong></p>
<p><?php p($l->t('Storages:')); ?> <strong id="numFilesStorages"><?php p($_['storage']['num_storages']); ?></strong></p>
<p><?php p($l->t('Files').':'); ?> <strong id="numFilesStorage"><?php p($_['storage']['num_files']); ?></strong></p>
<p><?php p($l->t('Storages').':'); ?> <strong id="numFilesStorages"><?php p($_['storage']['num_storages']); ?></strong></p>
<?php if ($_['system']['freespace'] !== null): ?>
<p><?php p($l->t('Free Space:')); ?> <strong id="systemDiskFreeSpace"><?php p($_['system']['freespace']); ?></strong></p>
<p><?php p($l->t('Free Space').':'); ?> <strong id="systemDiskFreeSpace"><?php p($_['system']['freespace']); ?></strong></p>
<?php endif; ?>
</div>

Expand Down Expand Up @@ -224,7 +224,7 @@ class="barchart"
></canvas>
</div>
<p>
<?php p($l->t('Total users:')); ?>
<?php p($l->t('Total users').':'); ?>
<em id="numUsersStorage"><?php p($_['storage']['num_users']); ?></em>
</p>
</div>
Expand Down Expand Up @@ -266,19 +266,19 @@ class="barchart"
<div class="infobox">
<div class="phpinfo-wrapper">
<p>
<?php p($l->t('Version:')); ?>
<?php p($l->t('Version').':'); ?>
<em id="phpVersion"><?php p($_['php']['version']); ?></em>
</p>
<p>
<?php p($l->t('Memory limit:')); ?>
<?php p($l->t('Memory limit').':'); ?>
<em id="phpMemLimit"><?php p($_['php']['memory_limit']); ?></em>
</p>
<p>
<?php p($l->t('Max execution time:')); ?>
<?php p($l->t('Max execution time').':'); ?>
<em id="phpMaxExecTime"><?php p($_['php']['max_execution_time']); ?></em>
</p>
<p>
<?php p($l->t('Upload max size:')); ?>
<?php p($l->t('Upload max size').':'); ?>
<em id="phpUploadMaxSize"><?php p($_['php']['upload_max_filesize']); ?></em>
</p>
</div>
Expand All @@ -294,15 +294,15 @@ class="barchart"
<div class="infobox">
<div class="database-wrapper">
<p>
<?php p($l->t('Type:')); ?>
<?php p($l->t('Type').':'); ?>
Comment on lines -307 to +297
Copy link
Contributor

@come-nc come-nc Apr 26, 2022

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 •
edited
Loading

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

@nickvergessen nickvergessen 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

Copy link
Member

@nickvergessen nickvergessen Apr 26, 2022

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 •
edited
Loading

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

@nickvergessen nickvergessen Apr 26, 2022

Choose a reason for hiding this comment

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

Fix nextcloud/server#32155

<em id="databaseType"><?php p($_['database']['type']); ?></em>
</p>
<p>
<?php p($l->t('Version:')); ?>
<?php p($l->t('Version').':'); ?>
<em id="databaseVersion"><?php p($_['database']['version']); ?></em>
</p>
<p>
<?php p($l->t('Size:')); ?>
<?php p($l->t('Size').':'); ?>
<em id="databaseSize"><?php p($_['database']['size']); ?></em>
</p>
</div>
Expand All @@ -318,7 +318,7 @@ class="barchart"
<!-- OCS ENDPOINT -->
<h2><?php p($l->t('External monitoring tool')); ?></h2>
<p>
<?php p($l->t('You can connect an external monitoring tool by using this end point:')); ?>
<?php p($l->t('You can connect an external monitoring tool by using this end point').':'); ?>
</p>
<div class="monitoring-wrapper">
<input type="text" readonly="readonly" id="monitoring-endpoint-url" value="<?php echo p($_['ocs']); ?>"/>
Expand All @@ -328,7 +328,7 @@ class="barchart"
<?php p($l->t('Appending "?format=json" at the end of the URL gives you the result in JSON.')); ?>
</p>
<p>
<?php p($l->t('To use an access token please generate one then set it using the following command:')); ?>
<?php p($l->t('To use an access token please generate one then set it using the following command').':'); ?>
<div><i>occ config:app:set serverinfo token --value yourtoken</i></div>
</p>
<p>
Expand Down