diff --git a/src/config.cpp b/src/config.cpp index 0b0a523378b3c8df77251c265a3f8fea42204fa1..b72caa862eee6477e2f67030412c3964e606b159 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -82,10 +82,10 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description ("identity.type", value()->default_value(""), "Type of transport ('icq','msn','gg','irc', ...)") ("registration.enable_public_registration", value()->default_value(true), "True if users should be able to register.") ("registration.language", value()->default_value("en"), "Default language for registration form") - ("registration.instructions", value()->default_value(""), "Instructions showed to user in registration form") - ("registration.username_field", value()->default_value(""), "Label for username field") + ("registration.instructions", value()->default_value("Enter your legacy network username and password."), "Instructions showed to user in registration form") + ("registration.username_label", value()->default_value("Legacy network username:"), "Label for username field") ("registration.username_mask", value()->default_value(""), "Username mask") - ("registration.encoding", value()->default_value("en"), "Default encoding in registration form") + ("registration.encoding", value()->default_value("utf8"), "Default encoding in registration form") ("database.type", value()->default_value("none"), "Database type.") ("database.database", value()->default_value(""), "Database used to store data") ("database.server", value()->default_value("localhost"), "Database server.") diff --git a/src/userregistration.cpp b/src/userregistration.cpp index 883548111e8ea285856cb402b7af1adfec4744db..e1a1731a0d7babe73fd603f0b273cd557dee8150 100644 --- a/src/userregistration.cpp +++ b/src/userregistration.cpp @@ -181,7 +181,7 @@ bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID bool registered = m_storageBackend->getUser(barejid, res); std::string instructions = CONFIG_STRING(m_config, "registration.instructions"); - std::string usernameField = CONFIG_STRING(m_config, "registration.username_field"); + std::string usernameField = CONFIG_STRING(m_config, "registration.username_label"); // normal jabber:iq:register reg->setInstructions(instructions); @@ -219,6 +219,7 @@ bool UserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID ListSingleFormField::ref language = ListSingleFormField::create(); language->setName("language"); language->setLabel((("Language"))); + language->addOption(Swift::FormField::Option(CONFIG_STRING(m_config, "registration.language"), CONFIG_STRING(m_config, "registration.language"))); if (registered) language->setValue(res.language); else