diff options
| author | Hauke Stieler <mail@hauke-stieler.de> | 2019-03-29 16:02:59 +0300 |
|---|---|---|
| committer | Hauke Stieler <mail@hauke-stieler.de> | 2019-03-29 16:02:59 +0300 |
| commit | 80c2368c2eb619b8e38492e2b39b4182674765aa (patch) | |
| tree | 6fa8f16b8e821e115c7ef0d401cf1d53041bd09b | |
| parent | ebf48e487d102ea4a22ce69a4619bbbec877bfe5 (diff) | |
| parent | 466005816fdff2b3e00317e74d987863e01dc62f (diff) | |
Merge branch 'dev' into feature/central-image-folder
| -rw-r--r-- | i18n/de.toml | 4 | ||||
| -rw-r--r-- | i18n/en.toml | 4 | ||||
| -rw-r--r-- | layouts/_default/li.html | 2 | ||||
| -rw-r--r-- | layouts/_default/single.html | 2 | ||||
| -rw-r--r-- | layouts/partials/header.html | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/i18n/de.toml b/i18n/de.toml index af97129..b333f42 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -14,8 +14,10 @@ other = "Weiter lesen" [contactMe] other = "Schreibe mir" -[dateformat] +[dateTimeFormat] other = "02.01.2006 um 15:04" +[dateFormat] + other = "02.01.2006" [allTags] other = "Alle Tags" [gdprNotice] diff --git a/i18n/en.toml b/i18n/en.toml index 6d52e6c..a453ca0 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -14,8 +14,10 @@ other = "Read more" [contactMe] other = "Contact me" -[dateformat] +[dateTimeFormat] other = "Jan 2, 2006 at 15:04" +[dateFormat] + other = "Jan 2, 2016" [allTags] other = "All tags" [gdprNotice] diff --git a/layouts/_default/li.html b/layouts/_default/li.html index d69fab6..8e47819 100644 --- a/layouts/_default/li.html +++ b/layouts/_default/li.html @@ -5,7 +5,7 @@ <div class="post-date pull-left"> <span class="li-small"> {{ i18n "postedOn" }} - {{ .Date.Format ( i18n "dateformat" ) }} + {{ .Date.Format ( i18n "dateTimeFormat" ) }} </span> </div> </div> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index bd6b5b7..bbb5917 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -15,7 +15,7 @@ <div class="post-date pull-left"> <span class="small"> {{ i18n "postedOn" }} - {{ .Date.Format ( i18n "dateformat" ) }} + {{ .Date.Format ( i18n "dateTimeFormat" ) }} </span> </div> {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 050e5c9..b1ad349 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -65,7 +65,7 @@ {{ . }} </h3> {{ end }} - {{ if and (ne ( trim .URL "/" ) .Site.Language.Lang) (ne .URL "/") }} + {{ if ( not .IsHome ) }} <a class="btn btn-default btn-home" href="{{ "" | absLangURL }}"> <i class="fa fa-angle-left" aria-hidden="true"></i> {{ i18n "home" }} |