From 32f22e10ff63a555e5b80207dc524390aa4bc6c1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Sep 2014 18:46:24 +0200
Subject: [i18n] Language handling is now completely dynamic, no more hardcoded
 de,en,pt

---
 lang/en/messages.json                       |  1 +
 lang/en/name.txt                            |  1 +
 lang/en/templates/translation/_page.json    |  8 ++++----
 lang/en/templates/translation/edit.json     | 12 ++++++++++++
 lang/en/templates/translation/messages.json | 17 -----------------
 lang/en/templates/translation/template.json | 15 ---------------
 6 files changed, 18 insertions(+), 36 deletions(-)
 create mode 100644 lang/en/name.txt
 create mode 100644 lang/en/templates/translation/edit.json
 delete mode 100644 lang/en/templates/translation/messages.json
 delete mode 100644 lang/en/templates/translation/template.json

(limited to 'lang/en')

diff --git a/lang/en/messages.json b/lang/en/messages.json
index a300cff7..3302545c 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -18,6 +18,7 @@
     "invalid-action": "Invalid action: {{0}}",
     "invalid-file": "The file {{0}} does not exist!",
     "invalid-ip": "No interface is configured with the address {{0}}",
+    "invalid-path": "",
     "invalid-template": "Selected template is not valid",
     "loginfail": "Username or Password incorrect",
     "missing-file": "There was no file selected!",
diff --git a/lang/en/name.txt b/lang/en/name.txt
new file mode 100644
index 00000000..3d38949d
--- /dev/null
+++ b/lang/en/name.txt
@@ -0,0 +1 @@
+English
\ No newline at end of file
diff --git a/lang/en/templates/translation/_page.json b/lang/en/templates/translation/_page.json
index 1c84d34c..c9c6020d 100644
--- a/lang/en/templates/translation/_page.json
+++ b/lang/en/templates/translation/_page.json
@@ -1,8 +1,8 @@
 {
     "lang_adminInfo": "In this section you can change the JSON tags that contains the translated texts used by the site. To do this, select a template below to modify their respective tags. Alternatively, click the link below to change the messages of the site.",
+    "lang_editHardcoded": "Edit hardcoded strings",
     "lang_editMessages": "Edit Messages",
-    "lang_english": "English",
-    "lang_german": "German",
-    "lang_langAdministration": "Language Administration",
-    "lang_portuguese": "Portuguese"
+    "lang_editSettings": "Edit configuration variables related strings",
+    "lang_editTemplates": "Edit template strings",
+    "lang_langAdministration": "Language Administration"
 }
\ No newline at end of file
diff --git a/lang/en/templates/translation/edit.json b/lang/en/templates/translation/edit.json
new file mode 100644
index 00000000..ff3f44ca
--- /dev/null
+++ b/lang/en/templates/translation/edit.json
@@ -0,0 +1,12 @@
+{
+    "lang_back": "Back",
+    "lang_createTag": "Create TAG",
+    "lang_deleteTAG": "Delete",
+    "lang_englishTAG": "English TAG",
+    "lang_germanTAG": "German TAG",
+    "lang_newTAG": "New TAG",
+    "lang_portugueseTAG": "Portuguese TAG",
+    "lang_save": "Save",
+    "lang_templateAdminHelp": "",
+    "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template."
+}
\ No newline at end of file
diff --git a/lang/en/templates/translation/messages.json b/lang/en/templates/translation/messages.json
deleted file mode 100644
index 433e9cdf..00000000
--- a/lang/en/templates/translation/messages.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "lang_back": "Back",
-    "lang_deleteTAG": "Delete",
-    "lang_englishJSON": "English JSON",
-    "lang_englishTAG": "English TAG",
-    "lang_germanJSON": "German JSON",
-    "lang_germanTAG": "German TAG",
-    "lang_messages": "Messages",
-    "lang_messagesHardcoded": "Hardcoded Messages",
-    "lang_newTAG": "New TAG",
-    "lang_newTag": "New Tag",
-    "lang_portugueseJSON": "German JSON",
-    "lang_portugueseTAG": "Portuguese TAG",
-    "lang_save": "Save",
-    "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template.",
-    "lang_templateMessagesHelp": ""
-}
\ No newline at end of file
diff --git a/lang/en/templates/translation/template.json b/lang/en/templates/translation/template.json
deleted file mode 100644
index ad07a8b6..00000000
--- a/lang/en/templates/translation/template.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "lang_back": "Back",
-    "lang_createTag": "Create TAG",
-    "lang_deleteTAG": "Delete",
-    "lang_englishJSON": "English JSON",
-    "lang_englishTAG": "English TAG",
-    "lang_germanJSON": "German JSON",
-    "lang_germanTAG": "German TAG",
-    "lang_newTAG": "New TAG",
-    "lang_portugueseJSON": "German JSON",
-    "lang_portugueseTAG": "Portuguese TAG",
-    "lang_save": "Save",
-    "lang_templateAdminHelp": "",
-    "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template."
-}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522