From b4ebcb2ae3f1964d97564a1ee89013e148cbee6c Mon Sep 17 00:00:00 2001
From: Colin Kuskie
Date: Tue, 24 Mar 2009 02:04:31 +0000
Subject: [PATCH] Fix a typo in Navigation help, for page.isDescendant.
Attribution pending.
---
docs/changelog/7.x.x.txt | 2 ++
lib/WebGUI/Help/Asset_Navigation.pm | 2 +-
lib/WebGUI/i18n/English/Asset_Navigation.pm | 8 ++++----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8be2087eb..4bde3cbb9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,8 @@
7.7.1
- rfe #9353: Welcome message template
- rfe #10007: New Month and Year question type. If required, Month must be selected and a 4 digit year must be entered.
+ - fixed #10011: Wrong spelling of "Descendant" in Navigation Asset Help function ()
+
7.7.0
- fixed #9913: New Content Side Bar missing in Asset window
- fixed: New Mail macro never returns any messages
diff --git a/lib/WebGUI/Help/Asset_Navigation.pm b/lib/WebGUI/Help/Asset_Navigation.pm
index 39c764faa..3dac4e2bf 100644
--- a/lib/WebGUI/Help/Asset_Navigation.pm
+++ b/lib/WebGUI/Help/Asset_Navigation.pm
@@ -53,7 +53,7 @@ our $HELP = {
{ 'name' => 'page.isChild' },
{ 'name' => 'page.isParent' },
{ 'name' => 'page.isCurrent' },
- { 'name' => 'page.isDescendent' },
+ { 'name' => 'page.isDescendant' },
{ 'name' => 'page.isAncestor' },
{ 'name' => 'page.inBranchRoot' },
{ 'name' => 'page.isSibling' },
diff --git a/lib/WebGUI/i18n/English/Asset_Navigation.pm b/lib/WebGUI/i18n/English/Asset_Navigation.pm
index 2dae4d4f6..00866ad42 100644
--- a/lib/WebGUI/i18n/English/Asset_Navigation.pm
+++ b/lib/WebGUI/i18n/English/Asset_Navigation.pm
@@ -136,10 +136,10 @@ all of the classes of pages that should be included:
The current page.
Siblings
Pages at the same level as the current URL.
-Descendents
+Descendants
Pages lower than the current page in the tree.
Pedigree
-When using a different start page, this option selects the Ancestors, Siblings and Descendents of that page.
+When using a different start page, this option selects the Ancestors, Siblings and Descendants of that page.
|,
lastUpdated => 1146456217,
},
@@ -372,7 +372,7 @@ the Navigation Template to determine who can see them in the menu.
lastUpdated => 1163720148,
},
- 'page.isDescendent' => {
+ 'page.isDescendant' => {
message => q|A conditional indicating whether this page is a descendant of the current page.|,
lastUpdated => 1163720154,
},
@@ -393,7 +393,7 @@ the Navigation Template to determine who can see them in the menu.
},
'page.inBranch' => {
- message => q|A conditional that is the logical OR of isAncestor, isSibling, isBasepage and isDescendent.|,
+ message => q|A conditional that is the logical OR of isAncestor, isSibling, isBasepage and isDescendant.|,
lastUpdated => 1157647394,
},