Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ which was later updated to include performance improvements [seen here](http://c

```shell
$ npm install -d
$ bower install
$ npm test
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* angular-localization-spiria :: v1.6.0 :: 2017-05-10
* angular-localization-fi :: v1.6.1 :: 2018-10-04
* web: http://doshprompt.github.io/angular-localization
*
* Copyright (c) 2017 | Rahul Doshi
* Copyright (c) 2018 | Rahul Doshi
* License: MIT
*/
*[dir="ltr"] {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*!
* angular-localization-spiria :: v1.6.0 :: 2017-05-10
* angular-localization-fi :: v1.6.1 :: 2018-10-04
* web: http://doshprompt.github.io/angular-localization
*
* Copyright (c) 2017 | Rahul Doshi
* Copyright (c) 2018 | Rahul Doshi
* License: MIT
*/
;(function (angular, window, document, undefined) {
'use strict';

angular.module('ngLocalize.Version', [])
.constant('localeVer', '1.6.0');
.constant('localeVer', '1.6.1');
angular.module('ngLocalize', ['ngSanitize', 'ngLocalize.Config', 'ngLocalize.Events', 'ngLocalize.InstalledLanguages']);

angular.module('ngLocalize.InstalledLanguages', [])
Expand All @@ -26,11 +26,11 @@ angular.module('ngLocalize')
currentLocale,
deferrences,
bundles,
cookieStore,
cookies,
sym = localeConf.allowNestedJson ? '/' : '.';

if (localeConf.persistSelection && $injector.has('$cookieStore')) {
cookieStore = $injector.get('$cookieStore');
if (localeConf.persistSelection && $injector.has('$cookies')) {
cookies = $injector.get('$cookies');
}

function splitToken(tok){
Expand Down Expand Up @@ -357,8 +357,11 @@ angular.module('ngLocalize')

$rootScope.$broadcast(localeEvents.localeChanges, currentLocale);

if (cookieStore) {
cookieStore.put(localeConf.cookieName, lang);
if (cookies) {
cookies.put(localeConf.cookieName, lang);
}else if(localeConf.persistSelection){
// cookies service isnt availible and they want to persist, fallback to local storage
localStorage.setItem(localeConf.cookieName, lang);
}
}
}
Expand Down Expand Up @@ -394,9 +397,10 @@ angular.module('ngLocalize')
}

function initialSetLocale() {
setLocale(cookieStore && cookieStore.get(localeConf.cookieName) ?
cookieStore.get(localeConf.cookieName) :
getPreferredBrowserLanguage());
var initial = getPreferredBrowserLanguage();
var cookie = cookies && cookies.get(localeConf.cookieName);
var local = localeConf.persistSelection && localStorage.getItem(localeConf.cookieName);
setLocale(cookie || local || initial);
}

initialSetLocale();
Expand Down Expand Up @@ -554,4 +558,4 @@ angular.module('ngLocalize.Config', [])
allowNestedJson: false
});

}(this.angular, this, this.document));
}(window.angular, window, window.document));

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

1 change: 1 addition & 0 deletions dist/angular-localization-fi.min.css.map

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

9 changes: 9 additions & 0 deletions dist/angular-localization-fi.min.js

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

1 change: 1 addition & 0 deletions dist/angular-localization-fi.min.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/angular-localization-spiria.min.css.map

This file was deleted.

Loading