summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2018-04-26 21:25:43 +0100
committerAron Budea <aron.budea@collabora.com>2018-05-19 02:06:55 +0200
commit23109bc47daf037b76b3188c3ac3030873cb8529 (patch)
tree8befb88823a10138e77dae4d1b30a0c1d5ac35a1 /chart2
parent3954c5114468b46a6ffd3804feb9fe0a26f95e75 (diff)
Localize chart strings properly.
Change-Id: I982c95a50c1b4cd9f03f45b0203e06aca3711969 Reviewed-on: https://gerrit.libreoffice.org/53544 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/tools/ResourceManager.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx
index 3f3fb615697a..ee842e701d48 100644
--- a/chart2/source/tools/ResourceManager.cxx
+++ b/chart2/source/tools/ResourceManager.cxx
@@ -19,6 +19,7 @@
#include "ResourceManager.hxx"
+#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
namespace chart
@@ -27,11 +28,12 @@ namespace chart
ResMgr & ResourceManager::getResourceManager()
{
// not threadsafe
- static ResMgr * pResourceManager = nullptr;
- if( ! pResourceManager )
- pResourceManager = ResMgr::CreateResMgr("chartcontroller");
+ static std::unique_ptr<ResMgr> pResourceManager;
+ const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag();
+ if( ! pResourceManager || pResourceManager->GetLocale() != rLocale )
+ pResourceManager.reset( ResMgr::CreateResMgr("chartcontroller", rLocale) );
OSL_ASSERT( pResourceManager );
- return *pResourceManager;
+ return *pResourceManager.get();
}
} // namespace chart