Changeset 1810
- Timestamp:
- 11/03/07 22:06:35 (1 year ago)
- Files:
-
- Trunk/core/js/Formatter.js (modified) (1 diff)
- Trunk/core/js/Lingo.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/core/js/Formatter.js
r1496 r1810 367 367 name: "image", 368 368 match: "\\[[<>]?[Ii][Mm][Gg]\\[", 369 lookaheadRegExp: /\[(<?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg, 369 //# [<] sequence below is to avoid lessThan-questionMark sequence so TiddlyWikis can be included in PHP files 370 lookaheadRegExp: /\[([<]?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg, 370 371 handler: function(w) 371 372 { Trunk/core/js/Lingo.js
r1807 r1810 64 64 mainSaved: "Main TiddlyWiki file saved", 65 65 mainFailed: "Failed to save main TiddlyWiki file. Your changes have not been saved", 66 macroError: "Error in macro << %0>>",67 macroErrorDetails: "Error while executing macro << %0>>:\n%1",66 macroError: "Error in macro <<\%0>>", 67 macroErrorDetails: "Error while executing macro <<\%0>>:\n%1", 68 68 missingMacro: "No such macro", 69 69 overwriteWarning: "A tiddler named '%0' already exists. Choose OK to overwrite it",