Merge pull request #51285 from nextcloud/backport/51071/stable30

[stable30] fix(translation): Fix string concatenation in LDAP endpoint
pull/51282/head
Andy Scherzinger 2025-03-05 20:49:35 +07:00 committed by GitHub
commit 08aa641883
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 7 deletions

@ -25,7 +25,7 @@ script('encryption', 'settings-personal');
<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

@ -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 dont have permission to upload or create files here')
return t('files', 'You do not have permission to upload or create files here')
},
/**

@ -98,8 +98,7 @@ switch ($action) {
$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();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long