From 007a6198e019a3e6c7e2362f847fe1840c9c7620 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 30 Sep 2016 09:02:07 +0200
Subject: [PATCH] - 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 | 29 ++++++++++---------
www/js/app.js | 4 +--
www/js/services/wallet-services.js | 13 +++++----
.../es/js/services/message-services.js | 8 +++--
4 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/app/config.json b/app/config.json
index 37057ca8a..4f77a1ae6 100644
--- a/app/config.json
+++ b/app/config.json
@@ -1,13 +1,14 @@
{
"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"
}
}
diff --git a/www/js/app.js b/www/js/app.js
index b1bbb9d2e..1a611b7a6 100644
--- a/www/js/app.js
+++ b/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);
})
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 7cbc414b7..de2d1768b 100644
--- a/www/js/services/wallet-services.js
+++ b/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);
-
- // Load parameters
- // This prevent timeout error, when loading a market record after a browser refresh (e.g. F5)
- return loadParameters();
+ 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)
+ loadParameters()
+ ]);
})
.catch(function(err){reject(err);});
});
diff --git a/www/plugins/es/js/services/message-services.js b/www/plugins/es/js/services/message-services.js
index 7457138a9..6585ab4d1 100644
--- a/www/plugins/es/js/services/message-services.js
+++ b/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;
+ }
});
}
--
GitLab