mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 10:12:04 -05:00
dea71670c0
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
226 lines
6 KiB
Go
226 lines
6 KiB
Go
// Copyright 2017 The Hugo Authors. All rights reserved.
|
|
//
|
|
// 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.
|
|
|
|
package i18n
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/gohugoio/hugo/tpl/tplimpl"
|
|
|
|
"github.com/gohugoio/hugo/langs"
|
|
"github.com/spf13/afero"
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
|
|
"io/ioutil"
|
|
"os"
|
|
|
|
"log"
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
"github.com/spf13/viper"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
var logger = jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
|
|
|
|
type i18nTest struct {
|
|
data map[string][]byte
|
|
args interface{}
|
|
lang, id, expected, expectedFlag string
|
|
}
|
|
|
|
var i18nTests = []i18nTest{
|
|
// All translations present
|
|
{
|
|
data: map[string][]byte{
|
|
"en.toml": []byte("[hello]\nother = \"Hello, World!\""),
|
|
"es.toml": []byte("[hello]\nother = \"¡Hola, Mundo!\""),
|
|
},
|
|
args: nil,
|
|
lang: "es",
|
|
id: "hello",
|
|
expected: "¡Hola, Mundo!",
|
|
expectedFlag: "¡Hola, Mundo!",
|
|
},
|
|
// Translation missing in current language but present in default
|
|
{
|
|
data: map[string][]byte{
|
|
"en.toml": []byte("[hello]\nother = \"Hello, World!\""),
|
|
"es.toml": []byte("[goodbye]\nother = \"¡Adiós, Mundo!\""),
|
|
},
|
|
args: nil,
|
|
lang: "es",
|
|
id: "hello",
|
|
expected: "Hello, World!",
|
|
expectedFlag: "[i18n] hello",
|
|
},
|
|
// Translation missing in default language but present in current
|
|
{
|
|
data: map[string][]byte{
|
|
"en.toml": []byte("[goodbye]\nother = \"Goodbye, World!\""),
|
|
"es.toml": []byte("[hello]\nother = \"¡Hola, Mundo!\""),
|
|
},
|
|
args: nil,
|
|
lang: "es",
|
|
id: "hello",
|
|
expected: "¡Hola, Mundo!",
|
|
expectedFlag: "¡Hola, Mundo!",
|
|
},
|
|
// Translation missing in both default and current language
|
|
{
|
|
data: map[string][]byte{
|
|
"en.toml": []byte("[goodbye]\nother = \"Goodbye, World!\""),
|
|
"es.toml": []byte("[goodbye]\nother = \"¡Adiós, Mundo!\""),
|
|
},
|
|
args: nil,
|
|
lang: "es",
|
|
id: "hello",
|
|
expected: "",
|
|
expectedFlag: "[i18n] hello",
|
|
},
|
|
// Default translation file missing or empty
|
|
{
|
|
data: map[string][]byte{
|
|
"en.toml": []byte(""),
|
|
},
|
|
args: nil,
|
|
lang: "es",
|
|
id: "hello",
|
|
expected: "",
|
|
expectedFlag: "[i18n] hello",
|
|
},
|
|
// Context provided
|
|
{
|
|
data: map[string][]byte{
|
|
"en.toml": []byte("[wordCount]\nother = \"Hello, {{.WordCount}} people!\""),
|
|
"es.toml": []byte("[wordCount]\nother = \"¡Hola, {{.WordCount}} gente!\""),
|
|
},
|
|
args: struct {
|
|
WordCount int
|
|
}{
|
|
50,
|
|
},
|
|
lang: "es",
|
|
id: "wordCount",
|
|
expected: "¡Hola, 50 gente!",
|
|
expectedFlag: "¡Hola, 50 gente!",
|
|
},
|
|
// Same id and translation in current language
|
|
// https://github.com/gohugoio/hugo/issues/2607
|
|
{
|
|
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",
|
|
},
|
|
// 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",
|
|
},
|
|
}
|
|
|
|
func doTestI18nTranslate(t *testing.T, test i18nTest, cfg config.Provider) string {
|
|
assert := require.New(t)
|
|
fs := hugofs.NewMem(cfg)
|
|
tp := NewTranslationProvider()
|
|
|
|
for file, content := range test.data {
|
|
err := afero.WriteFile(fs.Source, filepath.Join("i18n", file), []byte(content), 0755)
|
|
assert.NoError(err)
|
|
}
|
|
|
|
depsCfg := newDepsConfig(tp, cfg, fs)
|
|
d, err := deps.New(depsCfg)
|
|
assert.NoError(err)
|
|
|
|
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 {
|
|
l := langs.NewLanguage("en", cfg)
|
|
l.Set("i18nDir", "i18n")
|
|
return deps.DepsCfg{
|
|
Language: l,
|
|
Cfg: cfg,
|
|
Fs: fs,
|
|
Logger: logger,
|
|
TemplateProvider: tplimpl.DefaultTemplateProvider,
|
|
TranslationProvider: tp,
|
|
}
|
|
}
|
|
|
|
func TestI18nTranslate(t *testing.T) {
|
|
var actual, expected string
|
|
v := viper.New()
|
|
v.SetDefault("defaultContentLanguage", "en")
|
|
v.Set("contentDir", "content")
|
|
v.Set("dataDir", "data")
|
|
v.Set("i18nDir", "i18n")
|
|
v.Set("layoutDir", "layouts")
|
|
v.Set("archetypeDir", "archetypes")
|
|
v.Set("assetDir", "assets")
|
|
v.Set("resourceDir", "resources")
|
|
v.Set("publishDir", "public")
|
|
|
|
// Test without and with placeholders
|
|
for _, enablePlaceholders := range []bool{false, true} {
|
|
v.Set("enableMissingTranslationPlaceholders", enablePlaceholders)
|
|
|
|
for _, test := range i18nTests {
|
|
if enablePlaceholders {
|
|
expected = test.expectedFlag
|
|
} else {
|
|
expected = test.expected
|
|
}
|
|
actual = doTestI18nTranslate(t, test, v)
|
|
require.Equal(t, expected, actual)
|
|
}
|
|
}
|
|
}
|