diff --git a/README.md b/README.md index 91801ce1bad4da534bf13dad51294dbe415a9b70..804cb25ffd4a86e085ff3fbf1aebe1fa28528659 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,11 @@ The date format for the output can be specified with the parameter `--date-forma All confirguration values can also be specified in a configuration file. The configuration file can be specified with the `--config` parameter. +If no path is specified, the configuration file `config.yaml` is first searched for in the working directory. +If this is not found, the file is searched for in the home directory `~/.config/requirements-manager/config.yaml`. + +Finally, we look for the configuration in the `/etc/requirements-manager/config.yaml` directory. + The parameter `path` specifies the path. ### Help diff --git a/application/source/config.go b/application/source/config.go index 26fd3db624dc935ac833a1cd8abf9f3f8124793f..ddbce27e7e5aa8ba73ffc80bff54364f349ffab5 100644 --- a/application/source/config.go +++ b/application/source/config.go @@ -50,7 +50,7 @@ type Configuration struct { Template struct { Add string `yaml:"Add"` } `yaml:"Template"` - } `yaml:"Requirement"` + } `yaml:"Document"` } func fileExists(name string) (found bool) { diff --git a/application/source/defaults.go b/application/source/defaults.go index 4ed8228086d17a8e41bc193e7e741c78deb1fd40..b959a9b8bf8c8ee0f14249b061d6f93a00cdc435 100644 --- a/application/source/defaults.go +++ b/application/source/defaults.go @@ -40,9 +40,9 @@ block-headings: true {{.Items}} {{ end}}{{ if .HasRequirements }} -## Document +## Documents -{{.Document}} +{{.Documents}} {{ end}} @@ -64,7 +64,7 @@ Type: null Alias: null Keywords: - - Requirement + - Document # First and last name of the authors as a list Author: diff --git a/application/source/l10n.go b/application/source/l10n.go index fe5c3e8fefb273cd11f73980e62fe2bd5520a169..67771ac4f0e9d7237e252550f70227059ff07d27 100644 --- a/application/source/l10n.go +++ b/application/source/l10n.go @@ -243,7 +243,7 @@ var l10nMap = []l10nKeyTranslation{ }, { "RequirementID", []l10nLocaleTranslation{ - {"de", "Document"}, + {"de", "Documents"}, {"en", "Anforderungen"}, }, }, {