Changeset 1287

Timestamp:

12/12/08 06:05:09 (3 years ago)

Author:

SvenDowideit

Message:

Item41: remove the duplicate TAG topics - VarGMTIME2

Location:

trunk/core

Files:

• data/System/VarGMTIME.txt (modified) (1 diff)
• data/System/VarGMTIME2.txt (deleted)
• lib/Foswiki/Contrib/core/MANIFEST (modified) (2 diffs)

trunk/core/data/System/VarGMTIME.txt

@@ -2 +2 @@
 %META:TOPICPARENT{name="Macros"}%
 #VarGMTIME
----+++ GMTIME -- GM time
-   * Syntax: =%<nop>GMTIME%=
-   * Expands to: =%GMTIME%=
-   * Date format defined as {DefaultDateFormat} in [[%SCRIPTURLPATH{"configure"}%][configure]]
+---+++ GMTIME{"format"} -- formatted GM time
+   * Syntax: =%<nop>GMTIME%= OR =%<nop>GMTIME{"format"}%=
+   * =%<nop>GMTIME%= uses the default date format defined by the {DefaultDateFormat} setting in [[%SCRIPTURLPATH{"configure"}%][configure]]
+      * expands to %GMTIME%
+   * Supported special format tokens:
+     | *Token:* | *Unit:* | *Example* |
+     | =$seconds= | seconds | 59 |
+     | =$minutes= | minutes | 59 |
+     | =$hours= | hours | 23 |
+     | =$day= | day of month | 31 |
+     | =$wday= | day of the Week (Sun, Mon, Tue, Wed, Thu, Fri, Sat) | Thu |
+     | =$dow= | day of the week (Sun = 0) | 2  |
+     | =$week= | number of week in year (ISO 8601) | 34 |
+     | =$month= | short name of month | Dec |
+     | =$mo= | 2 digit month | 12 |
+     | =$year= | 4 digit year | 1999 |
+     | =$ye= | 2 digit year | 99 |
+     | =$tz= | either "GMT" (if set to gmtime), or "Local" (if set to servertime) | GMT |
+     | =$iso= | ISO format timestamp | %GMTIME{"$iso"}% |
+     | =$rcs= | RCS format timestamp | %GMTIME{"$rcs"}% |
+     | =$http= | E-mail & http format timestamp | %GMTIME{"$http"}% |
+     | =$epoch= | Number of seconds since 00:00 on 1st January, 1970 | %GMTIME{"$epoch"}% |
+   * Tokens can be shortened to 3 characters
+   * Example: =%<nop>GMTIME{"$day $month, $year - $hour:$min:$sec"}%= expands to =%GMTIME{"$day $month, $year - $hour:$min:$sec"}%=
    * __%X% Note:__ When used in a template topic, this macro will be expanded when the template is used to create a new topic. See TemplateTopics#TemplateTopicsVars for details.
-   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarDISPLAYTIME][DISPLAYTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME2][GMTIME{"format"}]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSERVERTIME][SERVERTIME]]
-
+   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME][GMTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarREVINFO][REVINFO]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSERVERTIME][SERVERTIME]]

trunk/core/lib/Foswiki/Contrib/core/MANIFEST

@@ -190 +190 @@
 data/System/VarDATE.txt 0644
 data/System/VarDISPLAYTIME.txt 0644
-data/System/VarDISPLAYTIME2.txt 0644
 data/System/VarEDITACTION.txt 0644
 data/System/VarENCODE.txt 0644
@@ -199 +198 @@
 data/System/VarFORMFIELD.txt 0644
 data/System/VarGMTIME.txt 0644
-data/System/VarGMTIME2.txt 0644
 data/System/VarGRAY.txt 0644
 data/System/VarGREEN.txt 0644