From c43cd325caffdef7d7823b82988d08adb3ffcf47 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sat, 15 Feb 2014 11:32:11 +0000 Subject: [PATCH] Reduce the inconsistent use of "language" vs. "lingo" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now we’re just using the word “lingo” for the macro defined in PageTemplate (where the abbreviation is useful), and using the full word “language” everywhere else. It’s possible that we should be using “locale” instead of “language”, what do you think? --- core/language/en-GB/ControlPanel.tids | 2 +- core/language/en-GB/languageprompt.tid | 2 +- core/modules/pluginswitcher.js | 2 +- core/ui/ControlPanel/Basics.tid | 6 +++--- core/wiki/languageswitcher.tid | 2 +- .../tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid | 4 ++-- languages/de-AT/languageprompt.tid | 2 +- languages/en-US/languageprompt.tid | 2 +- languages/fr-FR/languageprompt.tid | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/language/en-GB/ControlPanel.tids b/core/language/en-GB/ControlPanel.tids index 246418d85..2006bc5fc 100644 --- a/core/language/en-GB/ControlPanel.tids +++ b/core/language/en-GB/ControlPanel.tids @@ -1,4 +1,4 @@ -title: $:/lingo/ControlPanel/ +title: $:/language/ControlPanel/ Basics/Caption: Basics Basics/Version: ~TiddlyWiki version diff --git a/core/language/en-GB/languageprompt.tid b/core/language/en-GB/languageprompt.tid index 4ae10351a..1c9a742f9 100644 --- a/core/language/en-GB/languageprompt.tid +++ b/core/language/en-GB/languageprompt.tid @@ -1,3 +1,3 @@ -title: $:/lingo/ControlPanel/Language/prompt +title: $:/language/ControlPanel/Language/prompt Hello! Current language: \ No newline at end of file diff --git a/core/modules/pluginswitcher.js b/core/modules/pluginswitcher.js index 0b07b3c48..473e1b351 100644 --- a/core/modules/pluginswitcher.js +++ b/core/modules/pluginswitcher.js @@ -3,7 +3,7 @@ title: $:/core/modules/pluginswitcher.js type: application/javascript module-type: global -Manages switching plugins for themes and lingo. +Manages switching plugins for themes and languages. \*/ (function(){ diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid index f513604c4..b53be5730 100644 --- a/core/ui/ControlPanel/Basics.tid +++ b/core/ui/ControlPanel/Basics.tid @@ -1,15 +1,15 @@ title: $:/core/ui/ControlPanel/Basics tags: $:/tags/ControlPanel -caption: {{$:/lingo/ControlPanel/Basics/Caption}} +caption: {{$:/language/ControlPanel/Basics/Caption}} -\define lingo-base() $:/lingo/ControlPanel/ +\define lingo-base() $:/language/ControlPanel/ |<> |''<>'' | |<$link to="SiteTitle"><> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> | |<$link to="SiteSubtitle"><> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> | |<$link to="$:/status/UserName"><> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> | |<$link to="$:/config/AnimationDuration"><> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> | |<$link to="$:/DefaultTiddlers"><> |<>
<$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// | -|{{$:/lingo/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} | +|{{$:/language/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} | |<> |''<$count filter="[!is[system]]"/>'' | |<> |''<$count filter="[tags[]]"/>'' | |<> |''<$count filter="[is[system]]"/>'' | diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid index a14d3518e..2c99e0b29 100644 --- a/core/wiki/languageswitcher.tid +++ b/core/wiki/languageswitcher.tid @@ -1,6 +1,6 @@ title: $:/snippets/languageswitcher -{{$:/lingo/ControlPanel/Language/prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/> +{{$:/language/ControlPanel/Language/prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/> <$linkcatcher to="$:/language"> <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]">
<$reveal state="$:/language" type="match" text={{!!title}}>•<$reveal state="$:/language" type="nomatch" text={{!!title}}>  <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/>
diff --git a/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid b/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid index 6e84f2326..815eaef9c 100644 --- a/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid +++ b/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid @@ -16,7 +16,7 @@ MultiTiddlerFiles have the extension `tids`. The file is structured as a block o For axample: ``` -title: $:/lingo/ControlPanel/ +title: $:/language/ControlPanel/ tags: strings modifier: JoeBloggs @@ -25,6 +25,6 @@ Basics/Caption: Basics Basics/Version: ~TiddlyWiki Version ``` -This example defines two tiddlers, ''"""$:/lingo/ControlPanel/Basics/Caption"""'' and ''"""$:/lingo/ControlPanel/Basics/Version"""''. +This example defines two tiddlers, ''"""$:/language/ControlPanel/Basics/Caption"""'' and ''"""$:/language/ControlPanel/Basics/Version"""''. If a `title` field is specified in the header then it is treated as a prefix for the individual tiddlers defined in the title. diff --git a/languages/de-AT/languageprompt.tid b/languages/de-AT/languageprompt.tid index 304b822b4..ec895ed5e 100644 --- a/languages/de-AT/languageprompt.tid +++ b/languages/de-AT/languageprompt.tid @@ -1,3 +1,3 @@ -title: $:/lingo/ControlPanel/Language/prompt +title: $:/language/ControlPanel/Language/prompt Hallo! Aktuelle Sprache: \ No newline at end of file diff --git a/languages/en-US/languageprompt.tid b/languages/en-US/languageprompt.tid index b27355356..4e588833c 100644 --- a/languages/en-US/languageprompt.tid +++ b/languages/en-US/languageprompt.tid @@ -1,3 +1,3 @@ -title: $:/lingo/ControlPanel/Language/prompt +title: $:/language/ControlPanel/Language/prompt Hiya! Current language: \ No newline at end of file diff --git a/languages/fr-FR/languageprompt.tid b/languages/fr-FR/languageprompt.tid index 395559e9c..528435b96 100644 --- a/languages/fr-FR/languageprompt.tid +++ b/languages/fr-FR/languageprompt.tid @@ -1,3 +1,3 @@ -title: $:/lingo/ControlPanel/Language/prompt +title: $:/language/ControlPanel/Language/prompt Bonjour! Langage courant: \ No newline at end of file