diff --git a/app/webpack/modules/locale/locale.coffee b/app/webpack/modules/locale/locale.coffee index 9f7781e..2acc3ca 100644 --- a/app/webpack/modules/locale/locale.coffee +++ b/app/webpack/modules/locale/locale.coffee @@ -1,9 +1,11 @@ 'use strict' # system Jed = require 'jed' -# constants -localeDefault = LOCALE_CONFIG.default -map = LOCALE_CONFIG.map +# configuration +localeConfig = require "#{LOCALE_ROOT}/config" + +localeDefault = localeConfig.default +map = localeConfig.map langRaw = window.navigator.userLanguage || window.navigator.language langParts = langRaw.replace('-', '_').split('_') diff --git a/dev/bower.json b/dev/bower.json index ad37af7..9b89df3 100644 --- a/dev/bower.json +++ b/dev/bower.json @@ -1,6 +1,6 @@ { "name": "webird", - "version": "0.5.0-alpha2", + "version": "0.5.0-alpha3", "devDependencies": { "bootstrap": "~3.3.1", "jquery": "~2.1.1", diff --git a/dev/composer.json b/dev/composer.json index f2caa07..5ea7549 100644 --- a/dev/composer.json +++ b/dev/composer.json @@ -1,7 +1,7 @@ { "name": "webird/framework", "description": "Webird Phalcon/Webpack Framework", - "version": "0.5.0-alpha2", + "version": "0.5.0-alpha3", "require": { "php": ">=5.5", "ext-phalcon": ">=1.3.2", diff --git a/dev/gulpfile.webpack.coffee b/dev/gulpfile.webpack.coffee index 36beea3..151fa55 100644 --- a/dev/gulpfile.webpack.coffee +++ b/dev/gulpfile.webpack.coffee @@ -64,10 +64,11 @@ wpConf = highlight: 'highlight.js/lib/highlight' extensions: [ - "" - ".js", ".coffee" - ".html", ".hbs" - ".css", ".scss", ".less" + '' + '.js', '.coffee' + '.html', '.hbs' + '.css', '.scss', '.less' + '.json', '.yaml' ] resolveLoader: diff --git a/dev/package.json b/dev/package.json index 49eafa9..4b91c57 100644 --- a/dev/package.json +++ b/dev/package.json @@ -1,15 +1,15 @@ { "name": "webird", - "version": "0.5.0-alpha2", + "version": "0.5.0-alpha3", "dependencies": {}, "devDependencies": { + "coffee-script": "~1.8.0", "gulp": "~3.8.10", "gulp-util": "~3.0.1", "js-yaml": "~3.2.3", "webpack": "~1.4.13", "webpack-dev-server": "~1.6.5", "extract-text-webpack-plugin": "~0.3.4", - "coffee-script": "~1.8.0", "coffee-loader": "~0.7.2", "bundle-loader": "~0.5.2", "json-loader": "~0.5.1",