From daa79a8612e05a74f77cf0c72799b0c65a814603 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Tue, 11 Feb 2014 13:20:17 +0000
Subject: [PATCH] Move the en-GB language plugin into the core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need to have the default language baked into the core so that we
don’t have problems if no language plugins are available.
---
 core/language/en-GB.tid                               | 7 +++++++
 {languages => core/language}/en-GB/ControlPanel.tids  | 0
 {languages => core/language}/en-GB/languageprompt.tid | 0
 core/wiki/languageswitcher.tid                        | 2 +-
 core/wiki/minilanguageswitcher.tid                    | 2 +-
 languages/de-AT/plugin.info                           | 3 +--
 languages/en-GB/plugin.info                           | 8 --------
 languages/en-US/plugin.info                           | 3 +--
 languages/fr-FR/plugin.info                           | 3 +--
 9 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 core/language/en-GB.tid
 rename {languages => core/language}/en-GB/ControlPanel.tids (100%)
 rename {languages => core/language}/en-GB/languageprompt.tid (100%)
 delete mode 100644 languages/en-GB/plugin.info

diff --git a/core/language/en-GB.tid b/core/language/en-GB.tid
new file mode 100644
index 000000000..08e2e4093
--- /dev/null
+++ b/core/language/en-GB.tid
@@ -0,0 +1,7 @@
+title: $:/languages/en-GB
+name: en-GB
+description: English (British)
+author: JeremyRuston
+core-version: >=5.0.0"
+
+Stub pseudo-plugin for the default language
\ No newline at end of file
diff --git a/languages/en-GB/ControlPanel.tids b/core/language/en-GB/ControlPanel.tids
similarity index 100%
rename from languages/en-GB/ControlPanel.tids
rename to core/language/en-GB/ControlPanel.tids
diff --git a/languages/en-GB/languageprompt.tid b/core/language/en-GB/languageprompt.tid
similarity index 100%
rename from languages/en-GB/languageprompt.tid
rename to core/language/en-GB/languageprompt.tid
diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
index fdebb64c4..a14d3518e 100644
--- a/core/wiki/languageswitcher.tid
+++ b/core/wiki/languageswitcher.tid
@@ -3,6 +3,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"/></$view></$view>
 
 <$linkcatcher to="$:/language">
-<$list filter="[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>
 </$list>
 </$linkcatcher>
\ No newline at end of file
diff --git a/core/wiki/minilanguageswitcher.tid b/core/wiki/minilanguageswitcher.tid
index 651b47346..be78e3bf1 100644
--- a/core/wiki/minilanguageswitcher.tid
+++ b/core/wiki/minilanguageswitcher.tid
@@ -1,6 +1,6 @@
 title: $:/snippets/minilanguageswitcher
 
 <$linkcatcher to="$:/language">
-<$list filter="[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>
 </$list>
 </$linkcatcher>
\ No newline at end of file
diff --git a/languages/de-AT/plugin.info b/languages/de-AT/plugin.info
index cd7f1d802..f6cc51a66 100644
--- a/languages/de-AT/plugin.info
+++ b/languages/de-AT/plugin.info
@@ -4,6 +4,5 @@
 	"plugin-type": "language",
 	"description": "German (Austria)",
 	"author": "JeremyRuston",
-	"core-version": ">=5.0.0",
-	"dependents": ["$:/languages/en-GB"]
+	"core-version": ">=5.0.0"
 }
diff --git a/languages/en-GB/plugin.info b/languages/en-GB/plugin.info
deleted file mode 100644
index cbad71791..000000000
--- a/languages/en-GB/plugin.info
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"title": "$:/languages/en-GB",
-	"name": "en-GB",
-	"plugin-type": "language",
-	"description": "English (British)",
-	"author": "JeremyRuston",
-	"core-version": ">=5.0.0"
-}
diff --git a/languages/en-US/plugin.info b/languages/en-US/plugin.info
index dec8d3685..7d9af644d 100644
--- a/languages/en-US/plugin.info
+++ b/languages/en-US/plugin.info
@@ -4,6 +4,5 @@
 	"plugin-type": "language",
 	"description": "English (US)",
 	"author": "JeremyRuston",
-	"core-version": ">=5.0.0",
-	"dependents": ["$:/languages/en-GB"]
+	"core-version": ">=5.0.0"
 }
diff --git a/languages/fr-FR/plugin.info b/languages/fr-FR/plugin.info
index 4631f78ac..8a91fc7f4 100644
--- a/languages/fr-FR/plugin.info
+++ b/languages/fr-FR/plugin.info
@@ -4,6 +4,5 @@
 	"plugin-type": "language",
 	"description": "French (France)",
 	"author": "JeremyRuston",
-	"core-version": ">=5.0.0",
-	"dependents": ["$:/languages/en-GB"]
+	"core-version": ">=5.0.0"
 }