Skip to content

Commit

Permalink
Merge pull request #51285 from nextcloud/backport/51071/stable30
Browse files Browse the repository at this point in the history
[stable30] fix(translation): Fix string concatenation in LDAP endpoint
  • Loading branch information
AndyScherzinger authored Mar 5, 2025
2 parents 0bfb2ff + b9b9dc9 commit 08aa641
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion apps/encryption/templates/settings-personal.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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 @@ -410,7 +410,7 @@ export default defineComponent({
if (this.isQuotaExceeded) {
return t('files', 'Your have used your space quota and cannot upload files anymore')
}
return t('files', 'You don’t have permission to upload or create files here')
return 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 @@ -98,8 +98,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]])]);
exit;
}
$configuration->saveConfiguration();
Expand Down
4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

0 comments on commit 08aa641

Please sign in to comment.