[news] Modularize; add 'login-news' category

TODO: Use date/time picker for expire time

4 files changed, 23 insertions, 15 deletions

diff --git a/modules-available/news/lang/en/messages.json b/modules-available/news/lang/en/messages.json
index 4eaf4306..c44e0cd0 100644
--- a/modules-available/news/lang/en/messages.json
+++ b/modules-available/news/lang/en/messages.json
@@ -1,7 +1,8 @@
 {
-    "help-save-success": "Help updated successfully",
     "invalid-action": "Invalid action: {{0}}",
+    "invalid-type": "Invalid text type: {{0}}",
     "news-del-success": "News deleted",
     "news-empty": "There was no news found in the database",
-    "news-save-success": "News updated successfully"
+    "news-save-success": "News updated successfully",
+    "save-error": "Error saving entry"
 }
\ No newline at end of file
diff --git a/modules-available/news/lang/en/module.json b/modules-available/news/lang/en/module.json
index f44a64e5..f24c306b 100644
--- a/modules-available/news/lang/en/module.json
+++ b/modules-available/news/lang/en/module.json
@@ -1,3 +1,7 @@
 {
-    "module_name": "vmChooser News"
+    "module_name": "vmChooser News",
+    "page_title": "News and help texts",
+    "type_help": "vmChooser help",
+    "type_login-news": "Login screen",
+    "type_news": "vmChooser news"
 }
\ No newline at end of file
diff --git a/modules-available/news/lang/en/permissions.json b/modules-available/news/lang/en/permissions.json
index 37fc7a8e..4363943c 100644
--- a/modules-available/news/lang/en/permissions.json
+++ b/modules-available/news/lang/en/permissions.json
@@ -1,7 +1,9 @@
 {
     "access-page": "View page.",
-    "help.delete": "Delete old help texts.",
-    "help.save": "Save new help texts.",
-    "news.delete": "Delete old news.",
-    "news.save": "Save new news."
+    "help.delete": "Delete vmChooser help texts.",
+    "help.save": "Save new vmChooser help texts.",
+    "login-news.delete": "Delete login screen help texts.",
+    "login-news.save": "Save new login screen help texts.",
+    "news.delete": "Delete vmChooser news.",
+    "news.save": "Save new vmChooser news."
 }
\ No newline at end of file
diff --git a/modules-available/news/lang/en/template-tags.json b/modules-available/news/lang/en/template-tags.json
index d7567d99..f901c684 100644
--- a/modules-available/news/lang/en/template-tags.json
+++ b/modules-available/news/lang/en/template-tags.json
@@ -1,14 +1,15 @@
 {
     "lang_confirmDelete": "Delete entry?",
     "lang_content": "Content",
-    "lang_date": "Date",
-    "lang_editHelp": "Edit Help",
-    "lang_editNews": "Edit news",
-    "lang_latestUpdate": "Latest update",
-    "lang_newsIntro": "Here you have the possibility to edit the news displayed to the bwLehrpool clients.",
-    "lang_newsOld": "Old News",
-    "lang_oldHelp": "Old Help Texts",
+    "lang_created": "Created",
+    "lang_expires": "Expires",
+    "lang_introText": "Here you can define news, help and other informational texts to be displayed in different places in the running MiniLinux system.",
+    "lang_lastUpdate": "Last update",
+    "lang_leaveEmptyInfinite": "0\/empty means infinite",
+    "lang_mainHeading": "News and help texts",
+    "lang_previousEntries": "Previous entries",
     "lang_show": "Show",
     "lang_title": "Title",
-    "lang_vmChooser_title": "vmChooser-Settings"
+    "lang_titlePh": "Headline for Text",
+    "lang_validityHours": "Validity in hours"
 }
\ No newline at end of file