diff options
| author | Zolnai Tamás <zolnaitamas2000g@gmail.com> | 2012-11-21 21:05:25 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-21 20:38:35 +0000 |
| commit | 855f9a0f0b7550e484362a56a9dfedbc92961bce (patch) | |
| tree | d57c26cbb6dd5deba406fb976f0406f2712b6f52 /l10ntools | |
| parent | aad50d19d16ffabf4dd265b11c25e53247210f1e (diff) | |
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@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/merge.cxx | 2 | ||||
| -rw-r--r-- | l10ntools/source/propmerge.cxx | 2 | ||||
| -rw-r--r-- | l10ntools/source/treemerge.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 73bd8dd7d866..af2ebdc5e78e 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 689e931c4b72..91ea78b048ee 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 622564c5d58c..ed96da2348a5 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( |