summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-01-04 13:49:35 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-01-07 01:24:54 +0100
commitacae09d86295ed711ce6c8eca28a399f71af8869 (patch)
treee12328c83d409f3ece487264763d10d4722e4429
parentdf4fee6fd3045884aee483c34c76c6718a10fe56 (diff)
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 <shawn.rutledge@qt.io>
-rw-r--r--src/pdf/qpdflink.cpp11
1 files changed, 5 insertions, 6 deletions
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<QRectF> 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);
}
/*!