Simplify staticman posts and add staticman translations

halogenica · Nov 18, 2017 · d68cf2e · d68cf2e
1 parent bc68b06
commit d68cf2e
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ comments:
   allowedFields: ["name", "email", "website", "comment"]
   branch            : "master"
   commitMessage     : "New comment in {options.slug}"
-  path: "data/comments/{options.slug}/{options.parent}"
+  path: "data/comments/{options.slug}"
   filename          : "comment-{@timestamp}"
   format            : "yaml"
   moderation        : true

diff --git a/i18n/de.yaml b/i18n/de.yaml
@@ -39,3 +39,21 @@
   translation: "Suche {{ .Site.Title }}"
 - id: gcseClose
   translation: "Schließen"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
diff --git a/i18n/en.yaml b/i18n/en.yaml
@@ -39,3 +39,21 @@
   translation: "Search {{ .Site.Title }}"
 - id: gcseClose
   translation: "Close"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
diff --git a/i18n/es-ES.yaml b/i18n/es-ES.yaml
@@ -39,3 +39,22 @@
   translation: "Buscar en {{ .Site.Title }}"
 - id: gcseClose
   translation: "Cerrar"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
+
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
@@ -39,3 +39,19 @@
   translation: "Rechercher {{ .Site.Title }}"
 - id: gcseClose
   translation: "Fermer"
+
+# Staticman
+- id: noComment
+  translation: "Pas de commentaire"
+- id: oneComment
+  translation: "commentaire"
+- id: moreComment
+  translation: "commentaires"
+- id: useMarkdown
+  translation: "Vous pouvez utiliser la syntaxe Markdown"
+- id: yourName
+  translation: "Votre nom"
+- id: yourEmail
+  translation: "Votre addresse mail"
+- id: yourWebsite
+  translation: "Votre site web"
diff --git a/i18n/ja.yaml b/i18n/ja.yaml
@@ -37,3 +37,23 @@
   translation: "{{ .Site.Title }}を検索"
 - id: gcseClose
   translation: "閉じる"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
+
+
diff --git a/i18n/pl.yaml b/i18n/pl.yaml
@@ -39,3 +39,22 @@
   translation: "Szukaj {{ .Site.Title }}"
 - id: gcseClose
   translation: "Zamknij"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
+
diff --git a/i18n/ru.yaml b/i18n/ru.yaml
@@ -39,3 +39,23 @@
   translation: "Поиск по {{ .Site.Title }}"
 - id: gcseClose
   translation: "Закрыть"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
+
+
diff --git a/i18n/zh.yaml b/i18n/zh.yaml
@@ -39,3 +39,22 @@
   translation: "搜索 {{ .Site.Title }}"
 - id: gcseClose
   translation: "关闭"
+
+# Staticman
+- id: noComment
+  translation: "No comment"
+- id: oneComment
+  translation: "comment"
+- id: moreComment
+  translation: "comments"
+- id: useMarkdown
+  translation: "You can use Markdown syntax"
+- id: yourName
+  translation: "Your name"
+- id: yourEmail
+  translation: "Your email address"
+- id: yourWebsite
+  translation: "You website"
+
+
+
diff --git a/layouts/partials/staticman-comments.html b/layouts/partials/staticman-comments.html
@@ -1,14 +1,21 @@
 <section class="js-comments staticman-comments">
-  <h3>Comments</h3>
 
   {{ $slug := replace .URL "/" "" }}
-  {{ $.Scratch.Add "hasComments" 0 }}
 
-<!-- Parse all parent comment -->
- {{ range $index, $comments := (index $.Site.Data.comments $slug ) }}
- <!-- Check if comment has 0 parent -->
-  {{ if eq $index "0" }}
-    {{ range $comments}}
+  {{ $comments := index $.Site.Data.comments $slug }}
+  {{ if $comments }}
+    {{ if gt (len $comments) 1  }}
+      <h3>{{ len $comments  }} {{ i18n "moreComment" }}</h3>
+    {{ else }}
+      <h3>{{ len $comments  }} {{ i18n "oneComment" }}</h3>
+    {{ end }}
+  {{ else }}
+    <h3>{{ i18n "noComment" }}</h3>
+  {{ end }}
+
+  {{ $.Scratch.Set "hasComments" 0 }}
+  {{ range $index, $comments := (index $.Site.Data.comments $slug ) }}
+    {{ if not .parent }}
       {{ $.Scratch.Add "hasComments" 1 }}
       <article id="comment-{{ $.Scratch.Get "hasComments" }}" class="static-comment">
         <img class="comment-avatar" src="https://www.gravatar.com/avatar/{{ .email }}?s=48">
@@ -20,15 +27,14 @@ <h4 class="comment-author">{{ .name }}</h4>
         <div class="comment-timestamp"><a href="#comment-{{ $.Scratch.Get "hasComments" }}" title="Permalink to this comment"><time datetime="{{ .date }}">{{ dateFormat (default (i18n "shortdateFormat") .Site.Params.dateformat) .date}}</time></a></div>
         <div class="comment-content"><p>{{ .comment | markdownify }}</p></div>
       </article>
-      {{ end }}
+    {{ end }}
   {{ end }}
- {{ end }}
 
 
 
 <form class="js-form form" method="post" action="{{ .Site.Params.staticman.api}}">
   <input type="hidden" name="options[slug]" value="{{ replace .URL "/" "" }}">
-  <input type="hidden" name="options[parent]" value="0">
+  <input type="hidden" name="options[parent]" value="">
 
   {{ if .Site.Params.staticman.recaptcha }}
   <input type="hidden" name="options[reCaptcha][siteKey]" value="{{ .Site.Params.staticman.recaptcha.sitekey }}">
@@ -37,25 +43,25 @@ <h4 class="comment-author">{{ .name }}</h4>
 
   <fieldset>
   <div class="textfield">
-    <textarea name="fields[comment]" type="text" placeholder="You can use Markdown syntax"></textarea>
+    <textarea name="fields[comment]" type="text" placeholder="{{ i18n "useMarkdown" }}"></textarea>
   </div>
   </fieldset>
 
   <fieldset>
     <div class="textfield">
-      <input name="fields[name]" type="text" placeholder="Your name"/>
+      <input name="fields[name]" type="text" placeholder="{{ i18n "yourName" }}"/>
     </div>
   </fieldset>
 
   <fieldset>
     <div class="textfield">
-      <input type="email" name="fields[email]"  placeholder="Your email (optional, used only to send comments.)"/>
+      <input type="email" name="fields[email]"  placeholder="{{ i18n "yourEmail" }}"/>
     </div>
   </fieldset>
 
   <fieldset>
     <div class="textfield">
-      <input type="text" name="fields[website]"  placeholder="Your website"/>
+      <input type="text" name="fields[website]"  placeholder="{{ i18n "yourWebsite" }}"/>
     </div>
   </fieldset>