mirror of
https://github.com/grafana/grafana.git
synced 2026-09-05 04:40:13 -05:00
Merge branch 'moment-locale' of https://github.com/gofore/grafana into gofore-moment-locale
This commit is contained in:
@@ -14,6 +14,7 @@ import $ from 'jquery';
|
|||||||
import angular from 'angular';
|
import angular from 'angular';
|
||||||
import config from 'app/core/config';
|
import config from 'app/core/config';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
import moment from 'moment';
|
||||||
import {coreModule} from './core/core';
|
import {coreModule} from './core/core';
|
||||||
|
|
||||||
export class GrafanaApp {
|
export class GrafanaApp {
|
||||||
@@ -47,6 +48,8 @@ export class GrafanaApp {
|
|||||||
}
|
}
|
||||||
$httpProvider.useApplyAsync(true);
|
$httpProvider.useApplyAsync(true);
|
||||||
|
|
||||||
|
moment.locale(window.navigator.userLanguage || window.navigator.language);
|
||||||
|
|
||||||
this.registerFunctions.controller = $controllerProvider.register;
|
this.registerFunctions.controller = $controllerProvider.register;
|
||||||
this.registerFunctions.directive = $compileProvider.directive;
|
this.registerFunctions.directive = $compileProvider.directive;
|
||||||
this.registerFunctions.factory = $provide.factory;
|
this.registerFunctions.factory = $provide.factory;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="openFromPicker">
|
<div ng-if="openFromPicker">
|
||||||
<datepicker ng-model="ctrl.absolute.fromJs" class="gf-timepicker-component" show-weeks="false" ng-change="ctrl.absoluteFromChanged()"></datepicker>
|
<datepicker ng-model="ctrl.absolute.fromJs" class="gf-timepicker-component" show-weeks="false" starting-day="firstDayOfWeek" ng-change="ctrl.absoluteFromChanged()"></datepicker>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="openToPicker">
|
<div ng-if="openToPicker">
|
||||||
<datepicker ng-model="ctrl.absolute.toJs" class="gf-timepicker-component" show-weeks="false" ng-change="ctrl.absoluteToChanged()"></datepicker>
|
<datepicker ng-model="ctrl.absolute.toJs" class="gf-timepicker-component" show-weeks="false" starting-day="firstDayOfWeek" ng-change="ctrl.absoluteToChanged()"></datepicker>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<label class="small">Refreshing every:</label>
|
<label class="small">Refreshing every:</label>
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ export class TimePickerCtrl {
|
|||||||
refresh: any;
|
refresh: any;
|
||||||
isOpen: boolean;
|
isOpen: boolean;
|
||||||
isUtc: boolean;
|
isUtc: boolean;
|
||||||
|
firstDayOfWeek: number;
|
||||||
|
|
||||||
/** @ngInject */
|
/** @ngInject */
|
||||||
constructor(private $scope, private $rootScope, private timeSrv) {
|
constructor(private $scope, private $rootScope, private timeSrv) {
|
||||||
@@ -43,6 +44,8 @@ export class TimePickerCtrl {
|
|||||||
|
|
||||||
_.defaults(this.panel, TimePickerCtrl.defaults);
|
_.defaults(this.panel, TimePickerCtrl.defaults);
|
||||||
|
|
||||||
|
this.firstDayOfWeek = moment.localeData().firstDayOfWeek();
|
||||||
|
|
||||||
var time = angular.copy(this.timeSrv.timeRange());
|
var time = angular.copy(this.timeSrv.timeRange());
|
||||||
var timeRaw = angular.copy(this.timeSrv.timeRange(false));
|
var timeRaw = angular.copy(this.timeSrv.timeRange(false));
|
||||||
|
|
||||||
|
|||||||
Vendored
+11185
-3455
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user