From 752a8669c0d7f926a1f92a4817cc047986c1c42b Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 16 Dec 2005 00:27:44 +0000
Subject: [PATCH] bugfix, SF#1381551 for non-english dates updated
 documentation for Post(new template vars) and ZipArchive(moved file add/edit
 related help from template to add/edit)

---
 docs/changelog/6.x.x.txt              |  1 +
 lib/WebGUI/DateTime.pm                |  2 +-
 lib/WebGUI/Help/Asset_ZipArchive.pm   |  8 ++++----
 lib/WebGUI/i18n/English/Asset_Post.pm | 26 +++++++++++++++++++-------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 32dc9467c..802b909a3 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,6 +2,7 @@
  - fixed a problem with enabling Avatars in the Collaboration System.
  - fixed a problem with op=editUser where it would use profile field
    values of the current user.
+ - fix [ 1381551 ] epochToHuman for foreign languages
 
 6.8.2
  - fix [ 1378871 ] become this user doesn't work
diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm
index 4cc5968ab..c4ba1e1dc 100644
--- a/lib/WebGUI/DateTime.pm
+++ b/lib/WebGUI/DateTime.pm
@@ -203,7 +203,7 @@ A string representing the output format for the date. Defaults to '%z %Z'. You c
 =cut
 
 sub epochToHuman {
-	my $language = WebGUI::International::get($session{user}{language});
+	my $language = WebGUI::International::getLanguage($session{user}{language});
 	my $locale = $language->{languageAbbreviation} || "en";
 	$locale .= "_".$language->{locale} if ($language->{locale});
 	my $timeZone = $session{user}{timeZone} || "America/Chicago";
diff --git a/lib/WebGUI/Help/Asset_ZipArchive.pm b/lib/WebGUI/Help/Asset_ZipArchive.pm
index 4a6dd0fbf..82911b5e9 100644
--- a/lib/WebGUI/Help/Asset_ZipArchive.pm
+++ b/lib/WebGUI/Help/Asset_ZipArchive.pm
@@ -32,6 +32,10 @@ our $HELP = {
 				tag => 'zip archive template',
 				namespace => 'Asset_ZipArchive',
 			},
+			{
+				tag => 'file add/edit',
+				namespace => 'Asset_File',
+			},
 		]
 	},
 
@@ -41,10 +45,6 @@ our $HELP = {
 		fields => [
 		],
 		related => [
-			{
-				tag => 'file add/edit',
-				namespace => 'Asset_File',
-			},
 			{
 				tag => 'template language',
 				namespace => 'Asset_Template',
diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm
index 4fb697b0d..5668746ec 100644
--- a/lib/WebGUI/i18n/English/Asset_Post.pm
+++ b/lib/WebGUI/i18n/English/Asset_Post.pm
@@ -37,6 +37,10 @@ The synopsis of the Post that is being replied to.
 The content of the Post that is being replied to.
 <p>
 
+<b>reply.userDefined<i>N</i></b><br>
+The contents of user defined fields for the Post that is being replied to, where N is from 1 to 5.
+<p>
+
 <b>subscribe.form</b><br>
 A yes/no button to allow the user to subscribe to the thread this post belongs to.
 <p>
@@ -94,7 +98,7 @@ A form where the user can enter their name.
 <p>
 
 <b>userDefined<i>N</i>.{form,form.yesNo,form.textarea,form.htmlarea}</b><br>
-For each of the 5 User Defined fields, form widgets for a single line of text, a yes/no
+For each of the 5 User Defined fields, which can be form widgets for a single line of text, a yes/no
 field, a text area, or a WYSIWIG HTML area.
 <p>
 
@@ -142,7 +146,7 @@ A form that will set when the post stops being available.
 <p>
 
 |,
-		lastUpdated => 1132758282,
+		lastUpdated => 1134670945,
 	},
 
 	'post template variables title' => {
@@ -232,6 +236,10 @@ URLs that are used to rate this post.  N goes from 1 to 5.
 A conditional that is true if the user has already rated this Post.
 <p>
 
+<b>isMarkedRead</b><br>
+A conditional that is true if the post has been marked as read by the user.
+<p>
+
 <b>image.url</b><br>
 The URL to the first image attached to the Post.
 <p>
@@ -240,10 +248,6 @@ The URL to the first image attached to the Post.
 A thumbnail for the image attached to the Post.
 <p>
 
-<b>attachment.name</b><br>
-The name of the first attachment found on the Post.
-<p>
-
 <b>attachment.url</b><br>
 The URL to download the first attachment attached to the Post.
 <p>
@@ -252,6 +256,10 @@ The URL to download the first attachment attached to the Post.
 An icon showing the file type of this attachment.
 <p>
 
+<b>attachment.name</b><br>
+The name of the first attachment found on the Post.
+<p>
+
 <b>attachment_loop</b><br>
 A loop containing all file and image attachments to this Post.
 <p>
@@ -316,6 +324,10 @@ The type of content in the post, typically "code", "text", "HTML", "mixed".
 The contents of the user defined properties, from 1 to 5.
 <p>
 
+<b>content</b><br>
+The content, or body, of the Post.
+<p>
+
 <b>title</b><br>
 The title of the Post.
 <p>
@@ -373,7 +385,7 @@ A conditional indicating whether this Post should be opened in a new window.
 <p>
 
 |,
-		lastUpdated => 1111602134,
+		lastUpdated => 1134670360,
 	},
 
 	'approved' => {