2017-02-04 22:20:06 -05:00
|
|
|
// Copyright 2017 The Hugo Authors. All rights reserved.
|
2016-09-18 16:18:13 -04:00
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
package i18n
|
2016-09-18 16:18:13 -04:00
|
|
|
|
|
|
|
import (
|
2017-11-06 03:33:24 -05:00
|
|
|
"path/filepath"
|
2016-09-18 16:18:13 -04:00
|
|
|
"testing"
|
|
|
|
|
2017-11-06 03:33:24 -05:00
|
|
|
"github.com/gohugoio/hugo/tpl/tplimpl"
|
|
|
|
|
2018-10-03 08:58:09 -04:00
|
|
|
"github.com/gohugoio/hugo/common/loggers"
|
2018-11-26 04:11:22 -05:00
|
|
|
"github.com/gohugoio/hugo/htesting"
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
"github.com/gohugoio/hugo/langs"
|
2017-11-06 03:33:24 -05:00
|
|
|
"github.com/spf13/afero"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/config"
|
2017-11-06 03:33:24 -05:00
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
2016-09-18 16:18:13 -04:00
|
|
|
"github.com/spf13/viper"
|
2017-02-04 22:20:06 -05:00
|
|
|
"github.com/stretchr/testify/require"
|
2016-09-18 16:18:13 -04:00
|
|
|
)
|
|
|
|
|
2018-10-03 08:58:09 -04:00
|
|
|
var logger = loggers.NewErrorLogger()
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2016-09-20 07:22:56 -04:00
|
|
|
type i18nTest struct {
|
|
|
|
data map[string][]byte
|
|
|
|
args interface{}
|
|
|
|
lang, id, expected, expectedFlag string
|
2016-09-18 16:18:13 -04:00
|
|
|
}
|
|
|
|
|
2016-09-20 07:22:56 -04:00
|
|
|
var i18nTests = []i18nTest{
|
2016-09-20 05:11:57 -04:00
|
|
|
// All translations present
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
2017-04-01 16:36:07 -04:00
|
|
|
"en.toml": []byte("[hello]\nother = \"Hello, World!\""),
|
|
|
|
"es.toml": []byte("[hello]\nother = \"¡Hola, Mundo!\""),
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
2016-09-20 07:22:56 -04:00
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "¡Hola, Mundo!",
|
|
|
|
expectedFlag: "¡Hola, Mundo!",
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
|
|
|
// Translation missing in current language but present in default
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
2017-04-01 16:36:07 -04:00
|
|
|
"en.toml": []byte("[hello]\nother = \"Hello, World!\""),
|
|
|
|
"es.toml": []byte("[goodbye]\nother = \"¡Adiós, Mundo!\""),
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
2016-09-20 07:22:56 -04:00
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "Hello, World!",
|
|
|
|
expectedFlag: "[i18n] hello",
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
|
|
|
// Translation missing in default language but present in current
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
2017-05-03 03:11:25 -04:00
|
|
|
"en.toml": []byte("[goodbye]\nother = \"Goodbye, World!\""),
|
2017-04-01 16:36:07 -04:00
|
|
|
"es.toml": []byte("[hello]\nother = \"¡Hola, Mundo!\""),
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
2016-09-20 07:22:56 -04:00
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "¡Hola, Mundo!",
|
|
|
|
expectedFlag: "¡Hola, Mundo!",
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
|
|
|
// Translation missing in both default and current language
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
2017-04-01 16:36:07 -04:00
|
|
|
"en.toml": []byte("[goodbye]\nother = \"Goodbye, World!\""),
|
|
|
|
"es.toml": []byte("[goodbye]\nother = \"¡Adiós, Mundo!\""),
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
2016-09-20 07:22:56 -04:00
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "",
|
|
|
|
expectedFlag: "[i18n] hello",
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
|
|
|
// Default translation file missing or empty
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
2017-04-01 16:36:07 -04:00
|
|
|
"en.toml": []byte(""),
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
2016-09-20 07:22:56 -04:00
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "",
|
|
|
|
expectedFlag: "[i18n] hello",
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
|
|
|
// Context provided
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
2017-04-01 16:36:07 -04:00
|
|
|
"en.toml": []byte("[wordCount]\nother = \"Hello, {{.WordCount}} people!\""),
|
|
|
|
"es.toml": []byte("[wordCount]\nother = \"¡Hola, {{.WordCount}} gente!\""),
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
|
|
|
args: struct {
|
|
|
|
WordCount int
|
|
|
|
}{
|
|
|
|
50,
|
|
|
|
},
|
2016-09-20 07:22:56 -04:00
|
|
|
lang: "es",
|
|
|
|
id: "wordCount",
|
|
|
|
expected: "¡Hola, 50 gente!",
|
|
|
|
expectedFlag: "¡Hola, 50 gente!",
|
2016-09-20 05:11:57 -04:00
|
|
|
},
|
2017-05-03 03:11:25 -04:00
|
|
|
// Same id and translation in current language
|
2017-06-13 12:47:17 -04:00
|
|
|
// https://github.com/gohugoio/hugo/issues/2607
|
2017-05-03 03:11:25 -04:00
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
|
|
|
"es.toml": []byte("[hello]\nother = \"hello\""),
|
|
|
|
"en.toml": []byte("[hello]\nother = \"hi\""),
|
|
|
|
},
|
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "hello",
|
|
|
|
expectedFlag: "hello",
|
|
|
|
},
|
|
|
|
// Translation missing in current language, but same id and translation in default
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
|
|
|
"es.toml": []byte("[bye]\nother = \"bye\""),
|
|
|
|
"en.toml": []byte("[hello]\nother = \"hello\""),
|
|
|
|
},
|
|
|
|
args: nil,
|
|
|
|
lang: "es",
|
|
|
|
id: "hello",
|
|
|
|
expected: "hello",
|
|
|
|
expectedFlag: "[i18n] hello",
|
|
|
|
},
|
2017-11-06 03:33:24 -05:00
|
|
|
// Unknown language code should get its plural spec from en
|
|
|
|
{
|
|
|
|
data: map[string][]byte{
|
|
|
|
"en.toml": []byte(`[readingTime]
|
|
|
|
one ="one minute read"
|
|
|
|
other = "{{.Count}} minutes read"`),
|
|
|
|
"klingon.toml": []byte(`[readingTime]
|
|
|
|
one = "eitt minutt med lesing"
|
|
|
|
other = "{{ .Count }} minuttar lesing"`),
|
|
|
|
},
|
|
|
|
args: 3,
|
|
|
|
lang: "klingon",
|
|
|
|
id: "readingTime",
|
|
|
|
expected: "3 minuttar lesing",
|
|
|
|
expectedFlag: "3 minuttar lesing",
|
|
|
|
},
|
2016-09-20 05:11:57 -04:00
|
|
|
}
|
|
|
|
|
2017-04-01 16:36:07 -04:00
|
|
|
func doTestI18nTranslate(t *testing.T, test i18nTest, cfg config.Provider) string {
|
2017-11-06 03:33:24 -05:00
|
|
|
assert := require.New(t)
|
|
|
|
fs := hugofs.NewMem(cfg)
|
|
|
|
tp := NewTranslationProvider()
|
2016-09-18 16:18:13 -04:00
|
|
|
|
2017-04-01 16:36:07 -04:00
|
|
|
for file, content := range test.data {
|
2017-11-06 03:33:24 -05:00
|
|
|
err := afero.WriteFile(fs.Source, filepath.Join("i18n", file), []byte(content), 0755)
|
|
|
|
assert.NoError(err)
|
2016-09-18 16:18:13 -04:00
|
|
|
}
|
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
depsCfg := newDepsConfig(tp, cfg, fs)
|
|
|
|
d, err := deps.New(depsCfg)
|
|
|
|
assert.NoError(err)
|
|
|
|
|
2017-11-06 03:33:24 -05:00
|
|
|
assert.NoError(d.LoadResources())
|
|
|
|
f := tp.t.Func(test.lang)
|
|
|
|
return f(test.id, test.args)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func newDepsConfig(tp *TranslationProvider, cfg config.Provider, fs *hugofs.Fs) deps.DepsCfg {
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
l := langs.NewLanguage("en", cfg)
|
2017-11-06 03:33:24 -05:00
|
|
|
l.Set("i18nDir", "i18n")
|
|
|
|
return deps.DepsCfg{
|
|
|
|
Language: l,
|
2018-11-26 04:11:22 -05:00
|
|
|
Site: htesting.NewTestHugoSite(),
|
2017-11-06 03:33:24 -05:00
|
|
|
Cfg: cfg,
|
|
|
|
Fs: fs,
|
|
|
|
Logger: logger,
|
|
|
|
TemplateProvider: tplimpl.DefaultTemplateProvider,
|
|
|
|
TranslationProvider: tp,
|
|
|
|
}
|
2016-09-18 16:18:13 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestI18nTranslate(t *testing.T) {
|
|
|
|
var actual, expected string
|
2017-02-04 22:20:06 -05:00
|
|
|
v := viper.New()
|
|
|
|
v.SetDefault("defaultContentLanguage", "en")
|
2018-03-21 12:21:46 -04:00
|
|
|
v.Set("contentDir", "content")
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
v.Set("dataDir", "data")
|
|
|
|
v.Set("i18nDir", "i18n")
|
|
|
|
v.Set("layoutDir", "layouts")
|
|
|
|
v.Set("archetypeDir", "archetypes")
|
Add Hugo Piper with SCSS support and much more
Before this commit, you would have to use page bundles to do image processing etc. in Hugo.
This commit adds
* A new `/assets` top-level project or theme dir (configurable via `assetDir`)
* A new template func, `resources.Get` which can be used to "get a resource" that can be further processed.
This means that you can now do this in your templates (or shortcodes):
```bash
{{ $sunset := (resources.Get "images/sunset.jpg").Fill "300x200" }}
```
This also adds a new `extended` build tag that enables powerful SCSS/SASS support with source maps. To compile this from source, you will also need a C compiler installed:
```
HUGO_BUILD_TAGS=extended mage install
```
Note that you can use output of the SCSS processing later in a non-SCSSS-enabled Hugo.
The `SCSS` processor is a _Resource transformation step_ and it can be chained with the many others in a pipeline:
```bash
{{ $css := resources.Get "styles.scss" | resources.ToCSS | resources.PostCSS | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen">
```
The transformation funcs above have aliases, so it can be shortened to:
```bash
{{ $css := resources.Get "styles.scss" | toCSS | postCSS | minify | fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen">
```
A quick tip would be to avoid the fingerprinting part, and possibly also the not-superfast `postCSS` when you're doing development, as it allows Hugo to be smarter about the rebuilding.
Documentation will follow, but have a look at the demo repo in https://github.com/bep/hugo-sass-test
New functions to create `Resource` objects:
* `resources.Get` (see above)
* `resources.FromString`: Create a Resource from a string.
New `Resource` transformation funcs:
* `resources.ToCSS`: Compile `SCSS` or `SASS` into `CSS`.
* `resources.PostCSS`: Process your CSS with PostCSS. Config file support (project or theme or passed as an option).
* `resources.Minify`: Currently supports `css`, `js`, `json`, `html`, `svg`, `xml`.
* `resources.Fingerprint`: Creates a fingerprinted version of the given Resource with Subresource Integrity..
* `resources.Concat`: Concatenates a list of Resource objects. Think of this as a poor man's bundler.
* `resources.ExecuteAsTemplate`: Parses and executes the given Resource and data context (e.g. .Site) as a Go template.
Fixes #4381
Fixes #4903
Fixes #4858
2018-02-20 04:02:14 -05:00
|
|
|
v.Set("assetDir", "assets")
|
|
|
|
v.Set("resourceDir", "resources")
|
|
|
|
v.Set("publishDir", "public")
|
2016-09-18 16:18:13 -04:00
|
|
|
|
|
|
|
// Test without and with placeholders
|
|
|
|
for _, enablePlaceholders := range []bool{false, true} {
|
2017-02-04 22:20:06 -05:00
|
|
|
v.Set("enableMissingTranslationPlaceholders", enablePlaceholders)
|
2016-09-18 16:18:13 -04:00
|
|
|
|
2016-09-20 07:22:56 -04:00
|
|
|
for _, test := range i18nTests {
|
2016-09-20 05:11:57 -04:00
|
|
|
if enablePlaceholders {
|
2016-09-20 07:22:56 -04:00
|
|
|
expected = test.expectedFlag
|
2016-09-20 05:11:57 -04:00
|
|
|
} else {
|
|
|
|
expected = test.expected
|
|
|
|
}
|
2017-04-01 16:36:07 -04:00
|
|
|
actual = doTestI18nTranslate(t, test, v)
|
2017-02-04 22:20:06 -05:00
|
|
|
require.Equal(t, expected, actual)
|
2016-09-18 16:18:13 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|