diff --git a/content/_index.jp.md b/content/_index.jp.md index 897c38a..1b3328e 100644 --- a/content/_index.jp.md +++ b/content/_index.jp.md @@ -1,5 +1,5 @@ --- -title: "Home" +title: "トップ" --- 進行中... diff --git a/content/art/_content.gotmpl b/content/art/_content.gotmpl index 27bc824..5ebd6ca 100644 --- a/content/art/_content.gotmpl +++ b/content/art/_content.gotmpl @@ -54,6 +54,7 @@ "height" (index $sizes.full $basename).height "thumb_width" (index $sizes.thumb $basename).width "thumb_height" (index $sizes.thumb $basename).height + "filename" $basename }} {{ $path := $basename }} diff --git a/content/art/_content.jp.gotmpl b/content/art/_content.jp.gotmpl index 646ac27..24bea3f 100644 --- a/content/art/_content.jp.gotmpl +++ b/content/art/_content.jp.gotmpl @@ -30,32 +30,6 @@ {{ $title = . }} {{ end }} - {{ $params := dict - "slug" $basename - "alt_text" $data.alt_text - "artist" $data.artist - "excludefeed" $exclude_feed - "arttags" $data.tags - "characters" $data.characters - "nsfw" $data.nsfw - "mastodon_url" $data.mastodon_url - "pixiv_url" $data.pixiv_url - "newgrounds_url" $data.newgrounds_url - "program" $data.program - "guest" (eq $year "guest") - "threed" (eq $data.type "3D") - "animation" (eq $data.type "Animation") - "orbit" (index $data "camera-orbit") - "target" (index $data "camera-target") - "fov" (index $data "camera-fov") - "comic" (eq $data.type "Comic") - "pages" $data.pages - "width" (index $sizes.full $basename).width - "height" (index $sizes.full $basename).height - "thumb_width" (index $sizes.thumb $basename).width - "thumb_height" (index $sizes.thumb $basename).height - }} - {{ $path := $basename }} {{ if eq $year "guest" }} {{ $path = (printf "guest/%s" $basename) }} @@ -73,6 +47,38 @@ {{ $year = index $split 0 }} {{ end }} + {{ $filename := $basename }} + {{ if $val.filename }} + {{ $filename = $val.filename }} + {{ end }} + + {{ $params := dict + "slug" $basename + "alt_text" $data.alt_text + "artist" $data.artist + "excludefeed" $exclude_feed + "arttags" $data.tags + "characters" $data.characters + "nsfw" $data.nsfw + "mastodon_url" $data.mastodon_url + "pixiv_url" $data.pixiv_url + "newgrounds_url" $data.newgrounds_url + "program" $data.program + "guest" (eq $year "guest") + "threed" (eq $data.type "3D") + "animation" (eq $data.type "Animation") + "orbit" (index $data "camera-orbit") + "target" (index $data "camera-target") + "fov" (index $data "camera-fov") + "comic" (eq $data.type "Comic") + "pages" $data.pages + "width" (index $sizes.full $basename).width + "height" (index $sizes.full $basename).height + "thumb_width" (index $sizes.thumb $basename).width + "thumb_height" (index $sizes.thumb $basename).height + "filename" $filename + }} + {{ $langPage := dict "slug" $basename "content" $content @@ -83,7 +89,6 @@ "params" $params "layout" "art-detail" }} - {{ warnf $langPage.path }} {{ $.AddPage $langPage }} {{ end }} {{ end }} diff --git a/data/art/2024/another-thursday.json b/data/art/2024/another-thursday.json index b61c2ce..89e7922 100644 --- a/data/art/2024/another-thursday.json +++ b/data/art/2024/another-thursday.json @@ -11,7 +11,7 @@ "title": "Another Thursday", "languages": { "jp": { - "title": "めるめ外出!" + "title": "の木曜日" } } } diff --git a/data/art/2024/idcheck.json b/data/art/2024/idcheck.json index cf89427..24b8910 100644 --- a/data/art/2024/idcheck.json +++ b/data/art/2024/idcheck.json @@ -15,7 +15,8 @@ "title": "Viera ID Check", "languages": { "jp": { - "title": "ヴィエラそ して 彼女 身分証明書" + "title": "ヴィエラそ して 彼女 身分証明書", + "filename": "idcheck-jp" } } } diff --git a/i18n/en.yaml b/i18n/en.yaml index b348578..111b343 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -3,3 +3,4 @@ social_media: Accounts date: Date characters: Characters program: Program +tags: Tags diff --git a/i18n/jp.yaml b/i18n/jp.yaml index a6aca33..e1fa80a 100644 --- a/i18n/jp.yaml +++ b/i18n/jp.yaml @@ -3,3 +3,4 @@ social_media: ソーシャルメディア date: 期 characters: 作中人物 program: ソフトウェア +tags: タグ diff --git a/themes/red/layouts/_default/art-detail.html b/themes/red/layouts/_default/art-detail.html index 0cfad98..b52eb01 100644 --- a/themes/red/layouts/_default/art-detail.html +++ b/themes/red/layouts/_default/art-detail.html @@ -6,8 +6,8 @@