android/sdremote/Makefile | 2 ++ l10ntools/source/stringmerge.cxx | 5 +++-- l10ntools/source/treemerge.cxx | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit d536dbb4871b6a32b7066de2485b4453fe32496d Author: Thorsten Behrens <[email protected]> Date: Sun Feb 17 14:14:02 2013 +0100 Fix fdo#60754 - no translations for langs sorting after qtz Adjust check to not rely on lexicographical order. This amends 8ae3ddca7e99d2bdbaadd5e0c82de2f0fbd30f91. Change-Id: I0e9ea916f2efaf21a8f44df4483a55ce7f6be33f Reviewed-on: https://gerrit.libreoffice.org/2196 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile index 3972a06..9d9712a 100644 --- a/android/sdremote/Makefile +++ b/android/sdremote/Makefile @@ -54,5 +54,7 @@ translations.done: $(foreach lang,$(call android_get_langlist),$(call android_ge translations.clean: rm -rf $(foreach lang,$(call android_get_langlist),$(call android_get_podir,$(lang))) + rm -rf $(foreach lang,$(call android_get_langlist),translations-$(lang).db) + rm translations.done # vim: set noet sw=4 ts=4: diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx index 378548e..133a5bf 100644 --- a/l10ntools/source/stringmerge.cxx +++ b/l10ntools/source/stringmerge.cxx @@ -132,13 +132,14 @@ void StringParser::Merge( MergeDataFile aMergeDataFile( rMergeSrc, static_cast<OString>( m_pSource->name ), false ); const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages(); - if( vLanguages.size()>=2 && vLanguages[0] != m_sLang ) + if( vLanguages.size()>=2 && + vLanguages[vLanguages[0]=="qtz" ? 1 : 0] != m_sLang ) { std::cerr << "stringex error: given language conflicts with " << "language of Mergedata file: " << m_sLang.getStr() << " - " - << vLanguages[vLanguages[0]=="qtz" ? 0 : 1].getStr() << std::endl; + << vLanguages[vLanguages[0]=="qtz" ? 1 : 0].getStr() << std::endl; return; } diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index 8f022de..6529a10 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -283,13 +283,13 @@ void TreeParser::Merge( rMergeSrc, static_cast<OString>( m_pSource->name ), false, false ); const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages(); if( vLanguages.size()>=2 && - vLanguages[vLanguages[0]=="qtz" ? 0 : 1] != m_sLang ) + vLanguages[vLanguages[0]=="qtz" ? 1 : 0] != m_sLang ) { std::cerr << "Treex error: given language conflicts with " << "language of Mergedata file: " << m_sLang.getStr() << " - " - << vLanguages[vLanguages[0]=="qtz" ? 0 : 1].getStr() << std::endl; + << vLanguages[vLanguages[0]=="qtz" ? 1 : 0].getStr() << std::endl; return; } lcl_MergeLevel( _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
