From 4b94278115a09cc236d88f2d5dcb61c64a6e871f Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Mon, 8 Jun 2015 22:47:20 +0200
Subject: [PATCH] removed default information from plugin.json files; move
 plugin descriptions to language files, where available

---
 plugins/Contents/lang/en.json        |  1 +
 plugins/Contents/plugin.json         | 13 -------------
 plugins/DevicesDetection/plugin.json |  2 --
 plugins/Ecommerce/lang/en.json       |  1 +
 plugins/Ecommerce/plugin.json        |  3 ---
 plugins/Events/lang/en.json          |  1 +
 plugins/Events/plugin.json           |  6 ------
 plugins/Insights/lang/en.json        |  1 +
 plugins/Insights/plugin.json         | 15 ---------------
 plugins/LeftMenu/lang/en.json        |  1 +
 plugins/LeftMenu/plugin.json         |  4 ----
 plugins/MultiSites/plugin.json       |  1 -
 plugins/Overlay/plugin.json          |  3 ---
 plugins/Proxy/plugin.json            |  1 -
 plugins/SEO/lang/en.json             |  1 +
 plugins/SEO/plugin.json              |  4 ----
 plugins/SegmentEditor/lang/en.json   |  1 +
 plugins/SegmentEditor/plugin.json    |  4 ----
 plugins/UserCountryMap/lang/en.json  |  1 +
 plugins/UserCountryMap/plugin.json   |  4 ----
 plugins/ZenMode/lang/en.json         |  1 +
 plugins/ZenMode/plugin.json          |  6 ------
 22 files changed, 9 insertions(+), 66 deletions(-)
 delete mode 100644 plugins/Contents/plugin.json
 delete mode 100644 plugins/Ecommerce/plugin.json
 delete mode 100644 plugins/Events/plugin.json
 delete mode 100644 plugins/Insights/plugin.json
 delete mode 100644 plugins/LeftMenu/plugin.json
 delete mode 100644 plugins/Overlay/plugin.json
 delete mode 100644 plugins/SEO/plugin.json
 delete mode 100644 plugins/SegmentEditor/plugin.json
 delete mode 100644 plugins/UserCountryMap/plugin.json
 delete mode 100644 plugins/ZenMode/plugin.json

diff --git a/plugins/Contents/lang/en.json b/plugins/Contents/lang/en.json
index 87b13eec1c..e6a89ad640 100644
--- a/plugins/Contents/lang/en.json
+++ b/plugins/Contents/lang/en.json
@@ -1,5 +1,6 @@
 {
     "Contents":{
+        "PluginDescription": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).",
         "Impressions":"Impressions",
         "Interactions":"Interactions",
         "Interaction":"Interaction",
diff --git a/plugins/Contents/plugin.json b/plugins/Contents/plugin.json
deleted file mode 100644
index b023382486..0000000000
--- a/plugins/Contents/plugin.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "Contents",
- "version": "0.1.0",
- "description": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).",
- "theme": false,
- "authors": [
-     {
-         "name": "Piwik",
-         "email": "",
-         "homepage": ""
-     }
- ]
-}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/plugin.json b/plugins/DevicesDetection/plugin.json
index f9d816466b..5a522126b8 100644
--- a/plugins/DevicesDetection/plugin.json
+++ b/plugins/DevicesDetection/plugin.json
@@ -1,6 +1,4 @@
 {
-  "name": "DevicesDetection",
-  "version": "1.14",
   "authors": [
     {
       "name": "Piwik PRO",
diff --git a/plugins/Ecommerce/lang/en.json b/plugins/Ecommerce/lang/en.json
index e84e4092aa..30a8edd89a 100644
--- a/plugins/Ecommerce/lang/en.json
+++ b/plugins/Ecommerce/lang/en.json
@@ -1,5 +1,6 @@
 {
     "Ecommerce": {
+        "PluginDescription": "Ecommerce lets you track when users add products to carts, and when they convert to a ecommerce sale. Also track products and product categories views and abandoned carts.",
         "Sales": "Sales",
         "ViewSalesBy": "View sales by %s"
     }
diff --git a/plugins/Ecommerce/plugin.json b/plugins/Ecommerce/plugin.json
deleted file mode 100644
index 6c5ce77eca..0000000000
--- a/plugins/Ecommerce/plugin.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "description": "Ecommerce lets you track when users add products to carts, and when they convert to a ecommerce sale. Also track products and product categories views and abandoned carts. "
-}
\ No newline at end of file
diff --git a/plugins/Events/lang/en.json b/plugins/Events/lang/en.json
index f3694bdcbb..0981e4b690 100644
--- a/plugins/Events/lang/en.json
+++ b/plugins/Events/lang/en.json
@@ -1,5 +1,6 @@
 {
     "Events": {
+        "PluginDescription": "Track Events and get reports on your visitors activity.",
         "AvgEventValue": "Average Event value is: %s",
         "AvgValue": "Average value",
         "AvgValueDocumentation": "The average of all values for this event",
diff --git a/plugins/Events/plugin.json b/plugins/Events/plugin.json
deleted file mode 100644
index b76d775e7c..0000000000
--- a/plugins/Events/plugin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "Events",
- "version": "1.0",
- "description": "Track Events and get reports on your visitors activity. ",
- "theme": false
-}
\ No newline at end of file
diff --git a/plugins/Insights/lang/en.json b/plugins/Insights/lang/en.json
index 1e7071a323..d9c0935773 100644
--- a/plugins/Insights/lang/en.json
+++ b/plugins/Insights/lang/en.json
@@ -1,5 +1,6 @@
 {
     "Insights": {
+        "PluginDescription": "Provides Insights about your traffic. Insights are available as dashboard widgets as well as a new icon in reports to let you see most important trends in your data.",
         "ControlComparedToDescription": "Growth compared to the",
         "ControlFilterByDescription": "Show all, only movers, only new or only disappeared",
         "DatePeriodCombinationNotSupported": "It is not possible to generate insights for this date and period combination.",
diff --git a/plugins/Insights/plugin.json b/plugins/Insights/plugin.json
deleted file mode 100644
index 87171aa815..0000000000
--- a/plugins/Insights/plugin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "Insights",
- "version": "0.1.0",
- "description": "Provides Insights about your traffic. Insights are available as dashboard widgets as well as a new icon in reports to let you see most important trends in your data.",
- "theme": false,
- "license": "GPL v3+",
- "homepage": "http://piwik.org",
- "authors": [
-     {
-         "name": "Piwik",
-         "email": "hello@piwik.org",
-         "homepage": "http://piwik.org"
-     }
- ]
-}
\ No newline at end of file
diff --git a/plugins/LeftMenu/lang/en.json b/plugins/LeftMenu/lang/en.json
index 8cba174b60..2869b86479 100644
--- a/plugins/LeftMenu/lang/en.json
+++ b/plugins/LeftMenu/lang/en.json
@@ -1,5 +1,6 @@
 {
     "LeftMenu": {
+        "PluginDescription": "Position the dashboard menu to the left.",
         "SettingsIntroduction": "The left menu plugin will move the reporting menu from the top to the left if enabled. This is especially useful for large displays.",
         "GlobalSettingTitle": "Left menu enabled by default",
         "GlobalSettingDescription": "Defines the system default for all of your users.",
diff --git a/plugins/LeftMenu/plugin.json b/plugins/LeftMenu/plugin.json
deleted file mode 100644
index dbbbace989..0000000000
--- a/plugins/LeftMenu/plugin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "description": "Position the dashboard menu to the left. ",
-    "theme": false
-}
\ No newline at end of file
diff --git a/plugins/MultiSites/plugin.json b/plugins/MultiSites/plugin.json
index 5ea6b92356..1bf22b2dbd 100644
--- a/plugins/MultiSites/plugin.json
+++ b/plugins/MultiSites/plugin.json
@@ -1,5 +1,4 @@
 {
-  "name": "MultiSites",
   "authors": [
     {
       "name": "Piwik PRO",
diff --git a/plugins/Overlay/plugin.json b/plugins/Overlay/plugin.json
deleted file mode 100644
index d057abeae6..0000000000
--- a/plugins/Overlay/plugin.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "Overlay"
-}
\ No newline at end of file
diff --git a/plugins/Proxy/plugin.json b/plugins/Proxy/plugin.json
index cf5dd8b267..e8e1ad5dc9 100644
--- a/plugins/Proxy/plugin.json
+++ b/plugins/Proxy/plugin.json
@@ -1,4 +1,3 @@
 {
-    "name": "Proxy",
     "description": "Proxy services"
 }
\ No newline at end of file
diff --git a/plugins/SEO/lang/en.json b/plugins/SEO/lang/en.json
index 3ba3d8cfb1..5052c37441 100644
--- a/plugins/SEO/lang/en.json
+++ b/plugins/SEO/lang/en.json
@@ -1,5 +1,6 @@
 {
     "SEO": {
+        "PluginDescription": "This Plugin extracts and displays SEO metrics: Alexa web ranking, Google Pagerank, number of Indexed pages and backlinks of the currently selected website.",
         "AlexaRank": "Alexa Rank",
         "Bing_IndexedPages": "Bing indexed pages",
         "Dmoz": "DMOZ entries",
diff --git a/plugins/SEO/plugin.json b/plugins/SEO/plugin.json
deleted file mode 100644
index 9652a37a57..0000000000
--- a/plugins/SEO/plugin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "SEO",
-  "description": "This Plugin extracts and displays SEO metrics: Alexa web ranking, Google Pagerank, number of Indexed pages and backlinks of the currently selected website."
-}
diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json
index a3f03751d8..46bdf5fef2 100644
--- a/plugins/SegmentEditor/lang/en.json
+++ b/plugins/SegmentEditor/lang/en.json
@@ -1,5 +1,6 @@
 {
     "SegmentEditor": {
+        "PluginDescription": "Create and reuse custom visitor Segments with the Segment Editor.",
         "AddANDorORCondition": "Add %s condition",
         "AddNewSegment": "Add new segment",
         "AreYouSureDeleteSegment": "Are you sure you want to delete this segment?",
diff --git a/plugins/SegmentEditor/plugin.json b/plugins/SegmentEditor/plugin.json
deleted file mode 100644
index 23fe2d0d3d..0000000000
--- a/plugins/SegmentEditor/plugin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "SegmentEditor",
-  "description": "Create and reuse custom visitor Segments with the Segment Editor."
-}
diff --git a/plugins/UserCountryMap/lang/en.json b/plugins/UserCountryMap/lang/en.json
index a59234d393..20070062dd 100644
--- a/plugins/UserCountryMap/lang/en.json
+++ b/plugins/UserCountryMap/lang/en.json
@@ -1,5 +1,6 @@
 {
     "UserCountryMap": {
+        "PluginDescription": "This plugin provides the widgets Visitor Map and Real-time Map. Note: Requires the UserCountry plugin enabled.",
         "AndNOthers": "and %s others",
         "Cities": "Cities",
         "Countries": "Countries",
diff --git a/plugins/UserCountryMap/plugin.json b/plugins/UserCountryMap/plugin.json
deleted file mode 100644
index c639999872..0000000000
--- a/plugins/UserCountryMap/plugin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "name": "User Country Map",
-    "description": "This plugin provides the widgets Visitor Map and Real-time Map. Note: Requires the UserCountry plugin enabled."
-}
diff --git a/plugins/ZenMode/lang/en.json b/plugins/ZenMode/lang/en.json
index 78e12b32e7..4a3aa78ee8 100755
--- a/plugins/ZenMode/lang/en.json
+++ b/plugins/ZenMode/lang/en.json
@@ -1,5 +1,6 @@
 {
     "ZenMode": {
+        "PluginDescription": "Stay Zen with Piwik. Zen mode keeps things simple. It is available via the icon in the top right of the screen.",
         "SearchForAnything": "Search for anything",
         "QuickAccessTitle": "Search for menu entries, reports and websites",
         "HowToSearch": "To search for menu items, reports or websites use the search box on the top right or press 'alt+f'.",
diff --git a/plugins/ZenMode/plugin.json b/plugins/ZenMode/plugin.json
deleted file mode 100644
index 938ed12b29..0000000000
--- a/plugins/ZenMode/plugin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "ZenMode",
- "version": "0.1",
- "description": "Stay Zen with Piwik. Zen mode keeps things simple. It is available via the icon in the top right of the screen.",
- "theme": false
-}
\ No newline at end of file
-- 
GitLab