Skip to content

Commit

Permalink
update culture default to en-us
Browse files Browse the repository at this point in the history
Smilefounder committed Mar 25, 2018
1 parent ba409df commit 539def6
Showing 5 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/Swastika.Cms.Web.Mvc/wwwroot/app/all-app-portal.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ app.controller('ModuleDataController', function PhoneListController($scope) {
var vm = this
vm.data = null;

vm.currentLanguage = 'vi-vn';
vm.currentLanguage = 'en-us';

vm.settings = {
"async": true,
@@ -62,4 +62,4 @@ app.controller('ModuleDataController', function PhoneListController($scope) {
}
});
}
});
});
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';
app.controller('PortalController', function PhoneListController($scope) {
$scope.currentLanguage = 'vi-vn';
$scope.currentLanguage = 'en-us';
$scope.isBusy = true;
$scope.isLocalDb = false;
$scope.mediaData = {};
@@ -253,7 +253,6 @@ app.controller('PortalController', function PhoneListController($scope) {
});
}


$scope.updateEditors = function () {
setTimeout(function () {
$.each($('.code-editor'), function (i, e) {
@@ -281,4 +280,4 @@ app.controller('PortalController', function PhoneListController($scope) {
});
}, 200);
};
});
});
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';
app.controller('PortalTemplateController', function PhoneListController($scope) {
var vm = this;
vm.currentLanguage = 'vi-vn';
vm.currentLanguage = 'en-us';
vm.templates = [];
vm.activedTemplate = { };
vm.activedTemplate = {};
vm.request = {
pageSize: 10,
pageIndex: 0,
@@ -50,7 +50,6 @@ app.controller('PortalTemplateController', function PhoneListController($scope)
});
vm.templates = response.data.items;
if (vm.templates != undefined && vm.templates.length > 0) {

var newTemplate = angular.copy(vm.templates[0]);
newTemplate.id = 0;
newTemplate.fileName = '_blank';
@@ -72,13 +71,8 @@ app.controller('PortalTemplateController', function PhoneListController($scope)
}
});
ph.resolve(true);

}
return promise;




};
vm.updateEditors = function () {
setTimeout(function () {
@@ -107,4 +101,4 @@ app.controller('PortalTemplateController', function PhoneListController($scope)
});
}, 200);
};
});
});
4 changes: 2 additions & 2 deletions src/Swastka.Cms.Api/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -11,15 +11,15 @@
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "api/vi-vn/articles",
"launchUrl": "api/en-us/articles",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Swastka.Cms.Api": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "api/vi-vn/articles",
"launchUrl": "api/en-us/articles",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},

0 comments on commit 539def6

Please sign in to comment.