Make relative time format available for GitBlame

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / AppUtils.h

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index 4d9afda..17e34e9 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -164,8 +164,13 @@ public:
        /**\r
         * FUNCTION    :   FormatDateAndTime\r
         * DESCRIPTION :   Generates a displayable string from a CTime object in\r
        /**\r
         * FUNCTION    :   FormatDateAndTime\r
         * DESCRIPTION :   Generates a displayable string from a CTime object in\r

-        *                 system short or long format dependant on setting of option\r
-        *                                 as DATE_SHORTDATE or DATE_LONGDATE. bIncludeTime (optional) includes time.\r
+        *                 system short or long format  or as a relative value\r
+        *                                 cTime - the time\r
+        *                                 option - DATE_SHORTDATE or DATE_LONGDATE\r
+        *                                 bIncluedeTime - whether to show time as well as date\r
+        *                                 bRelative - if true then relative time is shown if reasonable \r
+        *                                 If HKCU\Software\TortoiseGit\UseSystemLocaleForDates is 0 then use fixed format\r
+        *                                 rather than locale\r

         * RETURN      :   CString containing date/time\r
         */\r
        static CString FormatDateAndTime( const CTime& cTime, DWORD option, bool bIncludeTime=true,\r
         * RETURN      :   CString containing date/time\r
         */\r
        static CString FormatDateAndTime( const CTime& cTime, DWORD option, bool bIncludeTime=true,\r


@@ -173,7 +178,6 @@ public:
        /**\r
         *      Converts a given time to a relative display string (relative to current time)\r
         *      Given time must be in local timezone\r
        /**\r
         *      Converts a given time to a relative display string (relative to current time)\r
         *      Given time must be in local timezone\r

-        *  If more than a year ago or in the future then normal date/time is shown\r

         */\r
        static CString ToRelativeTimeString(CTime time);\r
 \r
         */\r
        static CString ToRelativeTimeString(CTime time);\r
 \r


@@ -183,8 +187,6 @@ private:
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r
        /**\r
         *      Generates a display string showing the relative time between the two given times as COleDateTimes\r
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r
        /**\r
         *      Generates a display string showing the relative time between the two given times as COleDateTimes\r

-        *      time must be earlier than RelativeTo\r
-        *  If more than a year ago or time > RelativeTo then an empty string is returned\r

         */\r
        static CString ToRelativeTimeString(COleDateTime time,COleDateTime RelativeTo);\r
 };\r
         */\r
        static CString ToRelativeTimeString(COleDateTime time,COleDateTime RelativeTo);\r
 };\r