mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-20 12:55:26 +02:00
- LocalForage dependencies works now.
- Language template using embedded controller.
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
module.exports = angular.module('stf-ui-language', [
|
||||
// require('stf/settings').name
|
||||
require('stf/settings').name
|
||||
])
|
||||
.run(["$templateCache", function($templateCache) {
|
||||
$templateCache.put('language.jade', require('./language.jade'))
|
||||
$templateCache.put('settings/language/language.jade', require('./language.jade'))
|
||||
}])
|
||||
.factory('LanguageService', require('./language-service'))
|
||||
.controller('LanguageCtrl', require('./language-controller'))
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
module.exports = function LanguageCtrl($scope, LanguageService, SettingsService) { //gettextCatalog,
|
||||
module.exports = function ($scope, LanguageService, SettingsService) { //gettextCatalog,
|
||||
// SettingsService.sync($scope, 'Language', {
|
||||
// language: LanguageService.detectedLanguage
|
||||
// })
|
||||
|
||||
//SettingsService.set('')
|
||||
console.log('hey')
|
||||
|
||||
|
||||
//SettingsService.set('valueCrazy', 35)
|
||||
//SettingsService.set('valueCrazyNew', {one: 1, two: 35.3, three: '日本語', four: [1, 2, 3, 4]})
|
||||
SettingsService.set('valueCrazy', 35)
|
||||
SettingsService.set('valueCrazyNew', {one: 1, two: 35.3, three: '日本語', four: [1, 2, 3, 4]})
|
||||
|
||||
|
||||
|
||||
|
||||
//console.log('he')
|
||||
//console.log(SettingsService.get('valueCrazy'))
|
||||
|
||||
@@ -1,25 +1,23 @@
|
||||
//var _ = require('lodash')
|
||||
|
||||
module.exports = function LanguageServiceFactory() {
|
||||
alert('he')
|
||||
|
||||
var LanguageService = {}
|
||||
|
||||
LanguageService.supportedLanguages = [
|
||||
{code: 'en', name: 'English'},
|
||||
{code: 'ja', name: '日本語'}
|
||||
]
|
||||
|
||||
var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
|
||||
var browserLanguage = browserLocale.substring(0, 2)
|
||||
var detectedLanguage = _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ? browserLanguage : 'en'
|
||||
var defaultLanguage = 'ja'
|
||||
LanguageService.detectedLanguage = defaultLanguage
|
||||
LanguageService.selectedLanguage = defaultLanguage
|
||||
|
||||
LanguageService.getSelectedLanguage = function () {
|
||||
return LanguageService.selectedLanguage = defaultLanguage //WebStorage.get('Language.language') || defaultLanguage
|
||||
}
|
||||
|
||||
return LanguageService
|
||||
// var LanguageService = {}
|
||||
//
|
||||
// LanguageService.supportedLanguages = [
|
||||
// {code: 'en', name: 'English'},
|
||||
// {code: 'ja', name: '日本語'}
|
||||
// ]
|
||||
//
|
||||
// var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
|
||||
// var browserLanguage = browserLocale.substring(0, 2)
|
||||
// var detectedLanguage = _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ? browserLanguage : 'en'
|
||||
// var defaultLanguage = 'ja'
|
||||
// LanguageService.detectedLanguage = defaultLanguage
|
||||
// LanguageService.selectedLanguage = defaultLanguage
|
||||
//
|
||||
// LanguageService.getSelectedLanguage = function () {
|
||||
// return LanguageService.selectedLanguage = defaultLanguage //WebStorage.get('Language.language') || defaultLanguage
|
||||
// }
|
||||
//
|
||||
// return LanguageService
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
.widget-container.fluid-height
|
||||
.widget-container.fluid-height(ng-controller='LanguageCtrl')
|
||||
.heading
|
||||
i.fa.fa-flag
|
||||
span(translate) Language
|
||||
|
||||
Reference in New Issue
Block a user