Skip to content

Commit

Permalink
fix(defaultLocale): browser detection of language not working
Browse files Browse the repository at this point in the history
always falling back to defaultLocale, even if cookieStore value not present
  • Loading branch information
doshprompt committed Feb 26, 2015
1 parent 701867e commit b69d76b
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-localization",
"version": "1.1.3",
"version": "1.1.4",
"homepage": "https://github.com/doshprompt/angular-localization",
"description": "angularjs localization done right",
"main": "angular-localization.js",
Expand Down
8 changes: 4 additions & 4 deletions dist/angular-localization.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* angular-localization :: v1.1.3 :: 2014-10-15
* angular-localization :: v1.1.4 :: 2015-02-25
* web: https://github.com/doshprompt/angular-localization
*
* Copyright (c) 2014 | Rahul Doshi
* Copyright (c) 2015 | Rahul Doshi
* License: MIT
*/
;(function (angular, window, document, undefined) {
Expand Down Expand Up @@ -272,7 +272,7 @@ angular.module('ngLocalize', ['ngSanitize', 'ngLocalize.Config', 'ngLocalize.Eve
return currentLocale;
}

setLocale((cookieStore ? cookieStore.get(localeConf.cookieName) : localeConf.defaultLocale) || $window.navigator.userLanguage || $window.navigator.language);
setLocale(cookieStore ? cookieStore.get(localeConf.cookieName) : $window.navigator.userLanguage || $window.navigator.language);

return {
ready: ready,
Expand Down Expand Up @@ -393,5 +393,5 @@ angular.module('ngLocalize.InstalledLanguages', [])
'en': 'en-US'
});
angular.module('ngLocalize.Version', [])
.constant('localeVer', '1.1.3');
.constant('localeVer', '1.1.4');
})(window.angular, window, document);
6 changes: 3 additions & 3 deletions dist/angular-localization.min.js
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified dist/angular-localization.min.js.gz
100755 → 100644
Binary file not shown.
Loading

0 comments on commit b69d76b

Please sign in to comment.