fix names for files and language string [Angular]

Author: llstarscreamll

UI/WEB/Views/GeneratorTemplates/Angular2/containers/list-and-search-html.blade.php

@@ -11,7 +11,7 @@
 
 				<div class="row">
 					<div class="col-sm-6 col-md-8">
-						<a [routerLink]="[ '/{{ camel_case($gen->entityName()) }}/create' ]" class="btn btn-primary">
+						<a [routerLink]="[ '/{{ $gen->slugEntityName() }}/create' ]" class="btn btn-primary">
 							<i class="glyphicon glyphicon-plus"></i>
 							<span translate>{{ $upEntity }}.create</span>
 						</a>

UI/WEB/Views/GeneratorTemplates/Angular2/effects/effects.blade.php

@@ -17,7 +17,7 @@
 
 	public constructor(
     private actions$: Actions,
-    private {{ $service = $camelEntity.'Service' }}: {{ $entitySin }}Service,
+    private {{ $service = camel_case($entitySin).'Service' }}: {{ $entitySin }}Service,
     private formModelParser: FormModelParser
   ) { }
 
@@ -37,7 +37,7 @@
     .ofType({{ $actions }}.ActionTypes.GET_{{ $gen->entityNameSnakeCase() }}_FORM_MODEL)
     .switchMap(() => {
       return this.{{ $service }}.get{{ $gen->entityName() }}FormModel()
-        .map((data) => this.formModelParser.parse(data, '{{ strtoupper($gen->entityName()) }}.fields.{{ camel_case($gen->entityName(true)) }}.'))
+        .map((data) => this.formModelParser.parse(data, this.{{ $service }}.fieldsLangNamespace))
         .map((data) => { return new {{ $actions }}.GetFormModelSuccessAction(data)})
         .catch((error) => {
           error.type = 'danger';

UI/WEB/Views/GeneratorTemplates/Angular2/services/service.blade.php

@@ -14,7 +14,8 @@
 export class {{ $entitySin }}Service extends Service {
 
 	protected API_ENDPOINT: string = '{{ str_slug($gen->tableName, $separator = "-") }}';
-  protected langNamespace: string = '{{ strtoupper($gen->entityName()) }}';
+  public langNamespace: string = '{{ $gen->entityNameSnakeCase() }}';
+  public fieldsLangNamespace: string = '{{ $gen->entityNameSnakeCase() }}.fields.{{ $gen->tableName }}.';
 
 	public constructor(
     private http: Http,