From 7aaab03e032f903f79fa58cb2b39eb24b85ccc7b Mon Sep 17 00:00:00 2001 From: Xavier Cazin Date: Fri, 11 Apr 2014 16:13:32 +0200 Subject: [PATCH 01/10] Another missed update --- languages/fr-FR/TiddlerInfo.multids | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/languages/fr-FR/TiddlerInfo.multids b/languages/fr-FR/TiddlerInfo.multids index 1d390cac2..0c768b57b 100644 --- a/languages/fr-FR/TiddlerInfo.multids +++ b/languages/fr-FR/TiddlerInfo.multids @@ -1,5 +1,14 @@ title: $:/language/TiddlerInfo/ +Advanced/Caption: Avancé +Advanced/PluginInfo/Empty/Hint: aucune information +Advanced/PluginInfo/Heading: Détails sur le plugin +Advanced/PluginInfo/Hint: Ce plugin contient les tiddlers shadow suivants : +Advanced/ShadowInfo/Heading: Statut shadow +Advanced/ShadowInfo/NotShadow/Hint: Le tiddler <$link to=<>><$text text=<>/> n'est pas un tiddler shadow +Advanced/ShadowInfo/Shadow/Hint: Le tiddler <$link to=<>><$text text=<>/> est un tiddler shadow +Advanced/ShadowInfo/Shadow/Source: Il est défini dans le plugin <$link to=<>><$text text=<>/> +Advanced/ShadowInfo/OverriddenShadow/Hint: Il est modifié par un tiddler normal Fields/Caption: Champs List/Caption: Liste List/Empty: Ce tiddler ne contient pas de champ //list// From be7c33dc48efccab460d2a326b82c32a9e92bfed Mon Sep 17 00:00:00 2001 From: Xavier Cazin Date: Fri, 11 Apr 2014 16:23:23 +0200 Subject: [PATCH 02/10] Revert "Another missed update" This reverts commit 7aaab03e032f903f79fa58cb2b39eb24b85ccc7b. --- languages/fr-FR/TiddlerInfo.multids | 9 --------- 1 file changed, 9 deletions(-) diff --git a/languages/fr-FR/TiddlerInfo.multids b/languages/fr-FR/TiddlerInfo.multids index 0c768b57b..1d390cac2 100644 --- a/languages/fr-FR/TiddlerInfo.multids +++ b/languages/fr-FR/TiddlerInfo.multids @@ -1,14 +1,5 @@ title: $:/language/TiddlerInfo/ -Advanced/Caption: Avancé -Advanced/PluginInfo/Empty/Hint: aucune information -Advanced/PluginInfo/Heading: Détails sur le plugin -Advanced/PluginInfo/Hint: Ce plugin contient les tiddlers shadow suivants : -Advanced/ShadowInfo/Heading: Statut shadow -Advanced/ShadowInfo/NotShadow/Hint: Le tiddler <$link to=<>><$text text=<>/> n'est pas un tiddler shadow -Advanced/ShadowInfo/Shadow/Hint: Le tiddler <$link to=<>><$text text=<>/> est un tiddler shadow -Advanced/ShadowInfo/Shadow/Source: Il est défini dans le plugin <$link to=<>><$text text=<>/> -Advanced/ShadowInfo/OverriddenShadow/Hint: Il est modifié par un tiddler normal Fields/Caption: Champs List/Caption: Liste List/Empty: Ce tiddler ne contient pas de champ //list// From d9b87055bf55b31adc1d98d59116c0f7cd05996a Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Sun, 13 Apr 2014 14:34:17 +0800 Subject: [PATCH 03/10] Add chinese translations of confirmation for cancelling edits --- languages/zh-Hans/Misc.multids | 5 +++-- languages/zh-Hant/Misc.multids | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index 40f0483ae..33726e749 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -3,8 +3,9 @@ title: $:/language/ ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全相容新版 TiddlyWiki 的格式，详细信息请参阅：http://tiddlywiki.com/static/Upgrading。 ClassicWarning/Upgrade/Caption: 升级 CloseAll/Button: 全部关闭 -ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<>/>" ? -ConfirmOverwriteTiddler: 您确定要覆写条目 "<$text text=<<title>>/>" ? +ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<<title>>/>" 的更改？ +ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"？ +ConfirmOverwriteTiddler: 您确定要覆写条目 "<$text text=<<title>>/>"？ InvalidFieldName: 栏位名称 "<$text text=<<fieldName>>/>" 包含无效字符，栏位名称只能包含小写字母和底线 (`_`)、 连字号 (`-`) 和小数点 (`.`) MissingTiddler/Hint: 佚失条目 "<$text text=<<currentTiddler>>/>" - 点击 {{$:/core/images/edit-button}} 可创建此条目 RecentChanges/DateFormat: YYYY年0MM月0DD日 diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids index 1789bfe85..c553c6a69 100644 --- a/languages/zh-Hant/Misc.multids +++ b/languages/zh-Hant/Misc.multids @@ -3,8 +3,9 @@ title: $:/language/ ClassicWarning/Hint: 此條目以經典版 TiddlyWiki 標記格式撰寫，不完全相容新版 TiddlyWiki 的格式，詳細資訊請參閱：http://tiddlywiki.com/static/Upgrading。 ClassicWarning/Upgrade/Caption: 升級 CloseAll/Button: 全部關閉 -ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>" ? -ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>" ? +ConfirmCancelTiddler: 您確定要放棄對條目 "<$text text=<<title>>/>" 的更改？ +ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>"？ +ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"？ InvalidFieldName: 欄位名稱 "<$text text=<<fieldName>>/>" 包含無效字元，欄位名稱只能包含小寫字母和底線 (`_`)、 連接號 (`-`) 和小數點 (`.`) MissingTiddler/Hint: 佚失條目 "<$text text=<<currentTiddler>>/>" - 點擊 {{$:/core/images/edit-button}} 可建立此條目 RecentChanges/DateFormat: YYYY年0MM月0DD日 From 260d3ad8c0d5d20b7a2b22b83a16d7916052849f Mon Sep 17 00:00:00 2001 From: Jermolene <jeremy@osmosoft.com> Date: Sun, 13 Apr 2014 09:23:57 +0100 Subject: [PATCH 04/10] Docs typo --- editions/tw5.com/tiddlers/widgets/ListWidget.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid index 1e2ec848d..08b69e2c5 100644 --- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid @@ -33,7 +33,7 @@ The `<$list>` widget can optionally render draft tiddlers through a different te !! `storyview` attribute -The `storyview` attribute gives the specifies the name of an optional module that can animate changes to the list (including navigation). The core ships with the following storyview modules: +The `storyview` attribute specifies the name of an optional module that can animate changes to the list (including navigation). The core ships with the following storyview modules: * `classic`: renders the list as an ordered sequence of tiddlers * `zoomin`: just renders the current tiddler from the list, with a zoom animation for navigating between tiddlers From 46969fbd3e26daa54c2d8c595dcd7b27f3c28cae Mon Sep 17 00:00:00 2001 From: Jermolene <jeremy@osmosoft.com> Date: Sun, 13 Apr 2014 09:24:06 +0100 Subject: [PATCH 05/10] Adjust Cecily tiddler width --- plugins/tiddlywiki/cecily/cecily.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tiddlywiki/cecily/cecily.js b/plugins/tiddlywiki/cecily/cecily.js index 37a30f371..e24977325 100644 --- a/plugins/tiddlywiki/cecily/cecily.js +++ b/plugins/tiddlywiki/cecily/cecily.js @@ -85,7 +85,7 @@ CecilyStoryView.prototype.loadMap = function() { this.map = this.listWidget.wiki.getTiddlerData(this.getMapTiddlerTitle(),{ positions: {}, newTiddlerPosition: {x: 0, y: 0}, - width: 600 + width: 660 }); }; From bba7e97f60445310e8174ebd1030e5c5350e1834 Mon Sep 17 00:00:00 2001 From: Xavier Cazin <xcazin@immateriel.fr> Date: Sun, 13 Apr 2014 16:55:13 +0200 Subject: [PATCH 06/10] fr-FR translation of the confirmation string before cancelling tiddler changes --- languages/fr-FR/Misc.multids | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids index b2e7bbbcd..f33f03180 100644 --- a/languages/fr-FR/Misc.multids +++ b/languages/fr-FR/Misc.multids @@ -3,6 +3,7 @@ title: $:/language/ ClassicWarning/Hint: Ce tiddler est écrit au format TiddlyWiki Classic, qui n'est pas entièrement compatible avec TiddlyWiki version 5. Pour en savoir plus, rendez-vous à l'adresse http://tiddlywiki.com/static/Upgrading.html. ClassicWarning/Upgrade/Caption: Mettre à jour CloseAll/Button: Tout fermer +ConfirmCancelTiddler: Souhaitez-vous annuler les modifications apportées au tiddler « <$text text=<<title>>/> » ? ConfirmDeleteTiddler: Souhaitez-vous supprimer le tiddler « <$text text=<<title>>/> » ? ConfirmOverwriteTiddler: Souhaitez-vous écraser le tiddler « <$text text=<<title>>/> » ? InvalidFieldName: Caractères illicites dans le nom du champ « <$text text=<<fieldName>>/> ». Les champs ne peuvent contenir que des lettres minuscules non accentuées et les caractères souligné (`_`), tiret (`-`) et point (`.`) From 93b9d16d6c3f849f7f27853176860beb6cddca16 Mon Sep 17 00:00:00 2001 From: Jermolene <jeremy@osmosoft.com> Date: Sun, 13 Apr 2014 21:16:54 +0100 Subject: [PATCH 07/10] Don't include pipe characters in URLs --- core/modules/parsers/wikiparser/rules/extlink.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js index 2a7671c8d..36bb372a8 100644 --- a/core/modules/parsers/wikiparser/rules/extlink.js +++ b/core/modules/parsers/wikiparser/rules/extlink.js @@ -26,7 +26,7 @@ exports.types = {inline: true}; exports.init = function(parser) { this.parser = parser; // Regexp to match - this.matchRegExp = /~?(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s'"<>]+(?:\/|\b)/mg; + this.matchRegExp = /~?(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s\|'"<>]+(?:\/|\b)/mg; }; exports.parse = function() { From f1578d3409624c87756a1baf69e792692fe77527 Mon Sep 17 00:00:00 2001 From: Jermolene <jeremy@osmosoft.com> Date: Sun, 13 Apr 2014 21:17:14 +0100 Subject: [PATCH 08/10] Turn off instrumentation All those console.log()s make editing very slow --- core/modules/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/startup.js b/core/modules/startup.js index 694435514..4827332ad 100755 --- a/core/modules/startup.js +++ b/core/modules/startup.js @@ -13,7 +13,7 @@ This is the main application logic for both the client and server "use strict"; // Set to `true` to enable performance instrumentation -var PERFORMANCE_INSTRUMENTATION = true; +var PERFORMANCE_INSTRUMENTATION = false; var widget = require("$:/core/modules/widgets/widget.js"); From c2d6086bd93002f724f4e28eefea0df46a0528b6 Mon Sep 17 00:00:00 2001 From: Jermolene <jeremy@osmosoft.com> Date: Sun, 13 Apr 2014 21:17:43 +0100 Subject: [PATCH 09/10] Show fewer tiddlers in recent changes --- core/wiki/recentchanges.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/wiki/recentchanges.tid b/core/wiki/recentchanges.tid index e9999902f..48c9f677a 100644 --- a/core/wiki/recentchanges.tid +++ b/core/wiki/recentchanges.tid @@ -1,6 +1,6 @@ title: $:/snippets/recentchanges -<$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]"> +<$list filter="[!is[system]has[modified]!sort[modified]limit[250]eachday[modified]]"> <div class="tw-menu-list-item"> <$view field="modified" format="date" template={{$:/language/RecentChanges/DateFormat}}/> <$list filter="[sameday{!!modified}!is[system]!sort[modified]]"> From 22a529b28df5bcd6f0866650d752d2cea84031fa Mon Sep 17 00:00:00 2001 From: Jermolene <jeremy@osmosoft.com> Date: Mon, 14 Apr 2014 08:57:50 +0100 Subject: [PATCH 10/10] New ribbon colour for 5.0.9 --- editions/tw5.com/tiddlers/system/github-fork-ribbon.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid b/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid index 0b2636ef1..f6e39ce93 100644 --- a/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid +++ b/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid @@ -3,6 +3,6 @@ tags: $:/tags/PageControls <div class="github-fork-ribbon-wrapper right" style> -<div class="github-fork-ribbon" style="background-color:#A3D53A;"><$link to="ReleaseHistory"><<version>></$link></div> +<div class="github-fork-ribbon" style="background-color:#FFBB3D;"><$link to="ReleaseHistory"><<version>></$link></div> </div> \ No newline at end of file