diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2021-03-24 14:23:31 +0100 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2021-04-21 16:09:49 +0200 |
| commit | 0b7510efcde8220e55b0cef5fefc1db76a3bd99a (patch) | |
| tree | 5e1c9399185d2484cd880d8910d237cce4f407ea /src/core/content_browser_client_qt.h | |
| parent | b29b245fcb9db741d14180ea7e8dcb3ad2d4f49a (diff) | |
Fix application locales again
Different countries (with the same language) can have different number
formatting and navigator.language should report not only the language,
but also the country. Locale normalization often falls back by cutting
the country off, because we have common .pak files for countries with
the same language.
This patch:
- Uses the locale resolvation only for concatenating .pak file paths
and reports the full locale everywhere else.
- Properly sets default ICU locale for JS number formats and prevents
l10n_util::GetApplicationLocale() to set it sneakily to some resolved
one.
- Fixes the crashing --lang command line argument and always prefers
its value over QLocale.
Task-number: QTBUG-91225
Change-Id: I1c09798abdb523b80f0b7a3d69fa8d7a08c7c09a
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
| -rw-r--r-- | src/core/content_browser_client_qt.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 1ccd2926d..7c8aa3ac9 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -269,8 +269,6 @@ public: private: scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick; - std::string m_appLocale; - std::string m_cachedQtLocale; }; } // namespace QtWebEngineCore |