1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cope with empty name for a time zone

Browse Source 
QTimeZone::displayName() may return empty if it has no
suitably-localized name for the zone. So QCalendarBackend's
dateTimeToString() can't rely on its tzAbbr() returning a string that
starts with UTC (and it may now, with proper L10n, start with some
other prefix) or indeed has length >= 3 (so sliced(3) could crash).
Rework the handling of offset name (mainly for the pick back to 6.8,
as I'll be back to get rid of the kludging in 6.9) to at least not
crash on empty return. In the process, use decreasingly appropriate
forms as fallbacks if we don't get what we want.

Fixes: QTBUG-129696
Change-Id: Id4f42778ca9a4806ac5dba23ce7068261a90500b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 9e749df879a5bc76fa416c96f73378d81608801f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2024-10-07 17:14:53 +02:00 committed by Qt Cherry-pick Bot
parent 8196b4d380
commit 38b8c15358
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/corelib/text/qlocale.cpp
View File

@ -3705,11 +3705,18 @@ QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &
QTimeZone::NameType mode =
type == Short ? QTimeZone::ShortName
: type == Long ? QTimeZone::LongName : QTimeZone::OffsetName;
return when.timeRepresentation().displayName(when, mode, locale);
QString text = when.timeRepresentation().displayName(when, mode, locale);
if (!text.isEmpty())
return text;
// else fall back to an unlocalized one if we can manage it:
} // else: prefer QDateTime's abbreviation, for backwards-compatibility.
#endif // else, make do with non-localized abbreviation:
if (type != Offset)
return when.timeZoneAbbreviation();
if (type != Offset) {
QString text = when.timeZoneAbbreviation();
if (!text.isEmpty())
return text;
// else fall back to Offset version:
}
// For Offset, we can coerce to a UTC-based zone's abbreviation:
return when.toOffsetFromUtc(when.offsetFromUtc()).timeZoneAbbreviation();
};
@ -3725,16 +3732,21 @@ QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &
case 3: // ±hh:mm
case 2: // ±hhmm (we'll remove the ':' at the end)
text = tzAbbr(when, Offset);
Q_ASSERT(text.startsWith("UTC"_L1)); // Need to strip this.
// The Qt::UTC case omits the zero offset:
text = (text.size() == 3
? u"+00:00"_s
: (text.size() <= 6
// Whole-hour offsets may lack the zero minutes:
? QStringView{text}.sliced(3) + ":00"_L1
: std::move(text).sliced(3)));
if (repeat == 2)
text = text.remove(u':');
if (!text.isEmpty()) {
QStringView tail{text};
// May need to strip a prefix:
if (tail.startsWith("UTC"_L1) || tail.startsWith("GMT"_L1))
tail = tail.sliced(3);
// TODO: there may be a locale-specific alternative prefix.
text = (tail.isEmpty() // The Qt::UTC case omits the zero offset:
? u"+00:00"_s
// Whole-hour offsets may lack the zero minutes:
: (tail.size() <= 3
? tail + ":00"_L1
: std::move(text).right(tail.size())));
if (repeat == 2)
text.remove(u':');
} // else: no suitable representation of the zone.
break;
default:
text = tzAbbr(when, Short);