From acae09d86295ed711ce6c8eca28a399f71af8869 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 4 Jan 2023 13:49:35 +0100 Subject: Fix translation of QPdfLink::toString() Use the same message text as in QML and allow for changing languages by removing the static string constant. Use 1 fractional digit for the point. Pick-to: 6.5 Change-Id: Iac3b5374e32a9a97af157c6ba6833ad845b02750 Reviewed-by: Shawn Rutledge --- src/pdf/qpdflink.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/pdf/qpdflink.cpp b/src/pdf/qpdflink.cpp index d1f5bdfdc..0c2867086 100644 --- a/src/pdf/qpdflink.cpp +++ b/src/pdf/qpdflink.cpp @@ -152,12 +152,11 @@ QList QPdfLink::rectangles() const */ QString QPdfLink::toString() const { - static const QString format = QPdfLinkModel::tr("page %1 location %2,%3 zoom %4"); - return d->page > 0 ? format.arg(QString::number(d->page), - QString::number(d->location.x()), - QString::number(d->location.y()), - QString::number(d->zoom)) - : d->url.toString(); + if (d->page <= 0) + return d->url.toString(); + return QPdfLinkModel::tr("Page %1 location %2, %3 zoom %4") + .arg(d->page).arg(d->location.x(), 0, 'f', 1).arg(d->location.y(), 0, 'f', 1) + .arg(d->zoom, 0, 'f', 0); } /*! -- cgit v1.2.3