[Libreoffice-commits] .: Branch 'libreoffice-4-0' - unotools/source

[Libreoffice Gerrit user]

 unotools/source/i18n/localedatawrapper.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3b3c5c7c540be1c495a012df57ed4fb5694faf6a
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Dec 13 21:56:17 2012 +0100

    added FIXME-BCP47 marker, adapted debug check
    
    Change-Id: I334b00c907099517d327bf6314c4e853530a58cf
    (cherry picked from commit 1d486e6c65806a9ca4b9e06504056cc16f687475)

diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index ceffc85..8e283b6 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -285,6 +285,7 @@ void LocaleDataWrapper::invalidateData()
         String aDebugLocale;
         if (areChecksEnabled())
         {
+            /* FIXME-BCP47: handle language tags! */
             aDebugLocale = xLoc[i].Language;
             if ( !xLoc[i].Country.isEmpty() )
             {
@@ -333,10 +334,10 @@ void LocaleDataWrapper::invalidateData()
                 // In checks, exclude known problems because no MS-LCID defined
                 // and default for Language found.
                 if ( areChecksEnabled()
-                        && !aDebugLocale.EqualsAscii( "ar_SD" ) // Sudan/ar
-                        && !aDebugLocale.EqualsAscii( "en_CB" ) // Carribean is not a country
-//                      && !aDebugLocale.EqualsAscii( "en_BG" ) // ?!? Bulgaria/en
-//                      && !aDebugLocale.EqualsAscii( "es_BR" ) // ?!? Brazil/es
+                        && !aDebugLocale.EqualsAscii( "ar-SD" ) // Sudan/ar
+                        && !aDebugLocale.EqualsAscii( "en-CB" ) // Carribean is not a country
+//                      && !aDebugLocale.EqualsAscii( "en-BG" ) // ?!? Bulgaria/en
+//                      && !aDebugLocale.EqualsAscii( "es-BR" ) // ?!? Brazil/es
                     )
                 {
                     rtl::OUStringBuffer aMsg;