starred/stf-DeviceFarmer-1
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-19 00:33:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix various JSHint warnings in client-side code.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-03-26 16:06:13 +09:00
parent a6aed5416f
commit 8b13a1c945
25 changed files with 188 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/app/settings/language/language-service.js
View File

@@ -1,6 +1,10 @@
var _ = require('lodash')
module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCatalog) {
module.exports = function LanguageServiceFactory(
SettingsService
, $q
, gettextCatalog
) {
var LanguageService = {}
LanguageService.supportedLanguages = [
@@ -10,7 +14,10 @@ module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCat
var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
var browserLanguage = browserLocale.substring(0, 2)
var detectedLanguage = _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ? browserLanguage : 'en'
var detectedLanguage =
_.some(LanguageService.supportedLanguages, {code: browserLanguage}) ?
browserLanguage :
'en'
var defaultLanguage = 'ja'
LanguageService.detectedLanguage = defaultLanguage
LanguageService.selectedLanguage = null
@@ -29,9 +36,10 @@ module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCat
if (data) {
deferred.resolve(data)
} else {
LanguageService.setSelectedLanguage(LanguageService.detectedLanguage).then(function () {
deferred.resolve(LanguageService.detectedLanguage)
})
LanguageService.setSelectedLanguage(LanguageService.detectedLanguage)
.then(function () {
deferred.resolve(LanguageService.detectedLanguage)
})
}
})
}