mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-10-31 23:26:18 +00:00
Code Issues Releases Wiki Activity

Reduce the inconsistent use of "language" vs. "lingo"

Browse Source 
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?
This commit is contained in:
Jermolene 2014-02-15 11:32:11 +00:00
parent e9ba7f3d70
commit c43cd325ca
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/language/en-GB/ControlPanel.tids
View File

@ -1,4 +1,4 @@
title: $:/lingo/ControlPanel/ title: $:/language/ControlPanel/
Basics/Caption: Basics Basics/Caption: Basics
Basics/Version: ~TiddlyWiki version Basics/Version: ~TiddlyWiki version

2
core/language/en-GB/languageprompt.tid
View File

@ -1,3 +1,3 @@
title: $:/lingo/ControlPanel/Language/prompt title: $:/language/ControlPanel/Language/prompt
Hello! Current language: Hello! Current language:

2
core/modules/pluginswitcher.js
View File

@ -3,7 +3,7 @@ title: $:/core/modules/pluginswitcher.js
type: application/javascript type: application/javascript
module-type: global module-type: global
Manages switching plugins for themes and lingo. Manages switching plugins for themes and languages.
\*/ \*/
(function(){ (function(){

6
core/ui/ControlPanel/Basics.tid
View File

@ -1,15 +1,15 @@
title: $:/core/ui/ControlPanel/Basics title: $:/core/ui/ControlPanel/Basics
tags: $:/tags/ControlPanel tags: $:/tags/ControlPanel
caption: {{$:/lingo/ControlPanel/Basics/Caption}} caption: {{$:/language/ControlPanel/Basics/Caption}}
\define lingo-base() $:/lingo/ControlPanel/ \define lingo-base() $:/language/ControlPanel/
|<<lingo Basics/Version>> |''<<version>>'' | |<<lingo Basics/Version>> |''<<version>>'' |
|<$link to="SiteTitle"><<lingo Basics/Title>></$link> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> | |<$link to="SiteTitle"><<lingo Basics/Title>></$link> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
|<$link to="SiteSubtitle"><<lingo Basics/Subtitle>></$link> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> | |<$link to="SiteSubtitle"><<lingo Basics/Subtitle>></$link> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
|<$link to="$:/status/UserName"><<lingo Basics/Username>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> | |<$link to="$:/status/UserName"><<lingo Basics/Username>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
|<$link to="$:/config/AnimationDuration"><<lingo Basics/AnimDuration>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> | |<$link to="$:/config/AnimationDuration"><<lingo Basics/AnimDuration>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
|<$link to="$:/DefaultTiddlers"><<lingo Basics/DefaultTiddlers>></$link> |<<lingo Basics/DefaultTiddlers/Prompt>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo Basics/DefaultTiddlers/Hint>>// | |<$link to="$:/DefaultTiddlers"><<lingo Basics/DefaultTiddlers>></$link> |<<lingo Basics/DefaultTiddlers/Prompt>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo Basics/DefaultTiddlers/Hint>>// |
|{{$:/lingo/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} | |{{$:/language/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} |
|<<lingo Basics/Tiddlers>> |''<$count filter="[!is[system]]"/>'' | |<<lingo Basics/Tiddlers>> |''<$count filter="[!is[system]]"/>'' |
|<<lingo Basics/Tags>> |''<$count filter="[tags[]]"/>'' | |<<lingo Basics/Tags>> |''<$count filter="[tags[]]"/>'' |
|<<lingo Basics/SystemTiddlers>> |''<$count filter="[is[system]]"/>'' | |<<lingo Basics/SystemTiddlers>> |''<$count filter="[is[system]]"/>'' |

2
core/wiki/languageswitcher.tid
View File

@ -1,6 +1,6 @@
title: $:/snippets/languageswitcher 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"/></$view></$view> {{$:/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"/></$view></$view>
<$linkcatcher to="$:/language"> <$linkcatcher to="$:/language">
<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]"><div><$reveal state="$:/language" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/language" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/></$view></$view></$link></div> <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]"><div><$reveal state="$:/language" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/language" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/></$view></$view></$link></div>

4
editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid
View File

@ -16,7 +16,7 @@ MultiTiddlerFiles have the extension `tids`. The file is structured as a block o
For axample: For axample:
``` ```
title: $:/lingo/ControlPanel/ title: $:/language/ControlPanel/
tags: strings tags: strings
modifier: JoeBloggs modifier: JoeBloggs
@ -25,6 +25,6 @@ Basics/Caption: Basics
Basics/Version: ~TiddlyWiki Version 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. If a `title` field is specified in the header then it is treated as a prefix for the individual tiddlers defined in the title.

2
languages/de-AT/languageprompt.tid
View File

@ -1,3 +1,3 @@
title: $:/lingo/ControlPanel/Language/prompt title: $:/language/ControlPanel/Language/prompt
Hallo! Aktuelle Sprache: Hallo! Aktuelle Sprache:

2
languages/en-US/languageprompt.tid
View File

@ -1,3 +1,3 @@
title: $:/lingo/ControlPanel/Language/prompt title: $:/language/ControlPanel/Language/prompt
Hiya! Current language: Hiya! Current language:

2
languages/fr-FR/languageprompt.tid
View File

@ -1,3 +1,3 @@
title: $:/lingo/ControlPanel/Language/prompt title: $:/language/ControlPanel/Language/prompt
Bonjour! Langage courant: Bonjour! Langage courant: