- ES: Error if message count request failed - fix #163

- Allow to define i18n fallbackLanguage - fix #162
- sort conf properties by alphabetical order, in config.json

app/config.json

 {
   "default": {
-    "timeout": 4000,
     "cacheTimeMs": 60000,
-    "useRelative": true,
+    "fallbackLanguage": "en",
+    "rememberMe": false,
+    "showUDHistory": false,
+    "timeout": 4000,
     "timeWarningExpireMembership": 5184000,
     "timeWarningExpire": 7776000,
     "useLocalStorage": false,
-    "rememberMe": false,
-    "showUDHistory": false,
+    "useRelative": true,
     "node": {
       "host": "test-net.duniter.fr",
       "port": "9201"
@@ -22,14 +23,15 @@
   },
 
   "sou": {
-    "timeout": 4000,
     "cacheTimeMs": 60000,
-    "useRelative": true,
+    "fallbackLanguage": "fr",
+    "rememberMe": false,
+    "showUDHistory": false,
+    "timeout": 4000,
     "timeWarningExpireMembership": 5184000,
     "timeWarningExpire": 7776000,
     "useLocalStorage": false,
-    "rememberMe": false,
-    "showUDHistory": false,
+    "useRelative": true,
     "node": {
       "host": "duniter.le-sou.org",
       "port": "9600"
@@ -44,14 +46,15 @@
   },
 
   "dev": {
-    "timeout": 6000,
     "cacheTimeMs": 60000,
-    "useRelative": true,
+    "fallbackLanguage": "en",
+    "rememberMe": true,
+    "showUDHistory": false,
+    "timeout": 6000,
     "timeWarningExpireMembership": 5184000,
     "timeWarningExpire": 7776000,
     "useLocalStorage": true,
-    "rememberMe": true,
-    "showUDHistory": false,
+    "useRelative": true,
     "node": {
       "host": "192.168.0.28",
       "port": "9600"
@@ -59,7 +62,7 @@
     "plugins":{
       "es": {
         "enable": false,
-        "host": "192.168.0.28",
+        "host": "192.168.0.5",
         "port": "9203"
       }
     }

www/js/app.js

@@ -137,7 +137,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht
   })
 
   // Translation i18n
-  .config(function ($translateProvider) {
+  .config(function ($translateProvider, csConfig) {
     'ngInject';
 
     $translateProvider
@@ -146,7 +146,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht
     // Cela fait bugger les placeholder (pb d'affichage des accents en FR)
     //.useSanitizeValueStrategy('sanitize')
     .useSanitizeValueStrategy(null)
-    .fallbackLanguage(['en'])
+    .fallbackLanguage([csConfig.fallbackLanguage ? csConfig.fallbackLanguage : 'en'])
     .useLoaderCache(true);
   })
 

www/js/services/wallet-services.js

@@ -218,11 +218,14 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
             data.loaded = false;
           }
 
-          api.data.raise.login(data);
+          return $q.all([
+            // Call extend api
+            api.data.raisePromise.login(data),
 
             // Load parameters
             // This prevent timeout error, when loading a market record after a browser refresh (e.g. F5)
-          return loadParameters();
+            loadParameters()
+          ]);
         })
         .catch(function(err){reject(err);});
       });

www/plugins/es/js/services/message-services.js

@@ -68,8 +68,12 @@ angular.module('cesium.es.message.services', ['ngResource', 'cesium.services', '
           if(resolve) resolve(data);
         })
         .catch(function(err){
-          reject(err);
-          if(reject) reject(data);
+          if(resolve) {
+            resolve(data);
+          }
+          else {
+            throw err;
+          }
         });
     }