Skip to content

Configureable Locale #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logbon72 merged 1 commit into from
Feb 8, 2016
Merged

Configureable Locale #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions js/angular-material-datetimepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
return ('getComputedStyle' in window) ? window.getComputedStyle(el[0])[name] : el.css(name);
}
};
moment.locale('en');

var template = '<md-dialog class="dtp" layout="column" style="width: 300px;">'
+ ' <md-dialog-content class="dtp-content">'
Expand Down Expand Up @@ -66,6 +65,17 @@
+ '</md-dialog>';

angular.module(moduleName, ['ngMaterial'])
.provider('mdcDatetimePickerDefaultLocale', function() {
this.locale = 'en';

this.$get = function() {
return this.locale;
};

this.setDefaultLocale = function(localeString) {
this.locale = localeString;
};
})
.directive('mdcDatetimePicker', ['$mdDialog',
function ($mdDialog) {

Expand All @@ -81,7 +91,8 @@
shortTime: '=',
format: '@',
cancelText: '@',
okText: '@'
okText: '@',
lang: '@'
},
link: function (scope, element, attrs, ngModel) {
var isOn = false;
Expand Down Expand Up @@ -146,7 +157,7 @@
}])
;

var PluginController = function ($scope, $mdDialog) {
var PluginController = function ($scope, $mdDialog, mdcDatetimePickerDefaultLocale) {
this.currentView = VIEW_STATES.DATE;
this._dialog = $mdDialog;

Expand All @@ -163,7 +174,7 @@
minDate: null,
maxDate: null,
currentDate: null,
lang: 'en',
lang: mdcDatetimePickerDefaultLocale,
weekStart: 0,
shortTime: false,
cancelText: 'Cancel',
Expand All @@ -174,7 +185,7 @@
this.params = angular.extend(this.params, this.options);
this.init();
};
PluginController.$inject = ['$scope', '$mdDialog'];
PluginController.$inject = ['$scope', '$mdDialog', 'mdcDatetimePickerDefaultLocale'];
PluginController.prototype = {
init: function () {
this.timeMode = this.params.time && !this.params.date;
Expand Down