Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion apps/encryption/templates/settings-personal.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<br />
<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
<?php if ($_["recoveryEnabledForUser"]):
p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
p(' ' . $l->t('If you do not remember your old password you can ask your administrator to recover your files.'));
endif; ?>
<br />
<input
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/views/FilesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ export default defineComponent({
if (this.isQuotaExceeded) {
return this.t('files', 'Your have used your space quota and cannot upload files anymore')
}
return this.t('files', 'You don’t have permission to upload or create files here')
return this.t('files', 'You do not have permission to upload or create files here')
},

/**
Expand Down
3 changes: 1 addition & 2 deletions apps/user_ldap/ajax/wizard.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@
$setParameters = [];
$configuration->setConfiguration($cfg, $setParameters);
if (!in_array($key, $setParameters)) {
\OC_JSON::error(['message' => $l->t($key.
' Could not set configuration %s', $setParameters[0])]);
\OC_JSON::error(['message' => $l->t('Could not set configuration %1$s to %2$s', [$key, $setParameters[0]])]);

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OC_JSON::error has been marked as deprecated

Check notice

Code scanning / Psalm

PossiblyNullArrayAccess Note

Cannot access array value on possibly null variable $setParameters of type array<array-key, mixed>|null
exit;
}
$configuration->saveConfiguration();
Expand Down