diff options
| -rw-r--r-- | AUTHORS.md | 8 | ||||
| -rw-r--r-- | lib/book.js | 2 | ||||
| -rw-r--r-- | lib/template.js | 4 | ||||
| -rw-r--r-- | lib/utils/string.js | 5 | ||||
| -rw-r--r-- | lib/utils/watch.js | 15 | ||||
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | theme/i18n/fi.json | 20 |
7 files changed, 40 insertions, 19 deletions
@@ -42,7 +42,11 @@ Translators - Hu Hao (@howiehu) - French - Samy Pessé (@SamyPesse) -- Japanese +- Romanian - Iancu Aurel (@awrelll) +- Finnish + - Tommi Savikko (@savikko) +- Japanese + - Iancu Aurel (@awrelll) - Korean - - Iancu Aurel (@awrelll) + - Iancu Aurel (@awrelll) diff --git a/lib/book.js b/lib/book.js index 8b0d22b..e61d771 100644 --- a/lib/book.js +++ b/lib/book.js @@ -115,7 +115,7 @@ Book.prototype.parse = function() { return that.parseLangs() .then(function() { multilingual = that.langs.length > 0; - if (multilingual) that.log.info.ln("Parsing multilingual book, with", that.langs.length, "lanuages"); + if (multilingual) that.log.info.ln("Parsing multilingual book, with", that.langs.length, "languages"); // Sub-books that inherit from the current book configuration that.books = _.map(that.langs, function(lang) { diff --git a/lib/template.js b/lib/template.js index 187df87..3e6364d 100644 --- a/lib/template.js +++ b/lib/template.js @@ -2,9 +2,9 @@ var _ = require("lodash"); var Q = require("q"); var path = require("path"); var nunjucks = require("nunjucks"); +var escapeStringRegexp = require("escape-string-regexp"); var git = require("./utils/git"); -var stringUtils = require("./utils/string"); var fs = require("./utils/fs"); var batch = require("./utils/batch"); var pkg = require("../package.json"); @@ -302,7 +302,7 @@ TemplateEngine.prototype.addBlock = function(name, block) { TemplateEngine.prototype._applyShortcut = function(parser, content, shortcut) { if (!_.contains(shortcut.parsers, parser)) return content; var regex = new RegExp( - stringUtils.escapeRegex(shortcut.start) + "([\\s\\S]*?[^\\$])" + stringUtils.escapeRegex(shortcut.end), + escapeStringRegexp(shortcut.start) + "([\\s\\S]*?[^\\$])" + escapeStringRegexp(shortcut.end), 'g' ); return content.replace(regex, function(all, match) { diff --git a/lib/utils/string.js b/lib/utils/string.js index 588f4d9..72a9ca0 100644 --- a/lib/utils/string.js +++ b/lib/utils/string.js @@ -20,12 +20,7 @@ function optionsToShellArgs(options) { .join(" "); } -function escapeRegex(str) { - return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); -} - module.exports = { - escapeRegex: escapeRegex, escapeShellArg: escapeShellArg, optionsToShellArgs: optionsToShellArgs, toLowerCase: String.prototype.toLowerCase.call.bind(String.prototype.toLowerCase) diff --git a/lib/utils/watch.js b/lib/utils/watch.js index 795bbb7..b6e18e7 100644 --- a/lib/utils/watch.js +++ b/lib/utils/watch.js @@ -1,7 +1,7 @@ var Q = require('q'); var _ = require('lodash'); var path = require('path'); -var Gaze = require('gaze').Gaze; +var chokidar = require('chokidar'); var parsers = require('gitbook-parsers') @@ -17,17 +17,18 @@ function watch(dir) { toWatch.push("**/*"+ext); }); - var gaze = new Gaze(toWatch, { - cwd: dir + var watcher = chokidar.watch(toWatch, { + cwd: dir, + ignoreInitial: true }); - gaze.once("all", function(e, filepath) { - gaze.close(); + watcher.once("all", function(e, filepath) { + watcher.close(); d.resolve(filepath); }); - gaze.once("error", function(err) { - gaze.close(); + watcher.once("error", function(err) { + watcher.close(); d.reject(err); }); diff --git a/package.json b/package.json index b6303e6..39b6c53 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "npmi": "0.1.1", "cheerio": "0.19.0", "gitbook-plugin-livereload": "0.0.1", - "gaze": "~0.5.1", + "chokidar": "~1.0.1", "send": "0.2.0", "tiny-lr": "0.1.5", "tmp": "0.0.24", @@ -32,7 +32,8 @@ "npm": "2.4.1", "dom-serializer": "0.1.0", "spawn-cmd": "0.0.2", - "highlight.js": "8.4.0" + "highlight.js": "8.4.0", + "escape-string-regexp": "1.0.3" }, "devDependencies": { "mocha": "2.2.1", diff --git a/theme/i18n/fi.json b/theme/i18n/fi.json new file mode 100644 index 0000000..a8476ca --- /dev/null +++ b/theme/i18n/fi.json @@ -0,0 +1,20 @@ +{ + "LANGS_CHOOSE": "Valitse kieli", + "GLOSSARY": "Sanasto", + "GLOSSARY_INDEX": "Hakemisto", + "GLOSSARY_OPEN": "Sanasto", + "GITBOOK_LINK": "Julkaistu GitBookilla", + "SUMMARY": "Sisällysluettelo", + "SUMMARY_INTRODUCTION": "Johdanto", + "SUMMARY_TOGGLE": "Sisällysluettelu", + "SEARCH_TOGGLE": "Etsi", + "SEARCH_PLACEHOLDER": "Kirjoita hakusana", + "FONTSETTINGS_TOGGLE": "Fonttivalinnat", + "SHARE_TOGGLE": "Jaa", + "SHARE_ON": "Jaa {{platform}}ssa", + "FONTSETTINGS_WHITE": "Valkoinen", + "FONTSETTINGS_SEPIA": "Seepia", + "FONTSETTINGS_NIGHT": "Yö", + "FONTSETTINGS_SANS": "Sans", + "FONTSETTINGS_SERIF": "Serif" +} |