Revision 7007 trunk/install/launcher/izpack-launcher-1.3/src/launcher.cpp
| launcher.cpp | ||
|---|---|---|
| 311 | 311 |
|
| 312 | 312 |
bool LauncherApp::searchJRE() |
| 313 | 313 |
{
|
| 314 |
showStatusMsg(_("Searching for JRE..."));
|
|
| 314 |
showStatusMsg(_("Searching JRE's..."));
|
|
| 315 | 315 |
wxString version("");
|
| 316 | 316 |
|
| 317 | 317 |
// Windows[tm] registry lookup |
| ... | ... | |
| 380 | 380 |
|
| 381 | 381 |
void LauncherApp::runJRE() |
| 382 | 382 |
{
|
| 383 |
showStatusMsg(_("Launching instalation..."));
|
|
| 383 |
showStatusMsg(_("Launching installation..."));
|
|
| 384 | 384 |
if (!wxFile::Exists(paramsJar)) |
| 385 | 385 |
{
|
| 386 |
error(_("The jar-file in the configuration file ") + cfgName + _(" does exist."));
|
|
| 386 |
error(_("Could not find '") + paramsJar + _("' file referenced by the configuration file '") + cfgName + _("'"));
|
|
| 387 | 387 |
} |
| 388 | 388 |
|
| 389 | 389 |
wxString cmd = javaExecPath + paramsJarParams + wxString(" -jar ") + paramsJar;
|
| ... | ... | |
| 658 | 658 |
{
|
| 659 | 659 |
if (paramsEnabledDownload) |
| 660 | 660 |
{
|
| 661 |
wxString msg = _("Instalation require download this file:\n") +
|
|
| 661 |
wxString msg = _("Installation requires to download this file:\n") +
|
|
| 662 | 662 |
fileDescription + "\n" + |
| 663 | 663 |
_("Do you want to continue?");
|
| 664 | 664 |
confirm(msg); |
| ... | ... | |
| 685 | 685 |
} |
| 686 | 686 |
if (statusDialog->IsCanceled()) {
|
| 687 | 687 |
int response; |
| 688 |
wxMessageDialog dlg(0, _("Are you sure to cancel instalation process?"), _(APPLICATION_NAME), wxYES_NO | wxICON_QUESTION );
|
|
| 688 |
wxMessageDialog dlg(0, _("Do you really want to cancel the installation process?"), _(APPLICATION_NAME), wxYES_NO | wxICON_QUESTION );
|
|
| 689 | 689 |
response = dlg.ShowModal(); |
| 690 | 690 |
if (response == wxID_YES) {
|
| 691 | 691 |
notifyToUser(_("Canceled by user"));
|
| ... | ... | |
| 705 | 705 |
|
| 706 | 706 |
cmd = cmd.Format("%s -version", javaexe.c_str());
|
| 707 | 707 |
if( wxExecute(cmd,out,err)!= 0 ) {
|
| 708 |
notifyToUser("wxExecute ha petao.");
|
|
| 709 |
exit(1);
|
|
| 708 |
notifyToUser(_("Failed checking JVM version."));
|
|
| 709 |
return false;
|
|
| 710 | 710 |
} |
| 711 | 711 |
|
| 712 | 712 |
if (err[0].Contains("1.4.2") && err[0].Contains("version")) {
|
| ... | ... | |
| 722 | 722 |
bool doChecks = true; |
| 723 | 723 |
|
| 724 | 724 |
if (paramsAskForCheckingProcess) {
|
| 725 |
wxString msg = _("Do you want to check the application requirements?");
|
|
| 725 |
wxString msg = _("Do you want to check the application requirements? \nThis will install missing components.");
|
|
| 726 | 726 |
doChecks = confirmYesNoCancel(msg,true); |
| 727 | 727 |
} |
| 728 | 728 |
|
| ... | ... | |
| 741 | 741 |
jaiIoInstall(); |
| 742 | 742 |
} else {
|
| 743 | 743 |
// No quiere comprobacion, por lo que solicitamos |
| 744 |
wxString msgDir = _("Find de Java Virtual Machine executable file to run");
|
|
| 744 |
wxString msgDir = _("Please, select the Java VM.");
|
|
| 745 | 745 |
wxFileDialog dlg( |
| 746 | 746 |
0, |
| 747 | 747 |
msgDir, |
Also available in: Unified diff