Now that we have conditional static templating, get rid of redundant templating variables (allTaggedPage + latestTaggedPage)

share/defaultWording.conf

@@ -1,12 +1,10 @@
 allLink = See all
-allPage = All articles
+allPage = All articles{? tagged ${tag}?}
-allTaggedPage = All articles tagged ${tag}
 commentsLink = Comment on the fediverse
 commentsSection = Comments
 dateFormat = en-US
 latestLink = See only latest
-latestPage = Latest articles
+latestPage = Latest articles{? tagged ${tag}?}
-latestTaggedPage = Latest articles tagged ${tag}
 metadata = {?by ${author} ?}on ${date}{? tagged ${tags}?}
 rssLink = Subscribe
 rssTitle = Follow all articles{? tagged ${tag}?}

share/js/domRenderer.js

@@ -66,12 +66,7 @@ function DomRenderer(modules) {
 	}
 
 	function pageTitle(tag, all) {
-		if(tag != undefined) {
+		return modules.template.render(all ? 'allPage' : 'latestPage', {tag: tag});
-			var template = all ? 'allTaggedPage' : 'latestTaggedPage';
-			return modules.template.render(template, {tag: tag});
-		} else {
-			return blog.wording[all ? 'allPage' : 'latestPage'];
-		}
 	}
 
 	function otherUrl(tag, all) {

src/ArticlesList.hs

@@ -34,13 +34,10 @@ otherURL (ArticlesList {full, collection}) = absoluteLink $
 
 description :: Renderer m => ArticlesList -> m Text
 description (ArticlesList {full, collection}) =
-  getDescription (full, tag collection)
+  template page . environment $ tag collection
   where
-    getDescription (True, Nothing) = template "allPage" []
+    page = if full then "allPage" else "latestPage"
-    getDescription (True, Just tag) = template "allTaggedPage" [("tag", pack tag)]
+    environment = maybe [] $ \value -> [("tag", pack value)]
-    getDescription (False, Nothing) = template "latestPage" []
-    getDescription (False, Just tag) =
-      template "latestTaggedPage" [("tag", pack tag)]
 
 rssLinkTexts :: Renderer m => ArticlesList -> m (Text, Text)
 rssLinkTexts (ArticlesList {collection}) = do

src/Blog/Wording.hs

@@ -25,14 +25,12 @@ newtype Wording = Wording (Map String Text)
 variables :: Map String [Text]
 variables = Map.fromList [
       ("allLink", [])
-    , ("allPage", [])
+    , ("allPage", ["tag"])
-    , ("allTaggedPage", ["tag"])
     , ("commentsLink", [])
     , ("commentsSection", [])
     , ("dateFormat", [])
     , ("latestLink", [])
-    , ("latestPage", [])
+    , ("latestPage", ["tag"])
-    , ("latestTaggedPage", ["tag"])
     , ("metadata", ["author", "date", "tags"])
     , ("rssLink", [])
     , ("rssTitle", ["tag"])