diff --git a/oscar/aboutdialog.cpp b/oscar/aboutdialog.cpp index afaee3d4..df881c4b 100644 --- a/oscar/aboutdialog.cpp +++ b/oscar/aboutdialog.cpp @@ -67,9 +67,24 @@ void AboutDialog::on_donateButton_clicked() } ******************************************************/ +QString AboutDialog::getFilename(QString name) +{ + QString filename; + QString language = AppSetting->language(); + if (language == "en_US") { + filename = ":docs/"+name+".html"; + } else { + QString docRoot = appResourcePath() + "/Html/"; + filename = docRoot + name + language + "/Html/"; + } + qDebug() << "Looking for " + filename; + return filename; +} + QString AboutDialog::getAbout() { - QFile clfile(":/docs/about.html"); + QString aboutFile = getFilename("about"); + QFile clfile(aboutFile); QString text = tr("Sorry, could not locate About file."); if (clfile.open(QIODevice::ReadOnly)) { text = clfile.readAll(); @@ -81,7 +96,8 @@ QString AboutDialog::getAbout() QString AboutDialog::getCredits() { - QFile clfile(":/docs/credits.html"); + QString creditsFile = getFilename("credits"); + QFile clfile(creditsFile); QString text = tr("Sorry, could not locate Credits file."); if (clfile.open(QIODevice::ReadOnly)) { text = clfile.readAll(); @@ -92,7 +108,8 @@ QString AboutDialog::getCredits() QString AboutDialog::getRelnotes() { - QFile clfile(":/docs/release_notes.html"); + QString relNotesFile = getFilename("release_notes"); + QFile clfile(relNotesFile); QString changeLog = tr("Sorry, could not locate Release Notes."); if (clfile.open(QIODevice::ReadOnly)) { //Todo, write XML parser and only show the latest.. diff --git a/oscar/aboutdialog.h b/oscar/aboutdialog.h index b3f7e6a4..31208961 100644 --- a/oscar/aboutdialog.h +++ b/oscar/aboutdialog.h @@ -27,6 +27,7 @@ private slots: void on_donateButton_clicked(); ***************************************************/ private: + QString getFilename(QString name); QString getAbout(); QString getCredits(); QString getLicense(); diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index b8983eaf..d0fbbb65 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1076,7 +1076,7 @@ QString MainWindow::getWelcomeHTML() // + "
" +
- tr("Here are the release notes for this version.") +
+ tr("The release notes for this version can be found in the About OSCAR menu item.") +
"
" +
tr("Plus a few usage notes, and some important information for Mac users.")
+ "
" +