[Libreoffice-commits] core.git: unotools/source

Eike Rathke (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 16 14:42:06 UTC 2021


 unotools/source/i18n/calendarwrapper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 75b789a8f542e729e9e5e21031b7baf452a8c174
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Fri Jul 16 15:43:00 2021 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Jul 16 16:41:32 2021 +0200

    Output proper language tag instead of Language+Country concatenation
    
    Change-Id: I83d7f94cf304a58f2ff68b2a667ba66de262f4f3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119070
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 7f0cc753a2c5..fd5d166fdcf9 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/log.hxx>
 #include <unotools/calendarwrapper.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/i18n/LocaleCalendar2.hpp>
 #include <tools/diagnose_ex.h>
 
@@ -62,7 +63,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const css::lang::
     catch (const Exception&)
     {
         TOOLS_WARN_EXCEPTION( "unotools.i18n", "loadCalendar: "
-            << rUniqueID << "   Locale: " << rLocale.Language << "_" << rLocale.Country );
+            << rUniqueID << "   Locale: " << LanguageTag::convertToBcp47(rLocale) );
     }
 }
 


More information about the Libreoffice-commits mailing list