Skip to content

Commit 393d16d

Browse files
committed
Small fixes
1 parent 859f804 commit 393d16d

File tree

10 files changed

+10
-6
lines changed

10 files changed

+10
-6
lines changed

eFormAPI/eFormAPI/Controllers/SettingsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public OperationResult ConnectionStringExist()
3434
{
3535
return new OperationResult(true);
3636
}
37-
return new OperationResult(false);
37+
return new OperationResult(false, "Connection string does not exist");
3838
}
3939

4040
[AllowAnonymous]
Binary file not shown.
182 KB
Loading
4.19 MB
Loading
2.57 MB
Loading
1.53 MB
Loading

eform-client/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"tsConfig": "src/tsconfig.app.json",
2525
"assets": [
2626
{ "glob": "**/*", "input": "src/assets/", "output": "/assets/" },
27-
{ "glob": "**/assets/**", "input": "src/app/plugins/modules", "output": "/assets/plugins/" },
27+
{ "glob": "**/assets/**", "input": "src/app/plugins/modules", "output": "/assets/" },
2828
{ "glob": "favicon.ico", "input": "/src", "output": "/" }
2929
],
3030
"styles": [

eform-client/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test": "ng test",
1010
"lint": "ng lint",
1111
"e2e": "ng e2e",
12-
"wt":"./node_modules/.bin/wdio wdio.conf.js"
12+
"wt": "./node_modules/.bin/wdio wdio.conf.js"
1313
},
1414
"private": true,
1515
"dependencies": {
@@ -33,11 +33,13 @@
3333
"chart.js": "^2.5.0",
3434
"core-js": "^2.5.4",
3535
"date-fns": "^1.29.0",
36+
"glob": "^7.1.3",
3637
"hammerjs": "^2.0.8",
3738
"ng2-dragula": "^2.0.2",
3839
"ng2-file-upload": "^1.3.0",
3940
"ngx-slimscroll": "^5.2.2",
4041
"ngx-toastr": "^8.10.0",
42+
"ngx-translate-multi-http-loader": "^2.0.2",
4143
"npm": "^6.4.1",
4244
"rxjs": "^6.0.0",
4345
"zone.js": "^0.8.26"

eform-client/src/app/app.routing.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export const routes: Routes = [
3838
},
3939
{
4040
path: 'application-settings',
41-
canActivate: [AdminGuard],
4241
loadChildren: './modules/application-settings/application-settings.module#ApplicationSettingsModule'
4342
},
4443
{

eform-client/src/app/common/helpers/locale.helper.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {HttpClient} from '@angular/common/http';
22
import {MissingTranslationHandler, MissingTranslationHandlerParams, TranslateLoader} from '@ngx-translate/core';
3-
import {TranslateHttpLoader} from '@ngx-translate/http-loader';
3+
import {MultiTranslateHttpLoader} from 'ngx-translate-multi-http-loader';
44

55
// Missing translation
66
export class EformMissingTranslationHandler implements MissingTranslationHandler {
@@ -28,7 +28,10 @@ export class EformMissingTranslationHandler implements MissingTranslationHandler
2828

2929
// AoT requires an exported function for factories
3030
export function createTranslateLoader(http: HttpClient) {
31-
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
31+
return new MultiTranslateHttpLoader(http, [
32+
{prefix: './assets/i18n/', suffix: '.json'},
33+
// {prefix: './assets/plugins/customers-pn/assets/i18n/', suffix: '.json'}
34+
]);
3235
}
3336

3437
export let translateConfig = {

0 commit comments

Comments
 (0)