[Libreoffice-commits] core.git: 2 commits - i18npool/source solenv/bin

[Eike Rathke]

 i18npool/source/languagetag/languagetag.cxx |    6 ++++--
 solenv/bin/create-tags                      |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 4fb6281270302e26664c2aa09e63b6838dc67d87
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Mar 28 13:27:42 2013 +0100

    explicit 'en' fallback not needed for 'en-US' reference
    
    If 'en-US' was given, 'en' is part of default fallbacks anyway.
    
    Change-Id: I4f78c60bccd55fcf90f7c7fc99cda25ff1213db8

diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx
index be6e228..961c8d5 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -1178,9 +1178,11 @@ LanguageTag::Extraction LanguageTag::simpleExtract( const OUString& rBcp47,
     ::std::vector< OUString > aFallbacks( LanguageTag( rReference).getFallbackStrings());
     aFallbacks.erase( aFallbacks.begin());  // first is full BCP47, we already checked that
     if (rReference != "en-US")
+    {
         aFallbacks.push_back( "en-US");
-    if (rReference != "en")
-        aFallbacks.push_back( "en");
+        if (rReference != "en")
+            aFallbacks.push_back( "en");
+    }
     if (rReference != "x-default")
         aFallbacks.push_back( "x-default");
     if (rReference != "x-no-translate")
commit 0d87455f0dbb07fae67db9cbd2a3d77bbd91a680
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Mar 28 13:15:58 2013 +0100

    disabled --sort=foldcase
    
    --sort=foldcase has the effect that all binary searches must be done
    case insensitive, i.e. in Vim either 'set ignorecase' is needed to find
    a tag at all (and then you may get more than you asked for) unless a
    regular expression is given, or 'set notagbsearch' to switch off binary
    search. Other tools requiring binary search may not work at all if they
    don't use the ctags readtags library or similar.
    
    Change-Id: Ifce4b4fa5635617023e0be61ca6df0dd4d6b942a

diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index e4364e9..4cd6cdd 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -19,4 +19,4 @@ omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
       --languages=-HTML,Java,JavaScript \
       -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=solver \
-      --exclude=clone --exclude=install --totals=yes --sort=foldcase *
+      --exclude=clone --exclude=install --totals=yes *