diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2020-07-10 13:43:04 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-07-28 23:29:52 +0200 |
| commit | b4b8665bd370a869196e2f63acc2cdde7a37a4df (patch) | |
| tree | f6c00f8b696f98535e3f12fcbe1b4ff69bbe1496 /vcl | |
| parent | 56b2214c3aa40c2e2522eba5584063fb34e003ba (diff) | |
Resolves tdf#132066 - Localization of special text in about window
Copy all version infos in English
Change-Id: I6719e27f721b0ff9f06efb4ea63e286e6d58ebf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98498
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 12a21ee04fac..60bc22d12c6a 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1135,7 +1135,15 @@ OUString Application::GetAppName() enum {hwAll=0, hwEnv=1, hwUI=2}; -OUString Application::GetHWOSConfInfo(const int bSelection) +static OUString Localize(const char *pId, const bool bLocalize) +{ + if (bLocalize) + return VclResId(pId); + else + return Translate::get(pId, Translate::Create("vcl", LanguageTag("en-US"))); +} + +OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize) { ImplSVData* pSVData = ImplGetSVData(); OUStringBuffer aDetails; @@ -1147,7 +1155,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection) }; if (bSelection != hwUI) { - appendDetails("; ", VclResId(SV_APP_CPUTHREADS) + appendDetails("; ", Localize(SV_APP_CPUTHREADS, bLocalize) + OUString::number(std::thread::hardware_concurrency())); OUString aVersion; @@ -1156,21 +1164,21 @@ OUString Application::GetHWOSConfInfo(const int bSelection) else aVersion = "-"; - appendDetails("; ", VclResId(SV_APP_OSVERSION) + aVersion); + appendDetails("; ", Localize(SV_APP_OSVERSION, bLocalize) + aVersion); } if (bSelection != hwEnv) { - appendDetails("; ", VclResId(SV_APP_UIRENDER)); + appendDetails("; ", Localize(SV_APP_UIRENDER, bLocalize)); #if HAVE_FEATURE_SKIA if ( SkiaHelper::isVCLSkiaEnabled() ) { switch(SkiaHelper::renderMethodToUse()) { case SkiaHelper::RenderVulkan: - appendDetails("", VclResId(SV_APP_SKIA_VULKAN)); + appendDetails("", Localize(SV_APP_SKIA_VULKAN, bLocalize)); break; case SkiaHelper::RenderRaster: - appendDetails("", VclResId(SV_APP_SKIA_RASTER)); + appendDetails("", Localize(SV_APP_SKIA_RASTER, bLocalize)); break; } } @@ -1178,10 +1186,10 @@ OUString Application::GetHWOSConfInfo(const int bSelection) #endif #if HAVE_FEATURE_OPENGL if ( OpenGLWrapper::isVCLOpenGLEnabled() ) - appendDetails("", VclResId(SV_APP_GL)); + appendDetails("", Localize(SV_APP_GL, bLocalize)); else #endif - appendDetails("", VclResId(SV_APP_DEFAULT)); + appendDetails("", Localize(SV_APP_DEFAULT, bLocalize)); #if (defined LINUX || defined _WIN32 || defined MACOSX) appendDetails("; ", SV_APP_VCLBACKEND + GetToolkitName()); |