upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-06 07:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Merge pull request #34108 from nextcloud/Valdnet-patch-3

Browse source 
l10n: Correct error messages
This commit is contained in:
Joas Schilling 2022-09-16 11:40:22 +02:00 committed by GitHub
commit 93e2995599
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/settings/src/components/PersonalInfo/DetailsSection.vue
View file

@ -76,7 +76,7 @@ export default {
}
return t(
'settings',
'You are using <strong>{usage}</strong> of <strong>{totalSpace}</strong> (<strong>{usageRelative} %</strong>)',
'You are using <strong>{usage}</strong> of <strong>{totalSpace}</strong> (<strong>{usageRelative}%</strong>)',
{ usage, totalSpace, usageRelative },
)
}

4
dist/settings-vue-settings-personal-info.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-personal-info.js.map vendored
View file

File diff suppressed because one or more lines are too long

8
lib/private/Setup/AbstractDatabase.php
View file

@ -69,14 +69,14 @@ abstract class AbstractDatabase {
public function validate($config) {
$errors = [];
if (empty($config['dbuser']) && empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
$errors[] = $this->trans->t("Enter the database username and name for %s", [$this->dbprettyname]);
} elseif (empty($config['dbuser'])) {
$errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
$errors[] = $this->trans->t("Enter the database username for %s", [$this->dbprettyname]);
} elseif (empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
$errors[] = $this->trans->t("Enter the database name for %s", [$this->dbprettyname]);
}
if (substr_count($config['dbname'], '.') >= 1) {
$errors[] = $this->trans->t("%s you may not use dots in the database name", [$this->dbprettyname]);
$errors[] = $this->trans->t("You cannot use dots in the database name %s", [$this->dbprettyname]);
}
return $errors;
}

6
lib/private/Setup/OCI.php
View file

@ -53,11 +53,11 @@ class OCI extends AbstractDatabase {
public function validate($config) {
$errors = [];
if (empty($config['dbuser']) && empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
$errors[] = $this->trans->t("Enter the database username and name for %s", [$this->dbprettyname]);
} elseif (empty($config['dbuser'])) {
$errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
$errors[] = $this->trans->t("Enter the database username for %s", [$this->dbprettyname]);
} elseif (empty($config['dbname'])) {
$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
$errors[] = $this->trans->t("Enter the database name for %s", [$this->dbprettyname]);
}
return $errors;
}