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

l10n: Correct error messages
nextcloud · Sep 16, 2022 · 93e2995 · 93e2995
2 parents c2ec388 + fa6c514
commit 93e2995
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/apps/settings/src/components/PersonalInfo/DetailsSection.vue b/apps/settings/src/components/PersonalInfo/DetailsSection.vue
@@ -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 },
 			)
 		}

diff --git a/dist/settings-vue-settings-personal-info.js b/dist/settings-vue-settings-personal-info.js
diff --git a/dist/settings-vue-settings-personal-info.js.map b/dist/settings-vue-settings-personal-info.js.map
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
@@ -69,14 +69,14 @@ public function __construct(IL10N $trans, SystemConfig $config, LoggerInterface
 	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;
 	}

diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php
@@ -53,11 +53,11 @@ public function initialize($config) {
 	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;
 	}