From 756fa83418e470578b0b43975a7c4e3d2e244284 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 29 Dec 2014 22:26:12 +0100 Subject: [PATCH] fix(date): typo --- public/js/controllers/settingsCtrl.js | 2 +- src/models/user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 4974a5045c..4481ed2480 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -65,7 +65,7 @@ habitrpg.controller('SettingsCtrl', User.set({'preferences.language': $scope.language.code}); } - $scope.availableFormats = ['MM/dd/yyyy','dd/MM/yyyy', 'YYYY/MM/DD']; + $scope.availableFormats = ['MM/dd/yyyy','dd/MM/yyyy', 'yyyy/MM/dd']; $scope.reroll = function(){ User.user.ops.reroll({}); diff --git a/src/models/user.js b/src/models/user.js index 85a3d89cb3..a9527cd512 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -278,7 +278,7 @@ var UserSchema = new Schema({ automaticAllocation: Boolean, allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'}, costume: Boolean, - dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy', 'YYYY/MM/DD'], 'default': 'MM/dd/yyyy'}, + dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy', 'yyyy/MM/dd'], 'default': 'MM/dd/yyyy'}, sleep: {type: Boolean, 'default': false}, stickyHeader: {type: Boolean, 'default': true}, disableClasses: {type: Boolean, 'default': false},