From aa1fcf4b6745abcfd08a569d4bac7669a9e298f2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 23 Jul 2009 19:36:04 +0000
Subject: [PATCH] Fix i18n and Help for StoryArchive, Story

---
 docs/changelog/7.x.x.txt                      |  1 +
 lib/WebGUI/Help/Asset_Story.pm                | 29 -------------------
 lib/WebGUI/Help/Asset_StoryArchive.pm         |  2 +-
 lib/WebGUI/i18n/English/Asset_Story.pm        | 10 -------
 lib/WebGUI/i18n/English/Asset_StoryArchive.pm |  6 ++++
 5 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c7e53d8f3..c4f1f820c 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -28,6 +28,7 @@
  - fixed #10687: i18n Asset_Product::buy_form_options
  - fixed #10651: Dashboard Content positions
  - fixed #10695: Adding a new article creates a new version tag
+ - fixed #10693: double titels in help for Story Archive view template
 
 7.7.15
  - fixed #10629: WebGUI::ProfileField create new field bug
diff --git a/lib/WebGUI/Help/Asset_Story.pm b/lib/WebGUI/Help/Asset_Story.pm
index 902a74b27..2e3feaa94 100644
--- a/lib/WebGUI/Help/Asset_Story.pm
+++ b/lib/WebGUI/Help/Asset_Story.pm
@@ -97,32 +97,6 @@ our $HELP = {
         related => []
     },
 
-    'story asset template variables' => {
-        private => 1,
-        title   => 'story asset template variables title',
-        body    => '',
-        isa     => [
-            {   namespace => 'Asset',
-                tag       => 'asset template asset variables'
-            },
-        ],
-        fields    => [],
-        variables => [
-            { name => 'headline',
-              description => 'headline tmplvar',
-            },
-            { name => 'subtitle',
-              description => 'subtitle tmplvar',
-            },
-            { name => 'byline',
-              description => 'byline tmplvar',
-            },
-            { name      => 'updatedTime', },
-            { name      => 'updatedTimeEpoch', },
-        ],
-        related => []
-    },
-
     'story asset template variables' => {
         private => 1,
         title   => 'story asset template variables title',
@@ -155,9 +129,6 @@ our $HELP = {
             { name => 'photo',
               description => 'photo tmplvar',
             },
-            { name => 'storageId',
-              description => 'storageId tmplvar',
-            },
         ],
         related => []
     },
diff --git a/lib/WebGUI/Help/Asset_StoryArchive.pm b/lib/WebGUI/Help/Asset_StoryArchive.pm
index cbf5c8852..57bf4bec6 100644
--- a/lib/WebGUI/Help/Asset_StoryArchive.pm
+++ b/lib/WebGUI/Help/Asset_StoryArchive.pm
@@ -78,7 +78,7 @@ our $HELP = {
 
 
     'keyword list template' => {
-        title => 'view template',
+        title => 'keyword list template',
         body  => '',
         isa   => [
             {   namespace => "Asset_Template",
diff --git a/lib/WebGUI/i18n/English/Asset_Story.pm b/lib/WebGUI/i18n/English/Asset_Story.pm
index caaf98103..6d167b0c5 100644
--- a/lib/WebGUI/i18n/English/Asset_Story.pm
+++ b/lib/WebGUI/i18n/English/Asset_Story.pm
@@ -274,22 +274,12 @@ our $I18N = {
         lastUpdated => 0,
     },
 
-    'storageId tmplvar' => {
-        message => q|The photo JSON blob from the Story asset.|,
-        lastUpdated => 0,
-    },
-
     'ago' => {
         message => q|ago|,
         context => q|As in the phrase, Last updated 3 hours ago.|,
         lastUpdated => 0,
     },
 
-    'storageId tmplvar' => {
-        message => q|The photo JSON blob from the Story asset.|,
-        lastUpdated => 0,
-    },
-
     'story asset template variables title' => {
         message => q|Story Asset Template Variables.|,
         context => q|Title of a help page for asset level template variables.|,
diff --git a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm
index d50bf868e..f54a45951 100644
--- a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm
+++ b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm
@@ -171,6 +171,12 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'keyword list template' => {
+        message => q|Story Archive, Keyword List Template|,
+        context => q|Title of a help page.|,
+        lastUpdated => 0,
+    },
+
     'view template' => {
         message => q|Story Archive, View Template|,
         context => q|Title of a help page.|,