[Libreoffice-commits] core.git: editeng/source include/svtools linguistic/source

[Gabor Kelemen]

 editeng/source/misc/unolingu.cxx |    7 ++++++-
 include/svtools/strings.hrc      |    2 +-
 linguistic/source/dicimp.cxx     |    6 ------
 linguistic/source/dlistimp.cxx   |    5 ++++-
 linguistic/source/misc.cxx       |    7 ++++++-
 5 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit eff395c2d2a3026d9d65121e273af336fb0cfb19
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Wed Jun 20 08:14:20 2018 +0200

    tdf#117620 Localize the temporary IgnoreAllList dictionarys name
    
    Also give it a human readable original name
    
    Change-Id: I86060badac145e7b60cf7dc2e67e16e7c84c2837
    Reviewed-on: https://gerrit.libreoffice.org/56143
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 6263a0db5398..25e7268a93e0 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -49,6 +49,8 @@
 #include <linguistic/misc.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
+#include <svtools/strings.hrc>
+#include <unotools/resmgr.hxx>
 
 using namespace ::comphelper;
 using namespace ::linguistic;
@@ -594,7 +596,10 @@ uno::Reference< XDictionary > LinguMgr::GetIgnoreAll()
     uno::Reference< XSearchableDictionaryList >  xTmpDicList( GetDictionaryList() );
     if (xTmpDicList.is())
     {
-        xIgnoreAll.set( xTmpDicList->getDictionaryByName( "IgnoreAllList" ), UNO_QUERY );
+        std::locale loc(Translate::Create("svt"));
+        xIgnoreAll.set( xTmpDicList->getDictionaryByName(
+                                    Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) ),
+                                    UNO_QUERY );
     }
     return xIgnoreAll;
 }
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index b5d7b8bb9655..a616b2a6bd56 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -358,7 +358,7 @@
 #define STR_DESCRIPTION_HUNSPELL                NC_("STR_DESCRIPTION_HUNSPELL", "Hunspell SpellChecker")
 #define STR_DESCRIPTION_LIBHYPHEN               NC_("STR_DESCRIPTION_LIBHYPHEN", "Libhyphen Hyphenator")
 #define STR_DESCRIPTION_MYTHES                  NC_("STR_DESCRIPTION_MYTHES", "Mythes Thesaurus")
-
+#define STR_DESCRIPTION_IGNOREALLLIST           NC_("STR_DESCRIPTION_IGNOREALLLIST", "List of Ignored Words")
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 12c82f461401..ddc5074f62c7 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -75,12 +75,6 @@ using namespace linguistic;
 // The following fake file name extension will be
 // added to the text of the title: field for correct
 // text stripping and dictionary saving.
-//
-// TODO: add translation support?
-//   tdf#50827 language dependent wordlists are already in
-//   the appropriate dict packages.
-//   Note: Also name of the special run-time dictionary
-//   "IgnoreAllList" hasn't been localized yet.
 #define EXTENSION_FOR_TITLE_TEXT "."
 
 static const sal_Char* const pVerStr2    = "WBSWG2";
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 5aade2b9e02e..e1b92d4a41a1 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -37,6 +37,8 @@
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <svtools/strings.hrc>
+#include <unotools/resmgr.hxx>
 
 #include "defs.hxx"
 #include "dlistimp.hxx"
@@ -611,8 +613,9 @@ void DicList::CreateDicList()
 
     // create IgnoreAllList dictionary with empty URL (non persistent)
     // and add it to list
+    std::locale loc(Translate::Create("svt"));
     uno::Reference< XDictionary > xIgnAll(
-            createDictionary( "IgnoreAllList", LinguLanguageToLocale( LANGUAGE_NONE ),
+            createDictionary( Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc), LinguLanguageToLocale( LANGUAGE_NONE ),
                               DictionaryType_POSITIVE, OUString() ) );
     if (xIgnAll.is())
     {
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index ac0f508751d3..6582c91db586 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -38,6 +38,8 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
+#include <svtools/strings.hrc>
+#include <unotools/resmgr.hxx>
 
 #include <rtl/instance.hxx>
 
@@ -741,7 +743,10 @@ uno::Reference< XDictionary > GetIgnoreAllList()
     uno::Reference< XDictionary > xRes;
     uno::Reference< XSearchableDictionaryList > xDL( GetDictionaryList() );
     if (xDL.is())
-        xRes = xDL->getDictionaryByName( "IgnoreAllList" );
+    {
+        std::locale loc(Translate::Create("svt"));
+        xRes = xDL->getDictionaryByName( Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) );
+    }
     return xRes;
 }