From 388bd1fd3d7aefdbfddf0031dd0e52e15dad3418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 13 Jan 2016 16:12:12 -0300
Subject: [PATCH] fix rebase conflicts

---
 src/js/services/uxLanguage.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/js/services/uxLanguage.js b/src/js/services/uxLanguage.js
index c9ddfe872..9aadb24ed 100644
--- a/src/js/services/uxLanguage.js
+++ b/src/js/services/uxLanguage.js
@@ -35,23 +35,24 @@ angular.module('copayApp.services')
           // works for iOS and Android 4.x
           userLang = preferedLanguage.value;
           userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
+          // Set only available languages
+          userLang = root.isAvailableLanguage(userLang);
           return cb(userLang);
         });
       } else {
         // Auto-detect browser language
         userLang = navigator.userLanguage || navigator.language;
         userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
+        // Set only available languages
+        userLang = root.isAvailableLanguage(userLang);
         return cb(userLang);
       }
+    };
 
-      userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
-
-      // Set only available languages
-      userLang = lodash.find(root.availableLanguages, {
+    root.isAvailableLanguage = function(userLang) {
+      return lodash.find(root.availableLanguages, {
         'isoCode': userLang
       }) ? userLang : 'en';
-
-      return userLang;
     };
 
     root._set = function(lang) {