Author: spitz
Date: Sun Mar 20 11:50:43 2011
New Revision: 37974
URL: http://www.lyx.org/trac/changeset/37974

Log:
* LaTeXFeatures.cpp (getI18nPreamble):
        - do not propose translations for bultin floats (they are translated 
anyway)
        - only propose translations for floats if we have something different 
to the English source

Modified:
   lyx-devel/trunk/src/LaTeXFeatures.cpp

Modified: lyx-devel/trunk/src/LaTeXFeatures.cpp
==============================================================================
--- lyx-devel/trunk/src/LaTeXFeatures.cpp       Sun Mar 20 11:49:11 2011        
(r37973)
+++ lyx-devel/trunk/src/LaTeXFeatures.cpp       Sun Mar 20 11:50:43 2011        
(r37974)
@@ -1197,26 +1197,31 @@
                UsedFloats::const_iterator fend = usedFloats_.end();
                for (; fit != fend; ++fit) {
                        Floating const & fl = floats.getType(fit->first);
+                       // we assume builtin floats are translated 
+                       if (fl.isPredefined())
+                               continue;
                        docstring const type = from_ascii(fl.floattype());
                        docstring const flname = from_utf8(fl.name());
                        docstring name = translateIfPossible(flname,
                                buffer().language()->code());
-                       if (use_polyglossia)
+                       // only request translation if we have a real 
translation
+                       // (that differs from the source)
+                       if (use_polyglossia && flname != name)
                                snippets.insert(getFloatI18nPreamble(
                                        type, name,
                                        
from_ascii(buffer().language()->polyglossia())));
-                       else
+                       else if (flname != name)
                                snippets.insert(getFloatI18nPreamble(
                                        type, name,
                                        
from_ascii(buffer().language()->babel())));
                        for (lang_it lit = lbeg; lit != lend; ++lit) {
                                name = translateIfPossible(flname,
                                        (*lit)->code());
-                               if (use_polyglossia)
+                               if (use_polyglossia && flname != name)
                                        snippets.insert(getFloatI18nPreamble(
                                                type, name,
                                                
from_ascii((*lit)->polyglossia())));
-                               else
+                               else if (flname != name)
                                        snippets.insert(getFloatI18nPreamble(
                                                type, name,
                                                from_ascii((*lit)->babel())));

Reply via email to