From 2cb5f57c69c94d47f447246edfa49e8519743ee2 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Fri, 21 Feb 2025 20:17:53 +0800 Subject: [PATCH 1/7] Remove flags in language plugins (#8837) * Remove flags in language plugins * Remove references to language icons * Remove obsolete example There are no incoming links to this tiddler * Remove icon from en-GB language * Temporarily add all the languages for testing To be removed before merging * Add new "language" icon * Languageswitcher update * Translator editon docs update * Fixes for introduction edition * Remove LanguageGallery in ja-JP edition * Remove temporary setting --------- Co-authored-by: Jeremy Ruston --- core/acknowledgements.tid | 4 - core/images/language.tid | 5 + core/language/en-GB/icon.tid | 13 - core/ui/PageControls/language.tid | 6 +- core/wiki/languageswitcher.tid | 17 +- .../tiddlers/slides/Translations.tid | 28 +- editions/introduction/tiddlywiki.info | 4 + .../tiddlers/languages/LanguageGallery.tid | 27 -- .../tiddlers/Extracting Translations.tid | 1 - .../tiddlers/images/external/tiddlywiki.files | 202 --------- .../tiddlers/languages/LanguageGallery.tid | 25 -- languages/ar-PS/icon.tid | 7 - languages/ca-ES/icon.tid | 8 - languages/cs-CZ/icon.tid | 9 - languages/da-DK/icon.tid | 9 - languages/de-AT/icon.tid | 8 - languages/de-DE/icon.tid | 12 - languages/el-GR/icon.tid | 8 - languages/en-PH/icon.tid | 21 - languages/en-US/icon.tid | 29 -- languages/es-ES/icon.tid | 409 ------------------ languages/fa-IR/icon.tid | 14 - languages/fr-FR/icon.tid | 5 - languages/he-IL/icon.tid | 38 -- languages/hi-IN/icon.tid | 4 - languages/ia-IA/icon.tid | 13 - languages/it-IT/icon.tid | 32 -- languages/ja-JP/icon.tid | 9 - languages/ko-KR/icon.tid | 15 - languages/mk-MK/icon.tid | 8 - languages/nl-NL/icon.tid | 9 - languages/pa-IN/icon.tid | 4 - languages/pl-PL/icon.tid | 7 - languages/pt-BR/icon.tid | 54 --- languages/pt-PT/icon.tid | 70 --- languages/ru-RU/icon.tid | 10 - languages/sk-SK/icon.tid | 17 - languages/sl-SI/icon.tid | 28 -- languages/sv-SE/icon.tid | 8 - languages/zh-CN/icon.tid | 18 - languages/zh-HK/icon.tid | 16 - languages/zh-Hans/icon.tid | 18 - languages/zh-Hant/icon.tid | 14 - languages/zh-TW/icon.tid | 14 - 44 files changed, 14 insertions(+), 1263 deletions(-) create mode 100644 core/images/language.tid delete mode 100644 core/language/en-GB/icon.tid delete mode 100644 editions/ja-JP/tiddlers/languages/LanguageGallery.tid delete mode 100644 editions/tw5.com/tiddlers/images/external/tiddlywiki.files delete mode 100644 editions/tw5.com/tiddlers/languages/LanguageGallery.tid delete mode 100644 languages/ar-PS/icon.tid delete mode 100644 languages/ca-ES/icon.tid delete mode 100644 languages/cs-CZ/icon.tid delete mode 100644 languages/da-DK/icon.tid delete mode 100644 languages/de-AT/icon.tid delete mode 100644 languages/de-DE/icon.tid delete mode 100644 languages/el-GR/icon.tid delete mode 100644 languages/en-PH/icon.tid delete mode 100644 languages/en-US/icon.tid delete mode 100644 languages/es-ES/icon.tid delete mode 100644 languages/fa-IR/icon.tid delete mode 100644 languages/fr-FR/icon.tid delete mode 100644 languages/he-IL/icon.tid delete mode 100644 languages/hi-IN/icon.tid delete mode 100644 languages/ia-IA/icon.tid delete mode 100644 languages/it-IT/icon.tid delete mode 100644 languages/ja-JP/icon.tid delete mode 100644 languages/ko-KR/icon.tid delete mode 100644 languages/mk-MK/icon.tid delete mode 100644 languages/nl-NL/icon.tid delete mode 100644 languages/pa-IN/icon.tid delete mode 100644 languages/pl-PL/icon.tid delete mode 100644 languages/pt-BR/icon.tid delete mode 100644 languages/pt-PT/icon.tid delete mode 100644 languages/ru-RU/icon.tid delete mode 100644 languages/sk-SK/icon.tid delete mode 100644 languages/sl-SI/icon.tid delete mode 100755 languages/sv-SE/icon.tid delete mode 100644 languages/zh-CN/icon.tid delete mode 100644 languages/zh-HK/icon.tid delete mode 100644 languages/zh-Hans/icon.tid delete mode 100644 languages/zh-Hant/icon.tid delete mode 100644 languages/zh-TW/icon.tid diff --git a/core/acknowledgements.tid b/core/acknowledgements.tid index cb54e3d23..e1015e2c9 100644 --- a/core/acknowledgements.tid +++ b/core/acknowledgements.tid @@ -5,7 +5,3 @@ TiddlyWiki incorporates code from these fine OpenSource projects: * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]] * [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]] * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]] - -And media from these projects: - -* World flag icons from [[Wikipedia|http://commons.wikimedia.org/wiki/Category:SVG_flags_by_country]] diff --git a/core/images/language.tid b/core/images/language.tid new file mode 100644 index 000000000..bb4061495 --- /dev/null +++ b/core/images/language.tid @@ -0,0 +1,5 @@ +title: $:/core/images/language +tags: $:/tags/Image + +\parameters (size:"22pt") +> height=<> class="tc-image-language tc-image-button" viewBox="0 0 92 92"> \ No newline at end of file diff --git a/core/language/en-GB/icon.tid b/core/language/en-GB/icon.tid deleted file mode 100644 index 1967b895f..000000000 --- a/core/language/en-GB/icon.tid +++ /dev/null @@ -1,13 +0,0 @@ -title: $:/languages/en-GB/icon -type: image/svg+xml - - - - - - - - - - - diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid index 3315b5a23..085b3bfd9 100644 --- a/core/ui/PageControls/language.tid +++ b/core/ui/PageControls/language.tid @@ -7,11 +7,7 @@ description: {{$:/language/Buttons/Language/Hint}} <$button popup=<> tooltip={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<> selectedClass="tc-selected"> <%if [match[yes]] %> - - <$set name="languagePluginTitle" value={{$:/language}}> - <$image source=`$(languagePluginTitle)$/icon`/> - - +{{$:/core/images/language}} <%endif%> <%if [match[yes]] %> <$text text={{$:/language/Buttons/Language/Caption}}/> diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid index 48422fca1..7d79c0f5c 100644 --- a/core/wiki/languageswitcher.tid +++ b/core/wiki/languageswitcher.tid @@ -1,25 +1,12 @@ title: $:/snippets/languageswitcher -\define flag-title() -$(languagePluginTitle)$/icon -\end \whitespace trim - <$linkcatcher to="$:/language">
<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]"> -<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
>> +<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"> +
> lang={{!!name}}> <$link> - -<$set name="languagePluginTitle" value=<>> -<$transclude subtiddler=<>> -<$list filter="[all[current]field:title[$:/languages/en-GB]]"> -<$transclude tiddler="$:/languages/en-GB/icon"/> - - - - - <$view field="description"> <$view field="name"> <$view field="title"/> diff --git a/editions/introduction/tiddlers/slides/Translations.tid b/editions/introduction/tiddlers/slides/Translations.tid index 269f2c171..fcff049dd 100644 --- a/editions/introduction/tiddlers/slides/Translations.tid +++ b/editions/introduction/tiddlers/slides/Translations.tid @@ -1,33 +1,9 @@ title: Translations -\define flag-title() -$(languagePluginTitle)$/icon -\end - TiddlyWiki is currently available in <$count filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]] -[[$:/languages/de-AT]]"/> languages: -
-<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]] -[[$:/languages/de-AT]]"> -
- -<$set name="languagePluginTitle" value=<>> -<$transclude subtiddler=<>> -<$list filter="[all[current]field:title[$:/languages/en-GB]]"> -<$transclude tiddler="$:/languages/en-GB/icon"/> - - - -<$view field="description"> -<$view field="name"> -<$view field="title"/> - - -<$view subtiddler="$:/language/ControlPanel/Basics/Language/Prompt"> -<$view tiddler="$:/language/ControlPanel/Basics/Language/Prompt"/> - - -
- +
+{{$:/snippets/languageswitcher}}
Find out how to [[Get Started]]. diff --git a/editions/introduction/tiddlywiki.info b/editions/introduction/tiddlywiki.info index 680730452..420618093 100644 --- a/editions/introduction/tiddlywiki.info +++ b/editions/introduction/tiddlywiki.info @@ -25,6 +25,7 @@ "de-DE", "el-GR", "en-US", + "en-PH", "es-ES", "fa-IR", "fr-FR", @@ -34,12 +35,15 @@ "it-IT", "ja-JP", "ko-KR", + "mk-MK", "nl-NL", "pa-IN", + "pl-PL", "pt-BR", "pt-PT", "ru-RU", "sk-SK", + "sl-SI", "sv-SE", "zh-CN", "zh-Hans", diff --git a/editions/ja-JP/tiddlers/languages/LanguageGallery.tid b/editions/ja-JP/tiddlers/languages/LanguageGallery.tid deleted file mode 100644 index 801cdc72c..000000000 --- a/editions/ja-JP/tiddlers/languages/LanguageGallery.tid +++ /dev/null @@ -1,27 +0,0 @@ -created: 20151231083708980 -modified: 20241221105811581 -original-modified: 20211117212723856 -tags: Languages -title: LanguageGallery Example -ja-title: 言語ギャラリー -type: text/vnd.tiddlywiki - -これは、ListWidgetとTranscludeWidgetを使用して、<>と<>の[[タグ付け|Tagging]]された言語アイコンすべてをグリッド表示する例です。 - - -
-<$list filter="[all[tiddlers+shadows]tag[Language]tag[Icon]]"> ->> -<$transclude/> - - -
diff --git a/editions/translators/tiddlers/Extracting Translations.tid b/editions/translators/tiddlers/Extracting Translations.tid index 3fe559e10..c29d7a40e 100644 --- a/editions/translators/tiddlers/Extracting Translations.tid +++ b/editions/translators/tiddlers/Extracting Translations.tid @@ -12,7 +12,6 @@ Use this procedure if the language being submitted is not already present in the # Create the new language folder `languages/xx-XX` # Copy the language files into the language folder # Create a `plugin.info` file for the translation -# Create an appropriate flag image in `icon.tid` # Add the new language to tw5.com # Submit a pull request diff --git a/editions/tw5.com/tiddlers/images/external/tiddlywiki.files b/editions/tw5.com/tiddlers/images/external/tiddlywiki.files deleted file mode 100644 index 340199e41..000000000 --- a/editions/tw5.com/tiddlers/images/external/tiddlywiki.files +++ /dev/null @@ -1,202 +0,0 @@ -{ - "tiddlers": [ - { - "file": "../../../../../languages/ca-ES/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: ca-ES", - "language": "ca-ES", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/cs-CZ/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: cs-CZ", - "language": "cs-CZ", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/da-DK/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: da-DK", - "language": "da-DK", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/de-AT/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: de-AT", - "language": "de-AT", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/de-DE/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: de-DE", - "language": "de-DE", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/el-GR/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: el-GR", - "language": "el-GR", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/en-US/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: en-US", - "language": "en-US", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/es-ES/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: es-ES", - "language": "es-ES", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/fr-FR/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: fr-FR", - "language": "fr-FR", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/hi-IN/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: hi-IN", - "language": "hi-IN", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/ia-IA/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: ia-IA", - "language": "ia-IA", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/it-IT/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: it-IT", - "language": "it-IT", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/ja-JP/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: ja-JP", - "language": "ja-JP", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/ko-KR/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: ko-KR", - "language": "ko-KR", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/nl-NL/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: nl-NL", - "language": "nl-NL", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/pa-IN/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: pa-IN", - "language": "pa-IN", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/pt-PT/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: pt-PT", - "language": "pt-PT", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/ru-RU/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: ru-RU", - "language": "ru-RU", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/sk-SK/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: sk-SK", - "language": "sk-SK", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/sv-SE/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: sv-SE", - "language": "sv-SE", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/zh-Hans/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: zh-Hans", - "language": "zh-Hans", - "tags": "Language Icon" - } - }, - { - "file": "../../../../../languages/zh-Hant/icon.tid", - "isTiddlerFile": true, - "fields": { - "title": "Language Icon: zh-Hant", - "language": "zh-Hant", - "tags": "Language Icon" - } - } - ] -} diff --git a/editions/tw5.com/tiddlers/languages/LanguageGallery.tid b/editions/tw5.com/tiddlers/languages/LanguageGallery.tid deleted file mode 100644 index cdb972095..000000000 --- a/editions/tw5.com/tiddlers/languages/LanguageGallery.tid +++ /dev/null @@ -1,25 +0,0 @@ -created: 20151231083708980 -modified: 20211117212723856 -tags: Languages -title: LanguageGallery Example -type: text/vnd.tiddlywiki - -Here is an example of using the ListWidget and the TranscludeWidget to show a grid of all of Language Icons which are tiddlers [[tagged|Tagging]] <>and <> - - -
-<$list filter="[all[tiddlers+shadows]tag[Language]tag[Icon]]"> ->> -<$transclude/> - - -
diff --git a/languages/ar-PS/icon.tid b/languages/ar-PS/icon.tid deleted file mode 100644 index fecb187cd..000000000 --- a/languages/ar-PS/icon.tid +++ /dev/null @@ -1,7 +0,0 @@ -created: 20200618172251289 -modified: 20200618172321223 -tags: -title: $:/languages/ar-PS/icon -type: image/svg+xml - - diff --git a/languages/ca-ES/icon.tid b/languages/ca-ES/icon.tid deleted file mode 100644 index 264124da3..000000000 --- a/languages/ca-ES/icon.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/languages/ca-ES/icon -type: image/svg+xml - - - - - - \ No newline at end of file diff --git a/languages/cs-CZ/icon.tid b/languages/cs-CZ/icon.tid deleted file mode 100644 index 4246c25db..000000000 --- a/languages/cs-CZ/icon.tid +++ /dev/null @@ -1,9 +0,0 @@ -title: $:/languages/cs-CZ/icon -type: image/svg+xml - - - - - - - diff --git a/languages/da-DK/icon.tid b/languages/da-DK/icon.tid deleted file mode 100644 index 955f38a94..000000000 --- a/languages/da-DK/icon.tid +++ /dev/null @@ -1,9 +0,0 @@ -title: $:/languages/da-DK/icon -type: image/svg+xml - - - - - - - diff --git a/languages/de-AT/icon.tid b/languages/de-AT/icon.tid deleted file mode 100644 index a0b4315b0..000000000 --- a/languages/de-AT/icon.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/languages/de-AT/icon -type: image/svg+xml - - - - - - \ No newline at end of file diff --git a/languages/de-DE/icon.tid b/languages/de-DE/icon.tid deleted file mode 100644 index 4847c1df0..000000000 --- a/languages/de-DE/icon.tid +++ /dev/null @@ -1,12 +0,0 @@ -title: $:/languages/de-DE/icon -type: image/svg+xml - - - - - Flag of Germany - - - - diff --git a/languages/el-GR/icon.tid b/languages/el-GR/icon.tid deleted file mode 100644 index 787a5f6ad..000000000 --- a/languages/el-GR/icon.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/languages/el-GR/icon -type: image/svg+xml - - - Flag of Greece - - - \ No newline at end of file diff --git a/languages/en-PH/icon.tid b/languages/en-PH/icon.tid deleted file mode 100644 index c664ed2f0..000000000 --- a/languages/en-PH/icon.tid +++ /dev/null @@ -1,21 +0,0 @@ -title: $:/languages/en-PH/icon -type: image/svg+xml - - - Flag of the Philippines - - - - - - - - - - - - - - - - diff --git a/languages/en-US/icon.tid b/languages/en-US/icon.tid deleted file mode 100644 index 78681f521..000000000 --- a/languages/en-US/icon.tid +++ /dev/null @@ -1,29 +0,0 @@ -title: $:/languages/en-US/icon -type: image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/es-ES/icon.tid b/languages/es-ES/icon.tid deleted file mode 100644 index 092788da7..000000000 --- a/languages/es-ES/icon.tid +++ /dev/null @@ -1,409 +0,0 @@ -title: $:/languages/es-ES/icon -type: image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/languages/fa-IR/icon.tid b/languages/fa-IR/icon.tid deleted file mode 100644 index 70e605629..000000000 --- a/languages/fa-IR/icon.tid +++ /dev/null @@ -1,14 +0,0 @@ -title: $:/languages/fa-IR/icon -type: image/svg+xml - - - - - - - - \ No newline at end of file diff --git a/languages/fr-FR/icon.tid b/languages/fr-FR/icon.tid deleted file mode 100644 index a7ec4d9d0..000000000 --- a/languages/fr-FR/icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/languages/fr-FR/icon -type: image/svg+xml - - - diff --git a/languages/he-IL/icon.tid b/languages/he-IL/icon.tid deleted file mode 100644 index c18b4a158..000000000 --- a/languages/he-IL/icon.tid +++ /dev/null @@ -1,38 +0,0 @@ -title: $:/languages/he-IL/icon -type: image/svg+xml - - - - - Flag of Israel - - - - - - - - - - - - diff --git a/languages/hi-IN/icon.tid b/languages/hi-IN/icon.tid deleted file mode 100644 index 4db8115ff..000000000 --- a/languages/hi-IN/icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/languages/hi-IN/icon -type: image/svg+xml - - \ No newline at end of file diff --git a/languages/ia-IA/icon.tid b/languages/ia-IA/icon.tid deleted file mode 100644 index 72eff65ed..000000000 --- a/languages/ia-IA/icon.tid +++ /dev/null @@ -1,13 +0,0 @@ -title: $:/languages/ia-IA/icon -type: image/svg+xml - - - - - Interlingua Logo - Created with Sketch. - - - - - \ No newline at end of file diff --git a/languages/it-IT/icon.tid b/languages/it-IT/icon.tid deleted file mode 100644 index 157744a52..000000000 --- a/languages/it-IT/icon.tid +++ /dev/null @@ -1,32 +0,0 @@ -title: $:/languages/it-IT/icon -type: image/svg+xml - - - - - Bandiera della Repubblica Italiana PMS 20060414 - - - - - \ No newline at end of file diff --git a/languages/ja-JP/icon.tid b/languages/ja-JP/icon.tid deleted file mode 100644 index 56a7d6efb..000000000 --- a/languages/ja-JP/icon.tid +++ /dev/null @@ -1,9 +0,0 @@ -title: $:/languages/ja-JP/icon -type: image/svg+xml - - - - - - - \ No newline at end of file diff --git a/languages/ko-KR/icon.tid b/languages/ko-KR/icon.tid deleted file mode 100644 index 83eda5287..000000000 --- a/languages/ko-KR/icon.tid +++ /dev/null @@ -1,15 +0,0 @@ -title: $:/languages/ko-KR/icon -type: image/svg+xml - - - -Flag of South Korea - - - - - - - - - \ No newline at end of file diff --git a/languages/mk-MK/icon.tid b/languages/mk-MK/icon.tid deleted file mode 100644 index 20525ace9..000000000 --- a/languages/mk-MK/icon.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/languages/mk-MK/icon -type: image/svg+xml - - - - - - diff --git a/languages/nl-NL/icon.tid b/languages/nl-NL/icon.tid deleted file mode 100644 index 9cb61ccea..000000000 --- a/languages/nl-NL/icon.tid +++ /dev/null @@ -1,9 +0,0 @@ -title: $:/languages/nl-NL/icon -type: image/svg+xml - - - - - - - \ No newline at end of file diff --git a/languages/pa-IN/icon.tid b/languages/pa-IN/icon.tid deleted file mode 100644 index 2efc09d0f..000000000 --- a/languages/pa-IN/icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/languages/pa-IN/icon -type: image/svg+xml - - \ No newline at end of file diff --git a/languages/pl-PL/icon.tid b/languages/pl-PL/icon.tid deleted file mode 100644 index 0cecbb24a..000000000 --- a/languages/pl-PL/icon.tid +++ /dev/null @@ -1,7 +0,0 @@ -title: $:/languages/pl-PL/icon -type: image/svg+xml - - - - - \ No newline at end of file diff --git a/languages/pt-BR/icon.tid b/languages/pt-BR/icon.tid deleted file mode 100644 index 28daecd9c..000000000 --- a/languages/pt-BR/icon.tid +++ /dev/null @@ -1,54 +0,0 @@ -title: $:/languages/pt-BR/icon -type: image/svg+xml - - -image/svg+xml \ No newline at end of file diff --git a/languages/pt-PT/icon.tid b/languages/pt-PT/icon.tid deleted file mode 100644 index 8c1589513..000000000 --- a/languages/pt-PT/icon.tid +++ /dev/null @@ -1,70 +0,0 @@ -title: $:/languages/pt-PT/icon -type: image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/languages/ru-RU/icon.tid b/languages/ru-RU/icon.tid deleted file mode 100644 index 3ea67a7b2..000000000 --- a/languages/ru-RU/icon.tid +++ /dev/null @@ -1,10 +0,0 @@ -title: $:/languages/ru-RU/icon -type: image/svg+xml - - - - - - - - \ No newline at end of file diff --git a/languages/sk-SK/icon.tid b/languages/sk-SK/icon.tid deleted file mode 100644 index 626942b82..000000000 --- a/languages/sk-SK/icon.tid +++ /dev/null @@ -1,17 +0,0 @@ -title: $:/languages/sk-SK/icon -type: image/svg+xml - - - -Flag of Slovakia - - - - - - - - - - - \ No newline at end of file diff --git a/languages/sl-SI/icon.tid b/languages/sl-SI/icon.tid deleted file mode 100644 index b3b8d0584..000000000 --- a/languages/sl-SI/icon.tid +++ /dev/null @@ -1,28 +0,0 @@ -title: $:/languages/sl-SI/icon -type: image/svg+xml - - - - - Flag of Slovenia - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/sv-SE/icon.tid b/languages/sv-SE/icon.tid deleted file mode 100755 index e8e16a6ae..000000000 --- a/languages/sv-SE/icon.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/languages/sv-SE/icon -type: image/svg+xml - - - - - - \ No newline at end of file diff --git a/languages/zh-CN/icon.tid b/languages/zh-CN/icon.tid deleted file mode 100644 index 29cb7b9f1..000000000 --- a/languages/zh-CN/icon.tid +++ /dev/null @@ -1,18 +0,0 @@ -title: $:/languages/zh-CN/icon -type: image/svg+xml - - - - -Flag of the People's Republic of China - - - - - - - - - - diff --git a/languages/zh-HK/icon.tid b/languages/zh-HK/icon.tid deleted file mode 100644 index 38c8ff096..000000000 --- a/languages/zh-HK/icon.tid +++ /dev/null @@ -1,16 +0,0 @@ -title: $:/languages/zh-HK/icon -type: image/svg+xml - - - - - - - - - - - - - - \ No newline at end of file diff --git a/languages/zh-Hans/icon.tid b/languages/zh-Hans/icon.tid deleted file mode 100644 index ba8400636..000000000 --- a/languages/zh-Hans/icon.tid +++ /dev/null @@ -1,18 +0,0 @@ -title: $:/languages/zh-Hans/icon -type: image/svg+xml - - - - -Flag of the People's Republic of China - - - - - - - - - - diff --git a/languages/zh-Hant/icon.tid b/languages/zh-Hant/icon.tid deleted file mode 100644 index 97c8f6ab4..000000000 --- a/languages/zh-Hant/icon.tid +++ /dev/null @@ -1,14 +0,0 @@ -title: $:/languages/zh-Hant/icon -type: image/svg+xml - - - - - - - - - - - - \ No newline at end of file diff --git a/languages/zh-TW/icon.tid b/languages/zh-TW/icon.tid deleted file mode 100644 index 5db3cae30..000000000 --- a/languages/zh-TW/icon.tid +++ /dev/null @@ -1,14 +0,0 @@ -title: $:/languages/zh-TW/icon -type: image/svg+xml - - - - - - - - - - - - \ No newline at end of file From 0f79f88f5897296de67148ee0bba0416fa8af607 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 24 Feb 2025 21:49:48 +0100 Subject: [PATCH 2/7] Fix problem toc-selective-expandable (#8959) fix problem toc-selective-expandable --- core/wiki/macros/toc.tid | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid index 2bbc4f6fc..4238c3a46 100644 --- a/core/wiki/macros/toc.tid +++ b/core/wiki/macros/toc.tid @@ -1,7 +1,6 @@ title: $:/core/macros/toc tags: $:/tags/Macro - \define toc-open-icon() $:/core/images/down-arrow \define toc-closed-icon() $:/core/images/right-arrow @@ -121,7 +120,7 @@ tags: $:/tags/Macro <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item" >
  • >> <$link to={{{ [get[target]else] }}}> - <$list filter="[all[current]tagging[]$sort$limit[1]] -[subfilter<__exclude__>]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}"> + <$list filter="[all[current]tagging[]$sort$] -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}"> <$reveal type="nomatch" stateTitle=<> text="open"> <$button setTitle=<> setTo="open" class="tc-btn-invisible tc-popup-keep"> <$transclude tiddler=<> /> @@ -148,7 +147,7 @@ tags: $:/tags/Macro <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix] }}}> <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
  • >> - <$list filter="[all[current]tagging[]$sort$limit[1]] -[subfilter<__exclude__>]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}<>"""> + <$list filter="[all[current]tagging[]$sort$] -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}<>"""> <$reveal type="nomatch" stateTitle=<> text="open"> <$button setTitle=<> setTo="open" class="tc-btn-invisible tc-popup-keep"> <$transclude tiddler=<> /> From 0dda07e3f194f344af7665b6d7fb7fca8970bccb Mon Sep 17 00:00:00 2001 From: Cameron Fischer Date: Thu, 27 Feb 2025 13:02:43 -0500 Subject: [PATCH 3/7] Fix for #5930: missing tiddlers with checkbox indexes (#8964) --- core/modules/widgets/checkbox.js | 2 +- .../tiddlers/tests/test-checkbox-widget.js | 28 +++++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/core/modules/widgets/checkbox.js b/core/modules/widgets/checkbox.js index bf0a7bb79..9d3a07414 100644 --- a/core/modules/widgets/checkbox.js +++ b/core/modules/widgets/checkbox.js @@ -157,7 +157,7 @@ CheckboxWidget.prototype.getValue = function() { if(this.checkboxTag) { return false; } - if(this.checkboxField) { + if(this.checkboxField || this.checkboxIndex) { if(this.checkboxDefault === this.checkboxChecked) { return true; } diff --git a/editions/test/tiddlers/tests/test-checkbox-widget.js b/editions/test/tiddlers/tests/test-checkbox-widget.js index f42a269a9..936f69338 100644 --- a/editions/test/tiddlers/tests/test-checkbox-widget.js +++ b/editions/test/tiddlers/tests/test-checkbox-widget.js @@ -78,6 +78,13 @@ Tests the checkbox widget thoroughly. startsOutChecked: false, expectedChange: { "TiddlerOne": { expand: "yes" } } }, + { + testName: "field mode default when missing -> true", + tiddlers: [], + widgetText: "<$checkbox tiddler='TiddlerOne' field='expand' default='yes' checked='yes' unchecked='no' />", + startsOutChecked: true, + expectedChange: { "TiddlerOne": { expand: "no" } } + }, { testName: "field mode indeterminate -> true", tiddlers: [{title: "TiddlerOne", text: "Jolly Old World", expand: "some other value"}], @@ -98,19 +105,28 @@ Tests the checkbox widget thoroughly. var indexModeTests = fieldModeTests.map(data => { var newData = {...data}; var newName = data.testName.replace('field mode', 'index mode'); + var tiddlerOneAlreadyExists = false; var newTiddlers = data.tiddlers.map(tiddler => { + if(tiddler.title === "TiddlerOne") { + tiddlerOneAlreadyExists = true; + } return {title: tiddler.title, type: "application/x-tiddler-dictionary", text: `one: a\nexpand: ${tiddler.expand}\ntwo: b`} }); var newWidgetText = data.widgetText.replace("field='expand'", "index='expand'"); var newChange = {}; for (var key of Object.keys(data.expectedChange)) { var oldChange = data.expectedChange[key]; - if (oldChange.expand) { - newChange[key] = { text: `one: a\nexpand: ${oldChange.expand}\ntwo: b` } + var text; + if (!tiddlerOneAlreadyExists) { + // If it wasn't there, the created one will be JSON + text = `{\n "expand": "${oldChange.expand}"\n}`; + } else if (oldChange.expand) { + text = `one: a\nexpand: ${oldChange.expand}\ntwo: b`; } else { // In index tiddlers, the "expand" field gets completely removed, not turned into "expand: (undefined)" - newChange[key] = { text: `one: a\ntwo: b` } + text = `one: a\ntwo: b`; } + newChange[key] = { text: text }; } newData.testName = newName; newData.tiddlers = newTiddlers; @@ -514,7 +530,9 @@ Tests the checkbox widget thoroughly. /* * Checkbox widget tests using the test data above */ - for (var data of checkboxTestData) { + // MAKE SURE TO USE $tw.utils.each HERE!!! + // If you use a forloop, the closure of the tests will all use the last value "data" was assigned to, and thus all run the same test. + $tw.utils.each(checkboxTestData, function(data) { it('checkbox widget test: ' + data.testName, function() { // Setup @@ -553,7 +571,7 @@ Tests the checkbox widget thoroughly. } } }) - } + }); }); From 4822919aa40e8c41da7bc4479ef095976bd97b95 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 3 Mar 2025 18:11:16 +0100 Subject: [PATCH 4/7] fix .median sort function (#8971) --- core/modules/filters/math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/filters/math.js b/core/modules/filters/math.js index ed8e5eed6..6b1d45f08 100644 --- a/core/modules/filters/math.js +++ b/core/modules/filters/math.js @@ -128,7 +128,7 @@ exports.minall = makeNumericReducingOperator( exports.median = makeNumericArrayOperator( function(values) { var len = values.length, median; - values.sort(); + values.sort(function(a,b) {return a-b}); if(len % 2) { // Odd, return the middle number median = values[(len - 1) / 2]; From c25d6c11da91b96705892735d9d6909f29982612 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 6 Mar 2025 21:20:37 +0000 Subject: [PATCH 5/7] Update release note --- .../prerelease/tiddlers/Release 5.3.7.tid | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/editions/prerelease/tiddlers/Release 5.3.7.tid b/editions/prerelease/tiddlers/Release 5.3.7.tid index 312808704..1644c9300 100644 --- a/editions/prerelease/tiddlers/Release 5.3.7.tid +++ b/editions/prerelease/tiddlers/Release 5.3.7.tid @@ -15,6 +15,7 @@ description: Under development * French * German +* Japanese ! Plugin Improvements @@ -31,7 +32,8 @@ description: Under development * <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8783"> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/commit/028c80782d105beb90f5d58a7f22e865c7e8c6f4">>) [[Hidden Setting: Default Type for Missing Tiddlers]] * <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8661">> DiffTextWidget colours to several core palettes -* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8807">> Flexoki palette with additional colours +* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8807">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8911">>) Flexoki palette with additional colours +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8837">> [[incorrect|https://localizejs.com/articles/why-using-flag-icons-can-confuse-your-users/]] use of national flags to represent languages ! Hackability Improvements @@ -40,11 +42,29 @@ description: Under development * <<.link-badge-extended "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8816">> 'disabled' attribute to SelectWidget and BrowseWidget * <<.link-badge-extended "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8819">> 'tabindex' attribute to BrowseWidget, RangeWidget, CheckboxWidget and RadioWidget * <<.link-badge-updated "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8821">> the editor link dropdown to use newer syntax +* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8911">> support for images in AVIF format +* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8912">> support for custom MIME types to the [[WidgetMessage: tm-copy-to-clipboard]] ! Bug Fixes * <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8800">> problem with overwriting shadow tiddlers from plugins that do not have a `plugin-priority` field * <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8831">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8835">>) problem with switching language not correctly updating the `lang` attribute of the root `` element +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8842">> bug with refreshing ExternalImages with a `_canonical_uri` field +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8882">> [[unusedtitle Macro]] to trim whitespace from the generated title +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8898">> file extensions and MIME types for font files +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8903">> bug where the wiki would be marked as dirty when a shadow tiddler is changed +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8895">> unnecessary refresh with GenesisWidget +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/d4bc3fcd998902c17cd6bcefdc8d380e5c224458">> [[WidgetMessage: tm-http-request]] to pass custom variables to the progress actions +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8930">> FillWidget to no longer display its content +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8921">> inconsistent whitespace in page toolbar "More" dropdown +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8931">> RSOD with [[contains Operator]] if created field is accessed +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8881">> incorrect .html file extension of exported tiddlers on Android +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8951">> Arabic text using sans-serif font by adding "system-ui" to default font family +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8955">> refresh problem with "save" button +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8721">> [[list-tagged-draggable Macro]] to use the "caption" field if available +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8959">> problem with missing expandable arrow in [[toc-selective-expandable|Table-of-Contents Macros]] +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/5930">> the default value does not working for the CheckboxWidget if it is bound to an index in a data tiddler +* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8970">> [[median Operator]] to order values as numbers, not strings ! Node.js Improvements @@ -60,12 +80,19 @@ description: Under development <<.contributors """ DesignThinkerer +flibbles +galenhuntington IchijikuIchigo +jeremyredhead jrbntt +jryans Leilei332 linonetwo michaeljmcd +opn pmario +Rhys-T +saqimtiaz well-noted xcazin """>> From 636dae6c586455ef080bff5de45fdf9a79cea515 Mon Sep 17 00:00:00 2001 From: Cameron Fischer Date: Thu, 6 Mar 2025 16:28:39 -0500 Subject: [PATCH 6/7] Fixed RSoD error with moduleproperty filter operator (#8958) * Fixed RSoD error with moduleproperty filter operator * No RSoD when getting non-string objects as well --- core/modules/filters/moduleproperty.js | 13 ++++++++++--- editions/test/tiddlers/tests/test-filters.js | 10 ++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/core/modules/filters/moduleproperty.js b/core/modules/filters/moduleproperty.js index 8f3559b09..2aa0e6a0c 100644 --- a/core/modules/filters/moduleproperty.js +++ b/core/modules/filters/moduleproperty.js @@ -18,9 +18,16 @@ Export our filter function exports.moduleproperty = function(source,operator,options) { var results = []; source(function(tiddler,title) { - var value = require(title)[operator.operand || ""]; - if(value !== undefined) { - results.push(value); + try { + var value = require(title)[operator.operand || ""]; + if(value !== undefined) { + if(typeof value !== "string") { + value = JSON.stringify(value); + } + results.push(value); + } + } catch(e) { + // Do nothing. It probably wasn't a module. } }); results.sort(); diff --git a/editions/test/tiddlers/tests/test-filters.js b/editions/test/tiddlers/tests/test-filters.js index 727f64ca4..5626db4f8 100644 --- a/editions/test/tiddlers/tests/test-filters.js +++ b/editions/test/tiddlers/tests/test-filters.js @@ -1134,6 +1134,16 @@ Tests the filtering mechanism. expect(wiki.filterTiddlers("[[<>:\"/\\|?*]encodeuricomponent[]]").join(",")).toBe("%3C%3E%3A%22%2F%5C%7C%3F%2A"); }); + it("should handle the moduleproperty operator", function() { + // We don't need to confirm them all, only it it finds at least one module name that we're sure is there. + expect(wiki.filterTiddlers("[[macro]modules[]moduleproperty[name]]")).toContain("qualify"); + // No such property. Nothing to return. + expect(wiki.filterTiddlers("[[macro]modules[]moduleproperty[nonexistent]]").length).toBe(0); + // No such tiddlers. Nothing to return. + expect(wiki.filterTiddlers("[[nonexistent]moduleproperty[name]]").length).toBe(0); + // Non string properties should get toStringed. + expect(wiki.filterTiddlers("[[$:/core/modules/commands/init.js]moduleproperty[info]]").join(" ")).toBe('{"name":"init","synchronous":true}'); + }); } }); From c3695765ad8b3e46b4dcc89496a2daa331215a81 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 6 Mar 2025 21:29:21 +0000 Subject: [PATCH 7/7] Move execution of startup actions after initialisation of the language switcher (#8950) Fixes #8946 --- core/modules/startup/startup.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/modules/startup/startup.js b/core/modules/startup/startup.js index b971e473b..4013a37ee 100755 --- a/core/modules/startup/startup.js +++ b/core/modules/startup/startup.js @@ -67,14 +67,6 @@ exports.startup = function() { wiki: $tw.wiki, document: $tw.browser ? document : $tw.fakeDocument }); - // Execute any startup actions - $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction"); - if($tw.browser) { - $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser"); - } - if($tw.node) { - $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node"); - } // Kick off the language manager and switcher $tw.language = new $tw.Language(); $tw.languageSwitcher = new $tw.PluginSwitcher({ @@ -117,6 +109,14 @@ exports.startup = function() { handlerMethod: "handleKeydownEvent" }]); } + // Execute any startup actions + $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction"); + if($tw.browser) { + $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser"); + } + if($tw.node) { + $tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node"); + } // Clear outstanding tiddler store change events to avoid an unnecessary refresh cycle at startup $tw.wiki.clearTiddlerEventQueue(); // Find a working syncadaptor