Skip to content

Commit 08aa641

Browse files
Merge pull request #51285 from nextcloud/backport/51071/stable30
[stable30] fix(translation): Fix string concatenation in LDAP endpoint
2 parents 0bfb2ff + b9b9dc9 commit 08aa641

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

apps/encryption/templates/settings-personal.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<br />
2626
<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
2727
<?php if ($_["recoveryEnabledForUser"]):
28-
p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
28+
p(' ' . $l->t('If you do not remember your old password you can ask your administrator to recover your files.'));
2929
endif; ?>
3030
<br />
3131
<input

apps/files/src/views/FilesList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ export default defineComponent({
410410
if (this.isQuotaExceeded) {
411411
return t('files', 'Your have used your space quota and cannot upload files anymore')
412412
}
413-
return t('files', 'You don’t have permission to upload or create files here')
413+
return t('files', 'You do not have permission to upload or create files here')
414414
},
415415
416416
/**

apps/user_ldap/ajax/wizard.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@
9898
$setParameters = [];
9999
$configuration->setConfiguration($cfg, $setParameters);
100100
if (!in_array($key, $setParameters)) {
101-
\OC_JSON::error(['message' => $l->t($key.
102-
' Could not set configuration %s', $setParameters[0])]);
101+
\OC_JSON::error(['message' => $l->t('Could not set configuration %1$s to %2$s', [$key, $setParameters[0]])]);
103102
exit;
104103
}
105104
$configuration->saveConfiguration();

dist/files-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)