summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
authorZolnai Tamás <zolnaitamas2000g@gmail.com>2012-11-18 18:20:38 +0100
committerZolnai Tamás <zolnaitamas2000g@gmail.com>2012-11-18 19:18:46 +0100
commit06d5579c9291b6061ee89eed8f505f436375e15d (patch)
tree13913a18def52f4e6a4865c4dfa4bd4ee36f7d7c /l10ntools
parent5d84ae59e70b8b1017959a68934ac1f455ce2b13 (diff)
Localize tree files in help
-Treex works well when po is not exist, send a warning but make en-US tree-s. Change-Id: Ib2b790742c022211a8d250b66891cef045941398
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/source/treemerge.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 12e931c6d221..8555c8f013a1 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -279,8 +279,8 @@ void TreeParser::Merge(
{
MergeDataFile aMergeDataFile(
rMergeSrc, static_cast<OString>( m_pSource->name ), false );
-
- if( aMergeDataFile.GetLanguages()[0] != m_sLang )
+ const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages();
+ if( !vLanguages.empty() && vLanguages[0] != m_sLang )
{
std::cerr
<< "Treex error: given language conflicts with "
@@ -288,7 +288,6 @@ void TreeParser::Merge(
<< m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl;
return;
}
-
lcl_MergeLevel(
m_pSource, pRootNode, (const xmlChar *)("help_section"),
&aMergeDataFile, m_sLang, rXhpRoot );