Skip to content

Commit 2341dcc

Browse files
committed
Spanish timestamp format (using angular-moment)
1 parent 4d80683 commit 2341dcc

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ module.exports = function(grunt) {
2626
}
2727
},
2828
vendors: {
29-
src: ['public/src/js/ios-imagefile-megapixel/megapix-image.js', 'public/lib/qrcode-generator/js/qrcode.js', 'public/src/js/jsqrcode/grid.js', 'public/src/js/jsqrcode/version.js', 'public/src/js/jsqrcode/detector.js', 'public/src/js/jsqrcode/formatinf.js', 'public/src/js/jsqrcode/errorlevel.js', 'public/src/js/jsqrcode/bitmat.js', 'public/src/js/jsqrcode/datablock.js', 'public/src/js/jsqrcode/bmparser.js', 'public/src/js/jsqrcode/datamask.js', 'public/src/js/jsqrcode/rsdecoder.js', 'public/src/js/jsqrcode/gf256poly.js', 'public/src/js/jsqrcode/gf256.js', 'public/src/js/jsqrcode/decoder.js', 'public/src/js/jsqrcode/qrcode.js', 'public/src/js/jsqrcode/findpat.js', 'public/src/js/jsqrcode/alignpat.js', 'public/src/js/jsqrcode/databr.js', 'public/lib/momentjs/min/moment.min.js', 'public/lib/zeroclipboard/ZeroClipboard.min.js'],
29+
src: ['public/src/js/ios-imagefile-megapixel/megapix-image.js', 'public/lib/qrcode-generator/js/qrcode.js', 'public/src/js/jsqrcode/grid.js', 'public/src/js/jsqrcode/version.js', 'public/src/js/jsqrcode/detector.js', 'public/src/js/jsqrcode/formatinf.js', 'public/src/js/jsqrcode/errorlevel.js', 'public/src/js/jsqrcode/bitmat.js', 'public/src/js/jsqrcode/datablock.js', 'public/src/js/jsqrcode/bmparser.js', 'public/src/js/jsqrcode/datamask.js', 'public/src/js/jsqrcode/rsdecoder.js', 'public/src/js/jsqrcode/gf256poly.js', 'public/src/js/jsqrcode/gf256.js', 'public/src/js/jsqrcode/decoder.js', 'public/src/js/jsqrcode/qrcode.js', 'public/src/js/jsqrcode/findpat.js', 'public/src/js/jsqrcode/alignpat.js', 'public/src/js/jsqrcode/databr.js', 'public/lib/momentjs/min/moment.min.js', 'public/lib/moment/lang/es.js', 'public/lib/zeroclipboard/ZeroClipboard.min.js'],
3030
dest: 'public/js/vendors.js'
3131
},
3232
angular: {
33-
src: ['public/lib/angular/angular.min.js', 'public/lib/angular-resource/angular-resource.min.js', 'public/lib/angular-route/angular-route.min.js', 'public/lib/angular-qrcode/qrcode.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.js', 'public/lib/angular-ui-utils/ui-utils.min.js', 'public/lib/ngprogress/build/ngProgress.min.js', 'public/lib/angular-gettext/dist/angular-gettext.min.js'],
33+
src: ['public/lib/angular/angular.min.js', 'public/lib/angular-resource/angular-resource.min.js', 'public/lib/angular-route/angular-route.min.js', 'public/lib/angular-qrcode/qrcode.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.js', 'public/lib/angular-ui-utils/ui-utils.min.js', 'public/lib/ngprogress/build/ngProgress.min.js', 'public/lib/angular-gettext/dist/angular-gettext.min.js', 'public/lib/angular-moment/angular-moment.min.js'],
3434
dest: 'public/js/angularjs-all.js'
3535
},
3636
main: {

bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"zeroclipboard": "~1.3.2",
1414
"ngprogress": "~1.0.4",
1515
"angular-ui-utils": "~0.1.1",
16-
"angular-gettext": "~1.1.0"
16+
"angular-gettext": "~1.1.0",
17+
"angular-moment": "~0.8.0"
1718
}
1819
}

public/js/angularjs-all.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/main.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/vendors.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/src/js/app.js

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ angular.module('insight',[
1111
'ui.route',
1212
'monospaced.qrcode',
1313
'gettext',
14+
'angularMoment',
1415
'insight.system',
1516
'insight.socket',
1617
'insight.blocks',

public/src/js/config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ angular.module('insight')
4747
$locationProvider.html5Mode(true);
4848
$locationProvider.hashPrefix('!');
4949
})
50-
.run(function($rootScope, $route, $location, $routeParams, $anchorScroll, ngProgress, gettextCatalog) {
50+
.run(function($rootScope, $route, $location, $routeParams, $anchorScroll, ngProgress, gettextCatalog, amMoment) {
5151
gettextCatalog.currentLanguage = defaultLanguage;
52+
amMoment.changeLanguage(defaultLanguage);
5253
$rootScope.$on('$routeChangeStart', function() {
5354
ngProgress.start();
5455
});

public/src/js/controllers/footer.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
angular.module('insight.system').controller('FooterController',
4-
function($scope, $route, $templateCache, gettextCatalog, Version) {
4+
function($scope, $route, $templateCache, gettextCatalog, amMoment, Version) {
55

66
$scope.defaultLanguage = defaultLanguage;
77

@@ -24,6 +24,7 @@ angular.module('insight.system').controller('FooterController',
2424

2525
$scope.setLanguage = function(isoCode) {
2626
gettextCatalog.currentLanguage = $scope.defaultLanguage = defaultLanguage = isoCode;
27+
amMoment.changeLanguage(isoCode);
2728
localStorage.setItem('insight-language', isoCode);
2829
var currentPageTemplate = $route.current.templateUrl;
2930
$templateCache.remove(currentPageTemplate);

0 commit comments

Comments
 (0)