English (somewhat incomplete)

This commit is contained in:
Alexey Milovidov 2024-02-09 00:30:29 +01:00
parent 1b91b7b999
commit a585ae60a8

View File

@ -713,7 +713,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
{
fmt::print("Users config file {} already exists, will keep it and extract users info from it.\n", users_config_file.string());
/// Check if password for default user already specified.
/// Check if password for the default user already specified.
ConfigProcessor processor(users_config_file.string(), /* throw_on_bad_incl = */ false, /* log_to_console = */ false);
ConfigurationPtr configuration(new Poco::Util::XMLConfiguration(processor.processConfig()));
@ -805,12 +805,12 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
/// Set up password for default user.
if (has_password_for_default_user)
{
fmt::print("{}Password for default user is already specified. To remind or reset, see {} and {}.{}\n",
fmt::print("{}Password for the default user is already specified. To remind or reset, see {} and {}.{}\n",
start_hilite, users_config_file.string(), users_d.string(), end_hilite);
}
else if (!can_ask_password)
{
fmt::print("{}Password for default user is empty string. See {} and {} to change it.{}\n",
fmt::print("{}Password for the default user is an empty string. See {} and {} to change it.{}\n",
start_hilite, users_config_file.string(), users_d.string(), end_hilite);
}
else
@ -820,7 +820,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
char buf[1000] = {};
std::string password;
if (auto * result = readpassphrase("Enter password for default user: ", buf, sizeof(buf), 0))
if (auto * result = readpassphrase("Enter password for the default user: ", buf, sizeof(buf), 0))
password = result;
if (!password.empty())
@ -845,7 +845,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
"</clickhouse>\n";
out.sync();
out.finalize();
fmt::print("{}Password for default user is saved in file {}.{}\n", start_hilite, password_file, end_hilite);
fmt::print("{}Password for the default user is saved in file {}.{}\n", start_hilite, password_file, end_hilite);
#else
out << "<clickhouse>\n"
" <users>\n"
@ -856,12 +856,12 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
"</clickhouse>\n";
out.sync();
out.finalize();
fmt::print("{}Password for default user is saved in plaintext in file {}.{}\n", start_hilite, password_file, end_hilite);
fmt::print("{}Password for the default user is saved in plaintext in file {}.{}\n", start_hilite, password_file, end_hilite);
#endif
has_password_for_default_user = true;
}
else
fmt::print("{}Password for default user is empty string. See {} and {} to change it.{}\n",
fmt::print("{}Password for the default user is an empty string. See {} and {} to change it.{}\n",
start_hilite, users_config_file.string(), users_d.string(), end_hilite);
}