[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
tagezi
lera.goncharuk at gmail.com
Wed Dec 20 17:35:42 UTC 2017
sfx2/source/appl/sfxhelp.cxx | 9 ++++++++-
sfx2/uiconfig/ui/helpmanual.ui | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 400b70f85fdf0ae5a6d606eb3fff683b9f1ce7ab
Author: tagezi <lera.goncharuk at gmail.com>
Date: Tue Dec 5 16:01:32 2017 +0200
tdf#114204 - Clarify the "Local Help not installed" message
Change-Id: If25e5f8a1eb2e247e2432bb8a14b7a4aa2509f62
Reviewed-on: https://gerrit.libreoffice.org/45880
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4d5a2b240a01..bce03be37adb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -70,6 +70,7 @@
#include <vcl/svapp.hxx>
#include <sfx2/frame.hxx>
#include <rtl/string.hxx>
+#include <svtools/langtab.hxx>
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
@@ -650,7 +651,13 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
if ( !impl_hasHelpInstalled() )
{
- ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+ ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< vcl::Window* >( pWindow ),
+ "onlinehelpmanual", "sfx/ui/helpmanual.ui");
+
+ LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
+ OUString sLocaleString = SvtLanguageTable::GetLanguageString( aLangTag.getLanguageType() );
+ OUString sPrimTex = aQueryBox->get_primary_text();
+ aQueryBox->set_primary_text(sPrimTex.replaceAll("$UILOCALE", sLocaleString));
short OnlineHelpBox = aQueryBox->Execute();
if(OnlineHelpBox == RET_OK)
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index f3847c880a92..e750ed0c7a96 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -9,7 +9,7 @@
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
- <property name="text" translatable="yes" context="helpmanual|onlinehelpmanual">The %PRODUCTNAME built-in help is not installed on your computer.</property>
+ <property name="text" translatable="yes" context="helpmanual|onlinehelpmanual">The %PRODUCTNAME built-in help for current UI language ($UILOCALE) is not installed on your computer.</property>
<property name="secondary_text" translatable="yes" context="helpmanual|onlinehelpmanual">You may either install it from our website or your system’s repositories, or read an online version.</property>
<child internal-child="vbox">
<object class="GtkBox" id="internal_box">
More information about the Libreoffice-commits
mailing list