Merge pull request #232 from kakawait/develop

Release 0.4.3-BETA

Author: kakawait

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.4.3-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/18) - 12 nov 2017
+
+- Typo fix from `highligth.js` to correct on `highlight.js` ([#231](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/231)) (thank you [@zacbook](https://github.com/zacbook))
+- Russian translation enhancement ([#227](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/227))
+
+### Breaking changes
+
+Since I did an error on `highlight.js` for parameter `syntaxHighlighter`, sorry but you have to change it again for the correct typo
+
+```toml
+[params]
+  syntaxHighlighter = "highlight.js"
+``` 
+
 ## [0.4.2-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/17) - 1 nov 2017
 
 - Support [prism.js](http://prismjs.com/) syntax highlighter in addition to _highlight.js_ ([#24](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/24))
@@ -21,6 +35,7 @@ Please upgrade you're `config.toml` (you can checkout `exampleSite/config.toml`
 
 ```toml
 [params]
+  # There is a typo on highligth.js (which should be highlight.js instead, please checkout version 0.4.3-BETA to get fix)
   syntaxHighlighter = "highligth.js"
 ```
 
@@ -39,7 +54,7 @@ Please upgrade you're `config.toml` (you can checkout `exampleSite/config.toml`
   - _OLDER POSTS_ Button Overlaps Sidebar
   - Print media queries
 - Load external resources using SRI ([#159](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/159))
-- revamp HLjs usage to fix highligthing bugs ([#154](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/154), [#160](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/160))
+- revamp HLjs usage to fix highlighting bugs ([#154](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/154), [#160](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/160))
 - Improve `customJS` and `customCSS`
   - Now support both abs and rel url ([#155](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/155))
   - Add more customization than just url ([#163](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/163))

README.md

@@ -34,7 +34,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.4.2-BETA (based on Hexo version 1.10.0)
+- **Version**: 0.4.3-BETA (based on Hexo version 1.10.0)
 - **Compatibility**: Hugo v0.20.1
 
 ## Features

docs/developer.md

@@ -28,7 +28,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General ##
 
 - **Author** : Thibaud Leprêtre
-- **Version** : 0.4.2-BETA (based on Hexo version 1.10.0)
+- **Version** : 0.4.3-BETA (based on Hexo version 1.10.0)
 - **Compatibility** : Hugo v0.20.1
 
 ## Requirements ##

docs/user.md

@@ -54,7 +54,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.4.2-BETA (based on Hexo version 1.10.0)
+- **Version**: 0.4.3-BETA (based on Hexo version 1.10.0)
 - **Compatibility**: Hugo v0.20.1
 
 ## Features

exampleSite/config.toml

@@ -1,5 +1,5 @@
 # Tranquilpeak
-# Version : 0.4.2-BETA
+# Version : 0.4.3-BETA
 # Author : Thibaud Leprêtre
 
 # I STRONGLY recommend you to use a CDN to speed up loading of pages.
@@ -107,9 +107,9 @@ canonifyurls = true
   # Global keywords configuration. Following keywords will be add to every pages
   # keywords = ["development", "next-gen"]
 
-  # Syntax highlighter, possible choice between: "highligth.js" (recommanded) and "prism.js" (experimental)
-  # You can comment it to disable syntax highligthing
-  syntaxHighlighter = "highligth.js"
+  # Syntax highlighter, possible choice between: "highlight.js" (recommanded) and "prism.js" (experimental)
+  # You can comment it to disable syntax highlighting
+  syntaxHighlighter = "highlight.js"
 
   # Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. (true: enable, false: disable)
   clearReading = true

exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md

@@ -1,5 +1,5 @@
 ---
-title: "Welcome to Tranquilpeak 0.4.2-BETA"
+title: "Welcome to Tranquilpeak 0.4.3-BETA"
 date: 2015-06-15
 categories:
 - tranquilpeak
@@ -65,7 +65,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.4.2-BETA (based on Hexo version 1.10.0)
+- **Version**: 0.4.3-BETA (based on Hexo version 1.10.0)
 - **Compatibility**: Hugo v0.20.1
 
 ## Features

i18n/ru.yaml

@@ -9,10 +9,10 @@
   translation: "Раздел"
 
 - id: "global.tags"
-  translation: "Теги"
+  translation: "Метки"
 
 - id: "global.tag"
-  translation: "Тег"
+  translation: "Метка"
 
 - id: "global.archives"
   translation: "Архив"
@@ -24,22 +24,22 @@
   translation: "Об авторе"
 
 - id: "global.author_picture"
-  translation: "Авторская фотография"
+  translation: "Фотография автора"
 
 - id: "global.share_on"
   translation: "Поделиться в %s"
 
 - id: "global.mail"
-  translation: "Mail"
+  translation: "Почта"
 
 - id: "global.rss"
   translation: "RSS"
 
 - id: "global.search_category"
-  translation: "Поиск по разделу"
+  translation: "Поиск по разделам"
 
 - id: "global.search_tag"
-  translation: "Поиск по тегу"
+  translation: "Поиск по меткам"
 
 - id: "global.search_date"
   translation: "Поиск по дате (ГГГГ/ММ/ДД)"
@@ -52,27 +52,27 @@
   translation: "Найдена 1 статья"
 
 - id: "global.posts_found.other"
-  translation: "Статей найдено: {n}"
+  translation: "Найдено статей: {n}"
 
 ## GLOBAL.CATEGORIES_FOUND ##
 - id: "global.categories_found.zero"
-  translation: "Категории не найдены"
+  translation: "Разделов не найдено"
 
 - id: "global.categories_found.one"
-  translation: "Найдена 1 категория "
+  translation: "Найден 1 раздел "
 
 - id: "global.categories_found.other"
-  translation: "Категорий нашлось: {n}"
+  translation: "Нашлось разделов: {n}"
 
 ## GLOBAL.TAGS_FOUND ##
 - id: "global.tags_found.zero"
-  translation: "Теги не найдены"
+  translation: "Метки не найдены"
 
 - id: "global.tags_found.one"
-  translation: "Найден 1 тег"
+  translation: "Найдена 1 метка"
 
 - id: "global.tags_found.other"
-  translation: "Тегов найдено: {n}"
+  translation: "Найдено меток: {n}"
 
 ## PAGINATION ##
 - id: "pagination.page"
@@ -82,10 +82,10 @@
   translation: "из {{ .Paginator.TotalPages }}"
 
 - id: "pagination.newer_posts"
-  translation: "Новые записи"
+  translation: "Новые статьи"
 
 - id: "pagination.older_posts"
-  translation: "Прошлые записи"
+  translation: "Старые статьи"
 
 - id: "pagination.previous"
   translation: "Пред."
@@ -101,7 +101,7 @@
   translation: "в"
 
 - id: "post.tagged_in"
-  translation: "Теги: "
+  translation: "Метки: "
 
 - id: "post.toc"
   translation: "Содержание"

layouts/partials/head.html

@@ -27,7 +27,7 @@
     {{ partial "head_start.html" . }}
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="generator" content="Hugo {{ .Hugo.Version }} with theme Tranquilpeak 0.4.2-BETA">
+    <meta name="generator" content="Hugo {{ .Hugo.Version }} with theme Tranquilpeak 0.4.3-BETA">
     <title>{{ with .Title }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }}</title>
     <meta name="author" content="{{ .Site.Author.name }}">
     <meta name="keywords" content="{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}">

layouts/partials/script.html

@@ -1,6 +1,6 @@
 <!--EXTERNAL SCRIPTS-->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
-{{ if eq .Site.Params.syntaxHighlighter "highligth.js" }}
+{{ if eq .Site.Params.syntaxHighlighter "highlight.js" }}
   <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous"></script>
 {{ else if eq .Site.Params.syntaxHighlighter "prism.js" }}
   <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.3/prism.min.js" integrity="sha256-haEv2ilTk2sXcJaGbkTtErRCHy/qGt3g+bGbgPf5OTY=" crossorigin="anonymous"></script>
@@ -17,7 +17,7 @@
     <script src="{{ . | absURL }}"></script>
   {{ end }}
 {{ end }}
-{{ if eq .Site.Params.syntaxHighlighter "highligth.js" }}
+{{ if eq .Site.Params.syntaxHighlighter "highlight.js" }}
 <script>
 $(document).ready(function() {
   hljs.configure({ classPrefix: '', useBR: false });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-tranquilpeak-theme",
-  "version": "0.4.2-BETA",
+  "version": "0.4.3-BETA",
   "description": "A gorgeous responsive theme for Hugo blog framework",
   "main": "Gruntfile.js",
   "scripts": {