From 8286080a70896c37df33a005fca7c4227ed83917 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Wed, 1 May 2019 18:25:40 +0200 Subject: [PATCH 1/4] Multi-language support for Zola is ehh --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a29872e..872da16 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ in the `docs/content` folder of the repository and the community can use [its fo | Syntax highlighting | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | | Sass compilation | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | | Assets co-location | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | -| Multilingual site | ![yes](./is-yes.svg) | ![no](./is-no.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | +| Multilingual site | ![ehh](./is-ehh.svg) | ![no](./is-no.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | | Image processing | ![yes](./is-yes.svg) | ![no](./is-no.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | -| Sane & powerful template engine | ![yes](./is-yes.svg) | ![ehh](./is-ehh.svg) | ![ehh](./is-ehh.svg) | ![yes](./is-yes.svg) | +| Sane & powerful template engine | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | ![ehh](./is-ehh.svg) | ![yes](./is-yes.svg) | | Themes | ![yes](./is-yes.svg) | ![no](./is-no.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | | Shortcodes | ![yes](./is-yes.svg) | ![no](./is-no.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | | Internal links | ![yes](./is-yes.svg) | ![no](./is-no.svg) | ![yes](./is-yes.svg) | ![yes](./is-yes.svg) | @@ -43,11 +43,11 @@ in the `docs/content` folder of the repository and the community can use [its fo - Hugo: markdown, asciidoc, org-mode - Pelican: reStructuredText, markdown, asciidoc, org-mode, whatever-you-want -### Template engine explanation +### ![ehh](./is-ehh.svg) explanations -Cobalt gets ![ehh](./is-ehh.svg) because, while based on [Liquid](https://shopify.github.io/liquid/), the Rust library doesn't implement all its features and there is no documentation on what is and isn't implemented; the errors are cryptic; and Liquid itself is not powerful enough to do some of things you can do in Jinja2, Go templates, or Tera. +Hugo gets ![ehh](./is-ehh.svg) for the template engine because while it is probably the most powerful template engine in the list, after Jinja2, it personally drives me insane, to the point of writing my own template engine and static site generator. Yes, this is a bit biased. -Hugo gets ![ehh](./is-ehh.svg) because while it is probably the most powerful template engine in the list, after Jinja2, it personally drives me insane, to the point of writing my own template engine and static site generator. Yes, this is a bit biased. +Zola gets ![ehh](./is-ehh.svg) for the multi-language support as it only has a basic support and does not offer (yet) things like i18n in templates. ### Pelican notes From 94253361dbf9a393328c3340bcfde9bd3b0700c8 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Wed, 1 May 2019 18:53:21 +0200 Subject: [PATCH 2/4] Update snapcraft.yaml --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index b19a9dd..2b297c1 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: zola -version: 0.6.0 +version: 0.7.0 summary: A fast static site generator in a single binary with everything built-in. description: | A fast static site generator in a single binary with everything built-in. @@ -21,7 +21,7 @@ parts: zola: source-type: git source: https://github.com/getzola/zola.git - source-tag: v0.6.0 + source-tag: v0.7.0 plugin: rust rust-channel: stable build-packages: From 5ae75033acdf2bc933201b5ad268056b6aa043b3 Mon Sep 17 00:00:00 2001 From: toidiu Date: Tue, 7 May 2019 10:17:47 -0400 Subject: [PATCH 3/4] bump version in deployment docs (#680) * bump version in deployment docs --- docs/content/documentation/deployment/github-pages.md | 2 +- docs/content/documentation/deployment/gitlab-pages.md | 2 +- docs/content/documentation/deployment/netlify.md | 2 +- docs/content/themes/even/index.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/documentation/deployment/github-pages.md b/docs/content/documentation/deployment/github-pages.md index 53f1d0f..8e61292 100644 --- a/docs/content/documentation/deployment/github-pages.md +++ b/docs/content/documentation/deployment/github-pages.md @@ -51,7 +51,7 @@ language: minimal before_script: # Download and unzip the zola executable # Replace the version numbers in the URL by the version you want to use - - curl -s -L https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | sudo tar xvzf - -C /usr/local/bin + - curl -s -L https://github.com/getzola/zola/releases/download/v0.7.0/zola-v0.7.0-x86_64-unknown-linux-gnu.tar.gz | sudo tar xvzf - -C /usr/local/bin script: - zola build diff --git a/docs/content/documentation/deployment/gitlab-pages.md b/docs/content/documentation/deployment/gitlab-pages.md index 8613354..f51b298 100644 --- a/docs/content/documentation/deployment/gitlab-pages.md +++ b/docs/content/documentation/deployment/gitlab-pages.md @@ -41,7 +41,7 @@ variables: # This variable will ensure that the CI runner pulls in your theme from the submodule GIT_SUBMODULE_STRATEGY: recursive # Specify the zola version you want to use here - ZOLA_VERSION: "v0.6.0" + ZOLA_VERSION: "v0.7.0" pages: script: diff --git a/docs/content/documentation/deployment/netlify.md b/docs/content/documentation/deployment/netlify.md index 00a0822..c1982a4 100644 --- a/docs/content/documentation/deployment/netlify.md +++ b/docs/content/documentation/deployment/netlify.md @@ -55,7 +55,7 @@ command = "gutenberg build --base-url $DEPLOY_PRIME_URL" Since Netlify doesn't support Zola currently, you will need to download the archive directly from GitHub, replacing the version in the URL with the one you want: ``` -command = "curl -sL https://github.com/getzola/zola/releases/download/v0.6.0/zola-v0.6.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv && ./zola build" +command = "curl -sL https://github.com/getzola/zola/releases/download/v0.7.0/zola-v0.7.0-x86_64-unknown-linux-gnu.tar.gz | tar zxv && ./zola build" ``` ## Manual Deploys diff --git a/docs/content/themes/even/index.md b/docs/content/themes/even/index.md index 8a18e35..94fb19d 100644 --- a/docs/content/themes/even/index.md +++ b/docs/content/themes/even/index.md @@ -116,4 +116,4 @@ katex_enable = true katex_auto_render = true ``` - \ No newline at end of file + From b660649189bdfbfa839ad5bfeea4252af4377f9b Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 7 May 2019 07:18:26 -0700 Subject: [PATCH 4/4] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8853354..f6fec1b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ If you want to add a new feature, please open a thread there first in the featur Sanity check: -* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change? +* [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/getzola/zola/pulls) for the same update/change? ## Code changes (Delete or ignore this section for documentation changes)