From 1edd55c502bfa93753232f9e7e7898a89cf1d315 Mon Sep 17 00:00:00 2001
From: Andrzej Popowski <a.popowski@samsung.com>
Date: Wed, 7 Oct 2015 12:09:43 +0200
Subject: [PATCH] [Account] - Removing TODOs from the Account module

Change-Id: I298bfe2984d50b5c2faef703b7a46deeba4d8f5e
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>
---
 src/account/account_api.js     |  6 ------
 src/account/account_manager.cc | 10 ++++++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/account/account_api.js b/src/account/account_api.js
index 6c1c84c4..044d8cde 100755
--- a/src/account/account_api.js
+++ b/src/account/account_api.js
@@ -115,8 +115,6 @@ Account.prototype.getExtendedData = function() {
             }
         ]);
 
-        // TODO handling exceptions
-
         native_.call('Account_getExtendedData', { accountId: this.id },
             function(result) {
                 if (native_.isFailure(result)) {
@@ -256,8 +254,6 @@ AccountManager.prototype.getAccounts = function() {
         { name: 'applicationId', type: types_.STRING, optional: true, nullable: true }
     ]);
 
-    // TODO handling exceptions
-
     native_.call('AccountManager_getAccounts',
         {
             applicationId: args.applicationId
@@ -315,8 +311,6 @@ AccountManager.prototype.getProviders = function() {
         { name: 'capability', type: types_.STRING, optional: true, nullable: true }
     ]);
 
-    // TODO handling exceptions
-
     native_.call( 'AccountManager_getProviders',
         {
             capability: args.capability
diff --git a/src/account/account_manager.cc b/src/account/account_manager.cc
index 409ac752..4d1043df 100755
--- a/src/account/account_manager.cc
+++ b/src/account/account_manager.cc
@@ -17,6 +17,7 @@
 #include "account/account_manager.h"
 
 #include <functional>
+#include <locale>
 
 #include "common/logger.h"
 #include "common/scope_exit.h"
@@ -335,8 +336,13 @@ bool AccountManager::ConvertProviderToObject(account_type_h provider,
   out["applicationId"] = picojson::value(provider_id);
   free(provider_id);
 
-  // TODO: Which label should be returned?
-  ret = account_type_get_label_by_locale(provider, "default", &display_name);
+  std::string language("default");
+  std::locale loc("");
+  if (loc.name().length() >= 5) {
+    language = loc.name().substr(0, 5);
+  }
+
+  ret = account_type_get_label_by_locale(provider, language.c_str(), &display_name);
   if (ret == ACCOUNT_ERROR_NONE) {
     out["displayName"] = picojson::value(display_name);
     free(display_name);
-- 
2.34.1