[Libreoffice-commits] .: l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/merge.cxx     |    2 +-
 l10ntools/source/propmerge.cxx |    2 +-
 l10ntools/source/treemerge.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 855f9a0f0b7550e484362a56a9dfedbc92961bce
Author: Zolnai Tamás <zolnaitamas2000g at gmail.com>
Date:   Wed Nov 21 21:05:25 2012 +0100

    Po files' header has modified language id
    
    So they must be changed to match with real id
    Plus add more usefull error message
    
    Change-Id: Ife941756bd108ed9adb73dd2d30bd7fa79eb3e35
    Reviewed-on: https://gerrit.libreoffice.org/1148
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 73bd8dd..af2ebdc 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -192,7 +192,7 @@ MergeDataFile::MergeDataFile(
         OString sLang;
         try
         {
-            sLang = aPoHeader.getLanguage();
+            sLang = aPoHeader.getLanguage().replaceAll("_","-");
         }
         catch( PoHeader::Exception& aException )
         {
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 689e931..91ea78b 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -188,7 +188,7 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
         std::cerr
             << "Propex error: given language conflicts with "
             << "language of Mergedata file: "
-            << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl;
+            << m_sLang.getStr() << " - " << aLanguages[0].getStr() << std::endl;
         return;
     }
 
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 622564c..ed96da2 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -287,7 +287,7 @@ void TreeParser::Merge(
             std::cerr
                 << "Treex error: given language conflicts with "
                 << "language of Mergedata file: "
-                << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl;
+                << m_sLang.getStr() << " - " << vLanguages[0].getStr() << std::endl;
             return;
         }
         lcl_MergeLevel(