From 1f1d60bcabcde9be31efb66532212457cde2b17d Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 23 Oct 2021 19:36:51 -0700 Subject: [PATCH] Make link to other languages be itself translatable in Release Notes and Credits dialogs --- Htmldocs/credits.html | 2 +- Htmldocs/release_notes.html | 3 ++- oscar/aboutdialog.cpp | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Htmldocs/credits.html b/Htmldocs/credits.html index de706d00..6bae0936 100644 --- a/Htmldocs/credits.html +++ b/Htmldocs/credits.html @@ -8,7 +8,7 @@

- For other languages, go to: + This page in other languages:
http://www.apneaboard.com/wiki/index.php/OSCAR_Credits

Credits

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index aace2ff3..ee36a7f6 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -8,7 +8,7 @@

- For other languages, go to: + This page in other languages:
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

Changes and fixes in OSCAR v1.3.1-alpha.0 @@ -18,6 +18,7 @@

  • [fix] Correct SleepStyle machines sometimes identified as Icon machines.
  • [fix] Update copyright notices in html files.
  • [fix] Correct value display on exact data points, and near session boundaries with drift.
    • +
  • [fix] Link to translations in Credits and Release Notes html is now translated to selected language.

    • Changes and fixes in OSCAR v1.3.0 diff --git a/oscar/aboutdialog.cpp b/oscar/aboutdialog.cpp index 4f382f88..fe93bbae 100644 --- a/oscar/aboutdialog.cpp +++ b/oscar/aboutdialog.cpp @@ -2,6 +2,7 @@ * * Date created: 7/5/2018 * + * Copyright (c) 2019-2022 The OSCAR Team * Copyright (c) 2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -76,6 +77,10 @@ QString AboutDialog::getFilename(QString name) return filename; } +QString transLink (QString text) { + return text.replace("This page in other languages:", QObject::tr("This page in other languages:")); +} + QString AboutDialog::getAbout() { QString aboutFile = getFilename("about"); @@ -83,6 +88,7 @@ QString AboutDialog::getAbout() QString text = tr("Sorry, could not locate About file."); if (clfile.open(QIODevice::ReadOnly)) { text = clfile.readAll(); + text = transLink(text); } else qWarning() << "Could not open" << aboutFile << "for reading, error code" << clfile.error() << clfile.errorString(); // qDebug() << "Failed to open About file"; @@ -97,6 +103,7 @@ QString AboutDialog::getCredits() QString text = tr("Sorry, could not locate Credits file."); if (clfile.open(QIODevice::ReadOnly)) { text = clfile.readAll(); + text = transLink(text); } else { qWarning() << "Could not open" << creditsFile << "for reading, error code" << clfile.error() << clfile.errorString(); } @@ -128,6 +135,7 @@ QString AboutDialog::getRelnotes() } text += changeLog; text += ""; + text = transLink(text); return text; }