Browse Source

Merge pull request #572 from cmgustavo/feature/angular-ammoment

Changing deprecated value "changeLanguage" by "changeLocale"
generic-ui
Gustavo Maximiliano Cortez 10 years ago
parent
commit
2852afc12b
  1. 2
      public/index.html
  2. 2
      public/js/main.min.js
  3. 2
      public/src/js/config.js
  4. 2
      public/src/js/controllers/footer.js

2
public/index.html

@ -44,7 +44,7 @@
</div>
<div id="footer" role="navigation">
<div class="container" data-ng-controller="FooterController">
<div class="languages m20t pull-left">
<div class="languages m20t pull-left" ng-show="availableLanguages.0">
[
<a href="#"
ng-click="setLanguage(l.isoCode)"

2
public/js/main.min.js

File diff suppressed because one or more lines are too long

2
public/src/js/config.js

@ -49,7 +49,7 @@ angular.module('insight')
})
.run(function($rootScope, $route, $location, $routeParams, $anchorScroll, ngProgress, gettextCatalog, amMoment) {
gettextCatalog.currentLanguage = defaultLanguage;
amMoment.changeLanguage(defaultLanguage);
amMoment.changeLocale(defaultLanguage);
$rootScope.$on('$routeChangeStart', function() {
ngProgress.start();
});

2
public/src/js/controllers/footer.js

@ -24,7 +24,7 @@ angular.module('insight.system').controller('FooterController',
$scope.setLanguage = function(isoCode) {
gettextCatalog.currentLanguage = $scope.defaultLanguage = defaultLanguage = isoCode;
amMoment.changeLanguage(isoCode);
amMoment.changeLocale(isoCode);
localStorage.setItem('insight-language', isoCode);
var currentPageTemplate = $route.current.templateUrl;
$templateCache.remove(currentPageTemplate);

Loading…
Cancel
Save