Merge pull request #1508 from alerque/build-back-babel

Build back Babel

classes/base.lua

@@ -45,6 +45,7 @@ class.packages = {}
 
 function class:_init (options)
   if self == options then options = {} end
+  SILE.languageSupport.loadLanguage('und') -- preload for unlocalized fallbacks
   self:declareOptions()
   self:registerRawHandlers()
   self:registerCommands()

classes/book.lua

@@ -104,30 +104,16 @@ function class:registerCommands ()
     if SU.boolean(options.toc, true) then
       SILE.call("tocentry", { level = level, number = number }, SU.subContent(content))
     end
-    local lang = SILE.settings:get("document.language")
     if SU.boolean(options.numbering, true) then
-      if options.prenumber then
-        if SILE.Commands[options.prenumber .. ":"  .. lang] then
-          options.prenumber = options.prenumber .. ":" .. lang
-        end
-        SILE.call(options.prenumber)
-      end
-      SILE.call("show-multilevel-counter", { id = "sectioning" })
-      if options.postnumber then
-        if SILE.Commands[options.postnumber .. ":" .. lang] then
-          options.postnumber = options.postnumber .. ":" .. lang
-        end
-        SILE.call(options.postnumber)
+      if options.msg then
+        SILE.call("fluent", { number = number }, { options.msg })
+      else
+        SILE.call("show-multilevel-counter", { id = "sectioning" })
       end
     end
   end)
 
-  self:registerCommand("book:chapter:pre", function (_, _)
-    SILE.call("fluent", {}, { "book-chapter-title-pre" })
-  end)
-
   self:registerCommand("book:chapter:post", function (_, _)
-    SILE.call("fluent", {}, { "book-chapter-post" })
     SILE.call("par")
   end)
 
@@ -157,10 +143,15 @@ function class:registerCommands ()
         numbering = options.numbering,
         toc = options.toc,
         level = 1,
-        prenumber = "book:chapter:pre",
-        postnumber = "book:chapter:post"
+        msg = "book-chapter-title"
       }, content)
     end)
+    local lang = SILE.settings:get("document.language")
+    local postcmd = "book:chapter:post"
+    if SILE.Commands[postcmd .. ":" .. lang] then
+      postcmd = postcmd .. ":" .. lang
+    end
+    SILE.call(postcmd)
     SILE.call("book:chapterfont", {}, content)
     SILE.call("left-running-head", {}, function ()
       SILE.settings:temporarily(function ()
@@ -180,9 +171,14 @@ function class:registerCommands ()
       SILE.call("book:sectioning", {
         numbering = options.numbering,
         toc = options.toc,
-        level = 2,
-        postnumber = "book:section:post"
+        level = 2
       }, content)
+      local lang = SILE.settings:get("document.language")
+      local postcmd = "book:section:post"
+      if SILE.Commands[postcmd .. ":" .. lang] then
+        postcmd = postcmd .. ":" .. lang
+      end
+      SILE.call(postcmd)
       SILE.process(content)
     end)
     if not SILE.scratch.counters.folio.off then
@@ -215,11 +211,16 @@ function class:registerCommands ()
       SILE.call("book:sectioning", {
             numbering = options.numbering,
             toc = options.toc,
-            level = 3,
-            postnumber = "book:subsection:post"
+            level = 3
           }, content)
       SILE.process(content)
     end)
+    local lang = SILE.settings:get("document.language")
+    local postcmd = "book:subsection:post"
+    if SILE.Commands[postcmd .. ":" .. lang] then
+      postcmd = postcmd .. ":" .. lang
+    end
+    SILE.call(postcmd)
     SILE.typesetter:leaveHmode()
     SILE.call("novbreak")
     SILE.call("medskip")

core/languages.lua

@@ -65,8 +65,14 @@ SILE.registerCommand("fluent", function (options, content)
     message = entry:format(options)
   else
     SU.warn(string.format("No localized message for %s found in locale %s", key, locale))
+    fluent:set_locale('und')
+    entry = fluent:get_message(key)
+    if entry then
+      message = entry:format(options)
+    end
+    fluent:set_locale(locale)
   end
-  SILE.process({ message })
+  SILE.processString(("<sile>%s</sile>"):format(message), "xml")
 end, nil, nil, true)
 
 SILE.registerCommand("ftl", function (options, content)

documentation/c08-language.sil

@@ -154,7 +154,7 @@ A particularly common string to override might be the table of contents heading:
 
 \begin{verbatim}
 \line
-\\ftl\{toc-heading = Table of Contents\}
+\\ftl\{tableofcontents-title = Table of Contents\}
 \\tableofcontents
 \line
 \end{verbatim}

i18n/af.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Hoofstuk { $number }
+
+tableofcontents-title = Inhoudsopgawe

i18n/am.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = ክፍል { $number }
+
+tableofcontents-title = ይዘት

i18n/ar.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = باب { $number }
+
+tableofcontents-title = المحتويات

i18n/as.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = অধ্যায় { $number }
+
+tableofcontents-title = সমল

i18n/bg.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Глава { $number }
+
+tableofcontents-title = Съдържание

i18n/bn.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = অধ্যায় { $number }
+
+tableofcontents-title = সূচীপত্র

i18n/bo.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = ལེའུ་ { $number }
+
+tableofcontents-title = དཀར་ཆག།

i18n/ca.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Capítol { $number }
+
+tableofcontents-title = Índex

i18n/cs.ftl

@@ -1,3 +1,3 @@
-toc-title = Obsah
+book-chapter-title = Kapitola { $number }
 
-book-chapter-title-pre = Kapitola{" "}
+tableofcontents-title = Obsah

i18n/cy.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Pennod { $number }
+
+tableofcontents-title = Cynnwys

i18n/da.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Kapitel { $number }
+
+tableofcontents-title = Indhold

i18n/de.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Kapitel { $number }
+
+tableofcontents-title = Inhaltsverzeichnis

i18n/el-monoton.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Κεφάλαιο { $number }
+
+tableofcontents-title = Περιεχόμενα

i18n/el-polyton.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Κεφάλαιο { $number }
+
+tableofcontents-title = Περιεχόμενα

i18n/el.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Κεφάλαιο { $number }
+
+tableofcontents-title = Περιεχόμενα

i18n/en.ftl

@@ -1,15 +1,15 @@
-hello = Hello { $name }!
+bibliography-and = and
 
-toc-not-generated = Rerun SILE to process the table of contents!
+bibliography-edited-by = Edited by { $name }
 
-toc-title = Table of Contents
+bibliography-et-al = <language main="la">et al</language>.
 
-book-chapter-title-pre = Chapter{" "}
+bibliography-translated-by = Translated by { $name }
 
-bibliography-and = and
+book-chapter-title = Chapter { $number }
 
-bibliography-edited-by = Edited by { $name }
+hello = Hello <em>{ $name }</em>!
 
-bibliography-et-al = et al.
+tableofcontents-not-generated = Rerun SILE to process the table of contents!
 
-bibliography-translated-by = Translated by { $name }
+tableofcontents-title = Table of Contents

i18n/eo.ftl

@@ -1,15 +1,15 @@
-hello = Saluton { $name }!
-
-toc-not-generated = Reruli na SILE por trakti la enhavan tabelon!
-
-toc-title = Enhavoj
-
-book-chapter-title-pre = Ĉapitro{" "}
-
 bibliography-and = kaj
 
 bibliography-edited-by = Redaktita por { $name }
 
 bibliography-et-al = kaj aliaj
 
 bibliography-translated-by = Tradukita por { $name }
+
+book-chapter-title = Ĉapitro { $number }
+
+hello = Saluton <em>{ $name }</em>!
+
+tableofcontents-not-generated = Reruli na SILE por trakti la enhavan tabelon!
+
+tableofcontents-title = Enhavoj

i18n/es.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Capítulo { $number }
+
+tableofcontents-title = Índice

i18n/et.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Peatükk { $number }
+
+tableofcontents-title = Sisukord

i18n/eu.ftl

@@ -0,0 +1,3 @@
+book-chapter-title ={ $number }. Kapitulua
+
+tableofcontents-title = Gaien Aurkibidea

i18n/fi.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Luku { $number }
+
+tableofcontents-title = Sisällys

i18n/fr.ftl

@@ -0,0 +1,11 @@
+bibliography-and = et
+
+bibliography-edited-by = Édité par { $name }
+
+bibliography-et-al = <language main="la">et al</language>.
+
+bibliography-translated-by = Traduit par { $name }
+
+book-chapter-title = Chapitre { $number }
+
+tableofcontents-title = Table des matières

i18n/ga.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Caibidil { $number }
+
+tableofcontents-title = Clár Ábhair

i18n/hi.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = अध्याय { $number }
+
+tableofcontents-title = अनुक्रम

i18n/hr.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Poglavlje { $number }
+
+tableofcontents-title = Sadržaj

i18n/hu.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = { $number }. fejezet
+
+tableofcontents-title = Tartalomjegyzék

i18n/hy.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Գլուխ { $number }
+
+tableofcontents-title = Բովանդակություն

i18n/id.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Bab { $number }
+
+tableofcontents-title = Daftar Isi

i18n/is.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Kafli { $number }
+
+tableofcontents-title = Efnisyfirlit

i18n/it.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Capitolo { $number }
+
+tableofcontents-title = Indice

i18n/ja.ftl

@@ -1,4 +1,3 @@
-# End with thin nonbreaking space (U+202F)
-book-chapter-title-pre = 第 
+book-chapter-title = 第 { $number } 章
 
-book-chapter-post =  章
+tableofcontents-title = 目次

i18n/ka.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = თავი { $number }
+
+tableofcontents-title = შინაარსი

i18n/kn.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = ಅಧ್ಯಾಯ { $number }
+
+tableofcontents-title = ವಿಷಯಗಳು

i18n/la.ftl

@@ -1,15 +1,15 @@
-hello = Salve { $name }!
-
-toc-not-generated = Curre SILE iterum ad mensam contentorum computetur!
-
-toc-title = Tabula contentorum
-
-book-chapter-title-pre = Caput{" "}
-
 bibliography-and = et
 
 bibliography-edited-by = Conpositor erat { $name }
 
 bibliography-et-al = et al.
 
 bibliography-translated-by = Interpres fuit { $name }
+
+book-chapter-title = Caput { $number }
+
+hello = Salve <em>{ $name }</em>!
+
+tableofcontents-not-generated = Curre SILE iterum ad mensam contentorum computetur!
+
+tableofcontents-title = Tabula contentorum

i18n/lt.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = { $number } skyrius
+
+tableofcontents-title = Turinys

i18n/lv.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Nodaļa { $number }
+
+tableofcontents-title = Saturs

i18n/ml.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = അദ്ധ്യായം { $number }
+
+tableofcontents-title = ഉള്ളടക്കം

i18n/mr.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = प्रकरण { $number }
+
+tableofcontents-title = अनुक्रमणिका

i18n/nb.ftl

@@ -0,0 +1,15 @@
+bibliography-and = og
+
+bibliography-edited-by = Redigert av { $name }
+
+bibliography-et-al = <language main="la">et al</language>.
+
+bibliography-translated-by = Oversatt av { $name }
+
+book-chapter-title = Kapittel { $number }
+
+hello = Hei <em>{ $name }</em>!
+
+tableofcontents-not-generated = Kjør SILE om igjen slik at innholdsfortegnelsen blir behandlet!
+
+tableofcontents-title = Innhold

i18n/nl.ftl

@@ -0,0 +1,3 @@
+book-chapter-title = Hoofdstuk { $number }
+
+tableofcontents-title = Inhoudsopgave

i18n/nn.ftl

@@ -0,0 +1,15 @@
+bibliography-and = og
+
+bibliography-edited-by = Redigert av { $name }
+
+bibliography-et-al = <language main="la">et al</language>.
+
+bibliography-translated-by = Redigert av { $name }
+
+book-chapter-title = Kapittel { $number }
+
+hello = Hei <em>{ $name }</em>!
+
+tableofcontents-not-generated = Kjør SILE om igjen slik at innholdsfortegnelsen blir behandlet!
+
+tableofcontents-title = Innhald