Skip to content

Commit 026df93

Browse files
authored
Merge pull request #232 from kakawait/develop
Release 0.4.3-BETA
2 parents ab91755 + 4db24ee commit 026df93

File tree

10 files changed

+45
-30
lines changed

10 files changed

+45
-30
lines changed

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [0.4.3-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/18) - 12 nov 2017
6+
7+
- 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))
8+
- Russian translation enhancement ([#227](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/227))
9+
10+
### Breaking changes
11+
12+
Since I did an error on `highlight.js` for parameter `syntaxHighlighter`, sorry but you have to change it again for the correct typo
13+
14+
```toml
15+
[params]
16+
syntaxHighlighter = "highlight.js"
17+
```
18+
519
## [0.4.2-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/17) - 1 nov 2017
620

721
- 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`
2135

2236
```toml
2337
[params]
38+
# There is a typo on highligth.js (which should be highlight.js instead, please checkout version 0.4.3-BETA to get fix)
2439
syntaxHighlighter = "highligth.js"
2540
```
2641

@@ -39,7 +54,7 @@ Please upgrade you're `config.toml` (you can checkout `exampleSite/config.toml`
3954
- _OLDER POSTS_ Button Overlaps Sidebar
4055
- Print media queries
4156
- Load external resources using SRI ([#159](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/159))
42-
- 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))
57+
- 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))
4358
- Improve `customJS` and `customCSS`
4459
- Now support both abs and rel url ([#155](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/155))
4560
- Add more customization than just url ([#163](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/163))

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
3434
## General
3535

3636
- **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
37-
- **Version**: 0.4.2-BETA (based on Hexo version 1.10.0)
37+
- **Version**: 0.4.3-BETA (based on Hexo version 1.10.0)
3838
- **Compatibility**: Hugo v0.20.1
3939

4040
## Features

docs/developer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
2828
## General ##
2929

3030
- **Author** : Thibaud Leprêtre
31-
- **Version** : 0.4.2-BETA (based on Hexo version 1.10.0)
31+
- **Version** : 0.4.3-BETA (based on Hexo version 1.10.0)
3232
- **Compatibility** : Hugo v0.20.1
3333

3434
## Requirements ##

docs/user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
5454
## General
5555

5656
- **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
57-
- **Version**: 0.4.2-BETA (based on Hexo version 1.10.0)
57+
- **Version**: 0.4.3-BETA (based on Hexo version 1.10.0)
5858
- **Compatibility**: Hugo v0.20.1
5959

6060
## Features

exampleSite/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tranquilpeak
2-
# Version : 0.4.2-BETA
2+
# Version : 0.4.3-BETA
33
# Author : Thibaud Leprêtre
44

55
# I STRONGLY recommend you to use a CDN to speed up loading of pages.
@@ -107,9 +107,9 @@ canonifyurls = true
107107
# Global keywords configuration. Following keywords will be add to every pages
108108
# keywords = ["development", "next-gen"]
109109

110-
# Syntax highlighter, possible choice between: "highligth.js" (recommanded) and "prism.js" (experimental)
111-
# You can comment it to disable syntax highligthing
112-
syntaxHighlighter = "highligth.js"
110+
# Syntax highlighter, possible choice between: "highlight.js" (recommanded) and "prism.js" (experimental)
111+
# You can comment it to disable syntax highlighting
112+
syntaxHighlighter = "highlight.js"
113113

114114
# 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)
115115
clearReading = true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Welcome to Tranquilpeak 0.4.2-BETA"
2+
title: "Welcome to Tranquilpeak 0.4.3-BETA"
33
date: 2015-06-15
44
categories:
55
- tranquilpeak
@@ -65,7 +65,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
6565
## General
6666

6767
- **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
68-
- **Version**: 0.4.2-BETA (based on Hexo version 1.10.0)
68+
- **Version**: 0.4.3-BETA (based on Hexo version 1.10.0)
6969
- **Compatibility**: Hugo v0.20.1
7070

7171
## Features

i18n/ru.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
translation: "Раздел"
1010

1111
- id: "global.tags"
12-
translation: "Теги"
12+
translation: "Метки"
1313

1414
- id: "global.tag"
15-
translation: "Тег"
15+
translation: "Метка"
1616

1717
- id: "global.archives"
1818
translation: "Архив"
@@ -24,22 +24,22 @@
2424
translation: "Об авторе"
2525

2626
- id: "global.author_picture"
27-
translation: "Авторская фотография"
27+
translation: "Фотография автора"
2828

2929
- id: "global.share_on"
3030
translation: "Поделиться в %s"
3131

3232
- id: "global.mail"
33-
translation: "Mail"
33+
translation: "Почта"
3434

3535
- id: "global.rss"
3636
translation: "RSS"
3737

3838
- id: "global.search_category"
39-
translation: "Поиск по разделу"
39+
translation: "Поиск по разделам"
4040

4141
- id: "global.search_tag"
42-
translation: "Поиск по тегу"
42+
translation: "Поиск по меткам"
4343

4444
- id: "global.search_date"
4545
translation: "Поиск по дате (ГГГГ/ММ/ДД)"
@@ -52,27 +52,27 @@
5252
translation: "Найдена 1 статья"
5353

5454
- id: "global.posts_found.other"
55-
translation: "Статей найдено: {n}"
55+
translation: "Найдено статей: {n}"
5656

5757
## GLOBAL.CATEGORIES_FOUND ##
5858
- id: "global.categories_found.zero"
59-
translation: "Категории не найдены"
59+
translation: "Разделов не найдено"
6060

6161
- id: "global.categories_found.one"
62-
translation: "Найдена 1 категория "
62+
translation: "Найден 1 раздел "
6363

6464
- id: "global.categories_found.other"
65-
translation: "Категорий нашлось: {n}"
65+
translation: "Нашлось разделов: {n}"
6666

6767
## GLOBAL.TAGS_FOUND ##
6868
- id: "global.tags_found.zero"
69-
translation: "Теги не найдены"
69+
translation: "Метки не найдены"
7070

7171
- id: "global.tags_found.one"
72-
translation: "Найден 1 тег"
72+
translation: "Найдена 1 метка"
7373

7474
- id: "global.tags_found.other"
75-
translation: "Тегов найдено: {n}"
75+
translation: "Найдено меток: {n}"
7676

7777
## PAGINATION ##
7878
- id: "pagination.page"
@@ -82,10 +82,10 @@
8282
translation: "из {{ .Paginator.TotalPages }}"
8383

8484
- id: "pagination.newer_posts"
85-
translation: "Новые записи"
85+
translation: "Новые статьи"
8686

8787
- id: "pagination.older_posts"
88-
translation: "Прошлые записи"
88+
translation: "Старые статьи"
8989

9090
- id: "pagination.previous"
9191
translation: "Пред."
@@ -101,7 +101,7 @@
101101
translation: "в"
102102

103103
- id: "post.tagged_in"
104-
translation: "Теги: "
104+
translation: "Метки: "
105105

106106
- id: "post.toc"
107107
translation: "Содержание"

layouts/partials/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{{ partial "head_start.html" . }}
2828
<meta charset="UTF-8">
2929
<meta name="viewport" content="width=device-width, initial-scale=1">
30-
<meta name="generator" content="Hugo {{ .Hugo.Version }} with theme Tranquilpeak 0.4.2-BETA">
30+
<meta name="generator" content="Hugo {{ .Hugo.Version }} with theme Tranquilpeak 0.4.3-BETA">
3131
<title>{{ with .Title }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }}</title>
3232
<meta name="author" content="{{ .Site.Author.name }}">
3333
<meta name="keywords" content="{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}">

layouts/partials/script.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--EXTERNAL SCRIPTS-->
22
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
3-
{{ if eq .Site.Params.syntaxHighlighter "highligth.js" }}
3+
{{ if eq .Site.Params.syntaxHighlighter "highlight.js" }}
44
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous"></script>
55
{{ else if eq .Site.Params.syntaxHighlighter "prism.js" }}
66
<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 @@
1717
<script src="{{ . | absURL }}"></script>
1818
{{ end }}
1919
{{ end }}
20-
{{ if eq .Site.Params.syntaxHighlighter "highligth.js" }}
20+
{{ if eq .Site.Params.syntaxHighlighter "highlight.js" }}
2121
<script>
2222
$(document).ready(function() {
2323
hljs.configure({ classPrefix: '', useBR: false });

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hugo-tranquilpeak-theme",
3-
"version": "0.4.2-BETA",
3+
"version": "0.4.3-BETA",
44
"description": "A gorgeous responsive theme for Hugo blog framework",
55
"main": "Gruntfile.js",
66
"scripts": {

0 commit comments

Comments
 (0)