string const configure_script = addName(system_support(), "configure.py");
configure_command_ = os::python() + ' ' + quoteName(configure_script)
- + with_version_suffix();
+ + with_version_suffix();
lyxerr[Debug::INIT]
<< "<package>\n"
{
string const abs_binary = get_binary_path(exe);
if (abs_binary.empty()) {
- lyxerr << bformat(_("Unable to determine the path to the "
- "LyX binary from the command line %1$s"),
- exe)
+ // FIXME UNICODE
+ lyxerr << lyx::to_utf8(bformat(_("Unable to determine the path to the "
+ "LyX binary from the command line %1$s"),
+ lyx::from_utf8(exe)))
<< std::endl;
bail_out();
}
searched_dirs_str += *it;
}
- lyxerr << bformat(_("Unable to determine the system directory "
- "having searched\n"
- "\t%1$s\n"
- "Use the '-sysdir' command line parameter or "
- "set the environment variable LYX_DIR_14x to "
- "the LyX system directory containing the file "
- "`chkconfig.ltx'."),
- searched_dirs_str)
+ // FIXME UNICODE
+ lyxerr << lyx::to_utf8(bformat(_("Unable to determine the system directory "
+ "having searched\n"
+ "\t%1$s\n"
+ "Use the '-sysdir' command line parameter or "
+ "set the environment variable LYX_DIR_14x to "
+ "the LyX system directory containing the file "
+ "`chkconfig.ltx'."),
+ lyx::from_utf8(searched_dirs_str)))
<< std::endl;
bail_out();
string const & file,
string const & command_line_switch)
{
- string const abs_path = fileSearch(dir, file);
+ FileName const abs_path = fileSearch(dir, file);
if (abs_path.empty()) {
- lyxerr << bformat(_("Invalid %1$s switch.\n"
- "Directory %2$s does not contain %3$s."),
- command_line_switch, dir, file)
+ // FIXME UNICODE
+ lyxerr << lyx::to_utf8(bformat(_("Invalid %1$s switch.\n"
+ "Directory %2$s does not contain %3$s."),
+ lyx::from_utf8(command_line_switch), lyx::from_utf8(dir),
+ lyx::from_utf8(file)))
<< std::endl;
}
string const & file,
string const & env_var)
{
- string const abs_path = fileSearch(dir, file);
+ FileName const abs_path = fileSearch(dir, file);
if (abs_path.empty()) {
- lyxerr << bformat(_("Invalid %1$s environment variable.\n"
- "Directory %2$s does not contain %3$s."),
- env_var, dir, file)
+ // FIXME UNICODE
+ lyxerr << lyx::to_utf8(bformat(_("Invalid %1$s environment variable.\n"
+ "Directory %2$s does not contain %3$s."),
+ lyx::from_utf8(env_var), lyx::from_utf8(dir), lyx::from_utf8(file)))
<< std::endl;
}
// search mechanism in po/Makefile.in.in will register
// package.C.in as a file containing strings that need
// translation.
- string const fmt =
- _("Invalid %1$s environment variable.\n%2$s is not a directory.");
+ // FIXME UNICODE
+ docstring const fmt =
+ _("Invalid %1$s environment variable.\n%2$s is not a directory.");
- lyxerr << bformat(fmt, env_var, dir)
+ lyxerr << lyx::to_utf8(bformat(fmt, lyx::from_utf8(env_var), lyx::from_utf8(dir)))
<< std::endl;
}