GuiCharacter: INHERIT is OFF for the tristate buttons.

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 8110c174016664385b52113b52d046e9b3382116..12c79a04193fa8964c7c3b69b1d0a25eb348d3eb 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -103,11 +103,20 @@ string Language::fontenc(BufferParams const & params) const
 }
 
 
+string Language::dateFormat(size_t i) const
+{
+       if (i > dateformats_.size())
+               return string();
+       return dateformats_.at(i);
+}
+
+
 bool Language::readLanguage(Lexer & lex)
 {
        enum LanguageTags {
                LA_AS_BABELOPTS = 1,
                LA_BABELNAME,
+               LA_DATEFORMATS,
                LA_ENCODING,
                LA_END,
                LA_FONTENC,
@@ -130,6 +139,7 @@ bool Language::readLanguage(Lexer & lex)
        LexerKeyword languageTags[] = {
                { "asbabeloptions",       LA_AS_BABELOPTS },
                { "babelname",            LA_BABELNAME },
+               { "dateformats",          LA_DATEFORMATS },
                { "encoding",             LA_ENCODING },
                { "end",                  LA_END },
                { "fontencoding",         LA_FONTENC },
@@ -196,6 +206,13 @@ bool Language::readLanguage(Lexer & lex)
                        fontenc_.insert(fontenc_.end(), fe.begin(), fe.end());
                        break;
                }
+               case LA_DATEFORMATS: {
+                       lex.eatLine();
+                       vector<string> const df =
+                               getVectorFromString(trim(lex.getString(true), "\""), "|");
+                       dateformats_.insert(dateformats_.end(), df.begin(), df.end());
+                       break;
+               }
                case LA_GUINAME:
                        lex >> display_;
                        break;
@@ -261,6 +278,11 @@ bool Language::read(Lexer & lex)
        }
        if (fontenc_.empty())
                fontenc_.push_back("ASCII");
+       if (dateformats_.empty()) {
+               dateformats_.push_back("MMMM dd, yyyy");
+               dateformats_.push_back("MMM dd, yyyy");
+               dateformats_.push_back("M/d/yyyy");
+       }
        return true;
 }
 
@@ -375,6 +397,26 @@ Match match(string const & code, Language const & lang)
 } // namespace
 
 
+
+Language const * Languages::getFromCode(string const & code) const
+{
+       LanguageList::const_iterator const lbeg = languagelist.begin();
+       LanguageList::const_iterator const lend = languagelist.end();
+       // Try for exact match first
+       for (LanguageList::const_iterator lit = lbeg; lit != lend; ++lit) {
+               if (match(code, lit->second) == ExactMatch)
+                       return &lit->second;
+       }
+       // If not found, look for lang prefix (without country) instead
+       for (LanguageList::const_iterator lit = lbeg; lit != lend; ++lit) {
+               if (match(code, lit->second) == ApproximateMatch)
+                       return &lit->second;
+       }
+       LYXERR0("Unknown language `" + code + "'");
+       return 0;
+}
+
+
 void Languages::readLayoutTranslations(support::FileName const & filename)
 {
        Lexer lex;
@@ -395,13 +437,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
                if (!lex.next(true))
                        break;
                string const code = lex.getString();
-               bool found = false;
-               for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
-                       if (match(code, lit->second) != NoMatch) {
-                               found = true;
-                               break;
-                       }
-               }
+               bool found = getFromCode(code);
                if (!found) {
                        lex.printError("Unknown language `" + code + "'");
                        break;