Publish 10.2

Wyliodrin · Mar 30, 2016 · d3732a8 · d3732a8
1 parent f3af509
commit d3732a8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+Wyliodrin STUDIO 10.2
+* added serial port title to mixpanel
+* fixed ui_lang in mixpanel
+* fixed board mdns list (removed forceDiscovery)
+
 Wyliodrin STUDIO 10.1
 * added anonymoys statistics data (version, ui_lang)
 * added forum

diff --git a/extra/mixpanel b/extra/mixpanel
@@ -47,7 +47,7 @@ Schematics Controller
 	Schematics Erase - erase schematics (language of the project)
 
 Serial Port Controller
-	SerialPort Connect - connect (connection style serial, address ...)
+	SerialPort Connect - connect (connection style serial, address, serial port ...)
 
 Software Example Controller
 	Software Example - open the software example (language of the project)

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "description":"__MSG_appDesc__",
-  "version": "10.1",
+  "version": "10.2",
   "manifest_version": 2,
   "default_locale":"en",
   "author":"Wyliodrin SRL",

diff --git a/source/public/controllers/TranslateController.js b/source/public/controllers/TranslateController.js
@@ -77,9 +77,13 @@ module.exports = function ()
       {
         if (language)
         {
-          mixpanel.language (language);
+          // mixpanel.language (language);
           that.changeLanguage (language);
         }
+        else
+        {
+          mixpanel.language ($translate.use ());
+        }
       });
 
       // console.log (available);

diff --git a/source/public/mixpanel.js b/source/public/mixpanel.js
@@ -20,12 +20,6 @@ library.retrieveValue ('usage', true, function (value)
   global.usage = value;
 });
 
-library.retrieveValue ('language', true, function (value)
-{
-  debug ('Language '+value);
-  language (value);
-});
-
 function init(token, userid) {
   debug ('startup');
   if (token && token !== '')
@@ -73,7 +67,7 @@ function track(event, properties) {
             version: settings.VERSION,
             $os: mixpanel.os,
             architecture: mixpanel.architecture,
-            ui_lang: ln
+            ui_lang: ln?ln:'en'
             // browser: app.browser.name
         }, 
         properties)