localization for folderstructure

code/moya-angular/src/app/app.module.ts

@@ -48,7 +48,9 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component';
     CacheService,
     CacheService,
     MoyaLocaleService,
     MoyaLocaleService,
     { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
     { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
-    UserService],
+    UserService,
+
+  ],
   bootstrap: [AppComponent]
   bootstrap: [AppComponent]
 })
 })
 export class AppModule { }
 export class AppModule { }

code/moya-angular/src/app/menu/defines/menu.ts

@@ -9,74 +9,74 @@ export class MENU {
 
 
   static ADMIN: MenuGroup[] = [
   static ADMIN: MenuGroup[] = [
     {
     {
-      'name': 'Kauppa',
+      'name': 'shop',
       'items': [
       'items': [
-        { 'path': '/old/admin', 'name': 'Products', 'params': {p: 'product/list.jsf'} }
+        { 'path': '/old/admin', 'name': 'products', 'params': {p: 'product/list.jsf'} }
       ]}
       ]}
   ];
   ];
 
 
 
 
   static INFO: MenuGroup[] = [
   static INFO: MenuGroup[] = [
     {
     {
-      'name': 'Users',
+      'name': 'users',
       'items': [
       'items': [
-        { 'path': '/old/info', 'name': 'List users', 'params': {p: 'useradmin/list.jsf'} },
-        { 'path': '/viplist/info', 'name': 'VipList'}
+        { 'path': '/old/info', 'name': 'listusers', 'params': {p: 'useradmin/list.jsf'} },
+        { 'path': '/viplist/info', 'name': 'viplist'}
       ]}
       ]}
   ];
   ];
 
 
   static USER: MenuGroup[] = [
   static USER: MenuGroup[] = [
     {
     {
-      'name': '',
+      'name': 'frontpage',
       'items': [
       'items': [
-        { 'path': '/index', 'name': 'Frontpage' },
+        { 'path': '/index', 'name': 'frontpage' },
       ]},
       ]},
     {
     {
-      'name': 'Event',
+      'name': 'event',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'Poll', 'params': {p: 'poll/index.jsf'} },
-        { 'path': '/old/user', 'name': 'Invite friends', 'params': {p: 'user/invite.jsf'} },
+        { 'path': '/old/user', 'name': 'poll', 'params': {p: 'poll/index.jsf'} },
+        { 'path': '/old/user', 'name': 'invite', 'params': {p: 'user/invite.jsf'} },
       ]},
       ]},
     {
     {
-      'name': 'Shop',
+      'name': 'shop',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'Buy Tickets', 'params': {p: 'shop/createBill.jsf'} },
-        { 'path': '/old/user', 'name': 'Reserve Places', 'params': {p: 'neomap/reserve.jsf'} },
-        { 'path': '/old/user', 'name': 'Change Places', 'params': {p: 'neomap/moveplaces.jsf'} },
-        { 'path': '/old/user', 'name': 'Food Orders', 'params': {p: 'foodwave/list.jsf'} },
-        { 'path': '/old/user', 'name': 'Own Orders', 'params': {p: 'bill/list.jsf'} },
-        { 'path': '/old/user', 'name': 'Account Events', 'params': {p: 'user/accountEvents.jsf'} },
+        { 'path': '/old/user', 'name': 'buytickets', 'params': {p: 'shop/createBill.jsf'} },
+        { 'path': '/old/user', 'name': 'reserveplaces', 'params': {p: 'neomap/reserve.jsf'} },
+        { 'path': '/old/user', 'name': 'changeplaces', 'params': {p: 'neomap/moveplaces.jsf'} },
+        { 'path': '/old/user', 'name': 'foodorders', 'params': {p: 'foodwave/list.jsf'} },
+        { 'path': '/old/user', 'name': 'ownorders', 'params': {p: 'bill/list.jsf'} },
+        { 'path': '/old/user', 'name': 'accountevents', 'params': {p: 'user/accountEvents.jsf'} },
       ]},
       ]},
     {
     {
-      'name': 'Computerplaces',
+      'name': 'computerplaces',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'Own Places', 'params': {p: 'place/myGroups.jsf'} },
-        { 'path': '/old/user', 'name': 'Placemap', 'params': {p: 'neomap/view.jsf'} },
+        { 'path': '/old/user', 'name': 'ownplaces', 'params': {p: 'place/myGroups.jsf'} },
+        { 'path': '/old/user', 'name': 'placemap', 'params': {p: 'neomap/view.jsf'} },
       ]},
       ]},
     {
     {
-      'name': 'Competitions',
+      'name': 'competitions',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'Compos', 'params': {p: 'voting/compolist.jsf'} },
-        { 'path': '/old/user', 'name': 'My entries', 'params': {p: 'voting/myEntries.jsf'} },
+        { 'path': '/old/user', 'name': 'compos', 'params': {p: 'voting/compolist.jsf'} },
+        { 'path': '/old/user', 'name': 'myentries', 'params': {p: 'voting/myEntries.jsf'} },
       ]},
       ]},
     {
     {
-      'name': 'Profile',
+      'name': 'profile',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'My Information', 'params': {p: 'user/edit.jsf'} },
-        { 'path': '/old/user', 'name': 'Request Role', 'params': {p: 'orgrole/requestRole.jsf'} },
-        { 'path': '/old/user', 'name': 'Change password', 'params': {p: 'user/changePassword.jsf'} },
-        { 'path': '/old/user', 'name': 'Set GameIDs', 'params': {p: 'user/gameids.jsf'} },
+        { 'path': '/old/user', 'name': 'myinformation', 'params': {p: 'user/edit.jsf'} },
+        { 'path': '/old/user', 'name': 'requestrole', 'params': {p: 'orgrole/requestRole.jsf'} },
+        { 'path': '/old/user', 'name': 'changepassword', 'params': {p: 'user/changePassword.jsf'} },
+        { 'path': '/old/user', 'name': 'setgameids', 'params': {p: 'user/gameids.jsf'} },
       ]},
       ]},
     {
     {
-      'name': 'Tournaments',
+      'name': 'tournaments',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'Tournaments List', 'params': {p: 'tournaments/index.jsf'} },
-        { 'path': '/old/user', 'name': 'My Participations', 'params': {p: 'tournaments/myparticipations.jsf'} },
+        { 'path': '/old/user', 'name': 'tournamentslist', 'params': {p: 'tournaments/index.jsf'} },
+        { 'path': '/old/user', 'name': 'myparticipations', 'params': {p: 'tournaments/myparticipations.jsf'} },
       ]},
       ]},
     {
     {
-      'name': 'Lectures and Courses',
+      'name': 'lecturesandcourses',
       'items': [
       'items': [
-        { 'path': '/old/user', 'name': 'Participate', 'params': {p: 'lectures/viewLectures.jsf'} },
+        { 'path': '/old/user', 'name': 'participate', 'params': {p: 'lectures/viewLectures.jsf'} },
       ]},
       ]},
   ];
   ];
 
 

code/moya-angular/src/app/menu/left-menu/left-menu.component.html

@@ -6,8 +6,8 @@
 
 
     <div *ngFor="let group of menu" class="leftNavGroup">
     <div *ngFor="let group of menu" class="leftNavGroup">
 
 
-      <span class="menuHeader">{{group.name}}</span>
-      <a *ngFor="let item of group.items" class="leftNavItem" [routerLink]="item.path" routerLinkActive="active" [queryParams]="item.params" >{{item.name}}</a>
+      <span class="menuHeader" >{{"menu."+group.name+".group" | translate }}</span>
+      <a *ngFor="let item of group.items" class="leftNavItem" [routerLink]="item.path" routerLinkActive="active" [queryParams]="item.params" translate >menu.{{group.name}}.{{item.name}}</a>
 
 
     </div>
     </div>
 
 

code/moya-angular/src/app/menu/left-menu/left-menu.component.ts

@@ -2,11 +2,13 @@ import {Component, OnInit} from '@angular/core';
 import {MenuGroup} from '../models/menu-group.model';
 import {MenuGroup} from '../models/menu-group.model';
 import {MENU} from '../defines/menu';
 import {MENU} from '../defines/menu';
 import {ActivatedRoute, Router, RouterEvent, UrlSegment} from '@angular/router';
 import {ActivatedRoute, Router, RouterEvent, UrlSegment} from '@angular/router';
+import {TranslatePipe} from "@ngx-translate/core";
 
 
 @Component({
 @Component({
   selector: 'left-menu',
   selector: 'left-menu',
   templateUrl: './left-menu.component.html',
   templateUrl: './left-menu.component.html',
-  styleUrls: ['./left-menu.component.scss']
+  styleUrls: ['./left-menu.component.scss'],
+  providers: [TranslatePipe]
 })
 })
 export class LeftMenuComponent implements OnInit {
 export class LeftMenuComponent implements OnInit {
 
 

code/moya-angular/src/app/menu/left-menu/left-menu.module.ts

@@ -2,11 +2,13 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { LeftMenuComponent } from './left-menu.component';
 import { LeftMenuComponent } from './left-menu.component';
 import { RouterModule } from '@angular/router';
 import { RouterModule } from '@angular/router';
+import {TranslateModule} from "@ngx-translate/core";
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
-    RouterModule
+    RouterModule,
+    TranslateModule.forChild()
   ],
   ],
   declarations: [LeftMenuComponent],
   declarations: [LeftMenuComponent],
   exports : [
   exports : [

code/moya-angular/src/app/menu/top-menu/top-menu.component.html

 
 
 <nav id="topNav">
 <nav id="topNav">
-  <a  class="topNavItem" id="userTopNav" routerLink="/index" routerLinkActive="active"  i18n>Kävijänäkymä</a>
-  <a  class="topNavItem" id="infoTopNav" routerLink="/old/info" routerLinkActive="active" [queryParams]="{p: 'useradmin/list.jsf'}"  i18n>Infonäkymä</a>
-  <a  class="topNavItem" id="adminTopNav" routerLink="/old/admin" routerLinkActive="active" [queryParams]="{p: 'product/list.jsf'}"  i18n>Ylläpitonäkymä</a>
+  <a  class="topNavItem" id="userTopNav" routerLink="/index" routerLinkActive="active"  translate>menu.top.user</a>
+  <a  class="topNavItem" id="infoTopNav" routerLink="/old/info" routerLinkActive="active" [queryParams]="{p: 'useradmin/list.jsf'}"  translate>menu.top.info</a>
+  <a  class="topNavItem" id="adminTopNav" routerLink="/old/admin" routerLinkActive="active" [queryParams]="{p: 'product/list.jsf'}"  translate>menu.top.admin</a>
 </nav>
 </nav>

code/moya-angular/src/app/modules/viplist/info/info-viplist-page.component.html

 
 
 <mat-table  #table [dataSource]="vips | async">
 <mat-table  #table [dataSource]="vips | async">
   <ng-container matColumnDef="host">
   <ng-container matColumnDef="host">
-    <mat-header-cell *matHeaderCellDef translate >  vip.host </mat-header-cell>
+    <mat-header-cell *matHeaderCellDef translate >vip.host </mat-header-cell>
     <mat-cell *matCellDef="let v" > {{v.host.firstname}} {{ v.host.lastname}} </mat-cell>
     <mat-cell *matCellDef="let v" > {{v.host.firstname}} {{ v.host.lastname}} </mat-cell>
   </ng-container>
   </ng-container>
 
 

code/moya-angular/src/app/modules/viplist/info/info-viplist-page.component.ts

@@ -2,6 +2,7 @@ import {Component, NgZone, OnInit} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import {Observable} from 'rxjs/Observable';
 import {Vip} from '../models/vip.model';
 import {Vip} from '../models/vip.model';
 import {ViplistService} from '../viplist.service';
 import {ViplistService} from '../viplist.service';
+import {TranslatePipe} from "@ngx-translate/core";
 
 
 @Component({
 @Component({
   selector: 'moya-viplist',
   selector: 'moya-viplist',

code/moya-angular/src/assets/i18n/en.json

@@ -15,5 +15,76 @@
     "description": "Description",
     "description": "Description",
     "products": "Products",
     "products": "Products",
     "deliver": "Deliver"
     "deliver": "Deliver"
+  },
+
+  "menu": {
+    "top": {
+      "user": "User",
+      "info": "Info",
+      "admin": "Admin"
+    },
+
+    "users": {
+      "group": "Users",
+      "listusers": "List users",
+      "viplist": "Vips"
+    },
+    "frontpage": {
+      "frontpage": "Frontpage",
+      "group": ""
+    },
+
+
+    "event": {
+      "group": "Event",
+      "poll": "Polls",
+      "invite": "Invite friends"
+    },
+
+    "shop": {
+      "group": "Shop",
+      "products": "Procucts",
+      "buytickets": "Buy tickets",
+      "reserveplaces": "Reserve places",
+      "changeplaces": "Change places",
+      "foodorders": "Food orders",
+      "ownorders": "Own orders",
+      "accountevents": "Own accountevents"
+    },
+
+    "computerplaces": {
+      "group": "Computerplaces",
+      "ownplaces": "Own places",
+      "placemap": "Placemap"
+    },
+
+
+    "competitions": {
+      "group": "Demo Compos",
+      "compos": "All compos",
+      "myentries": "Own entries"
+    },
+
+
+    "profile": {
+      "group": "Profile",
+      "myinformation": "Own information",
+      "requestrole": "Request role",
+      "changepassword": "Change password",
+      "setgameids": "Set game id's"
+    },
+
+    "tournaments": {
+      "group": "Tournaments",
+      "tournamentslist": "All tournaments",
+      "myparticipations": "Own tournaments"
+    },
+
+    "lecturesandcourses": {
+      "group": "Lectures and courses",
+      "participate": "Participate"
+    }
+
+
   }
   }
 }
 }

code/moya-angular/src/assets/i18n/fi.json

@@ -15,5 +15,75 @@
     "description": "Kuvaus",
     "description": "Kuvaus",
     "products": "Tuotteet",
     "products": "Tuotteet",
     "deliver": "Toimita"
     "deliver": "Toimita"
+  },
+  "menu": {
+    "top": {
+      "user": "Kävijänäkymä",
+      "info": "Infonäkymä",
+      "admin": "Ylläpitonäkymä"
+    },
+
+    "users": {
+      "group": "Käyttäjät",
+      "listusers": "Listaa käyttäjät",
+      "viplist": "Vipit"
+    },
+    "frontpage": {
+      "frontpage": "Etusivu",
+      "group": ""
+    },
+
+
+    "event": {
+      "group": "Tapahtuma",
+      "poll": "Äänestykset",
+      "invite": "Kutsu kavereita"
+    },
+
+    "shop": {
+      "group": "Kauppa",
+      "products": "Tuotteet",
+      "buytickets": "Osta lippuja",
+      "reserveplaces": "Varaa paikkoja",
+      "changeplaces": "Vaihda paikkoja",
+      "foodorders": "Ruokatilaukset",
+      "ownorders": "Omat tilaukset",
+      "accountevents": "Omat tilitapahtumat"
+    },
+
+    "computerplaces": {
+      "group": "Konepaikat",
+      "ownplaces": "Omat paikat",
+      "placemap": "Paikkakartta"
+    },
+
+
+    "competitions": {
+      "group": "Demokilpailut",
+      "compos": "Kaikki kilpailut",
+      "myentries": "Omat entryt"
+    },
+
+
+    "profile": {
+      "group": "Profiili",
+      "myinformation": "Omat tieodt",
+      "requestrole": "Hae roolia",
+      "changepassword": "Vaihda salasana",
+      "setgameids": "Aseta pelaajatunnukset"
+    },
+
+    "tournaments": {
+      "group": "Turnaukset",
+      "tournamentslist": "Kaikki turnaukset",
+      "myparticipations": "Omat turnaukset"
+    },
+
+    "lecturesandcourses": {
+      "group": "Luennot ja kurssit",
+      "participate": "Osallistu"
+    }
+
+
   }
   }
 }
 }

code/moya-angular/src/assets/i18n/sv.json

@@ -15,5 +15,77 @@
     "description": "Beskrivning",
     "description": "Beskrivning",
     "products": "Produkter",
     "products": "Produkter",
     "deliver": "Leverera"
     "deliver": "Leverera"
+  },
+
+
+  "menu": {
+    "top": {
+      "user": "Användare",
+      "info": "Info",
+      "admin": "Admin"
+    },
+
+    "users": {
+      "group": "Användare",
+      "listusers": "Lista användare",
+      "viplist": "Vip"
+    },
+    "frontpage": {
+      "frontpage": "Framsida",
+      "group": ""
+    },
+
+
+    "event": {
+      "group": "Händelse",
+      "poll": "Röstning",
+      "invite": "Bjuda in vänner"
+    },
+
+    "shop": {
+      "group": "Butik",
+      "products": "Produkt",
+      "buytickets": "Köpa biljetter ",
+      "reserveplaces": "Reservera platser",
+      "changeplaces": "Byta platser",
+      "foodorders": "Mat beställiningar",
+      "ownorders": "Egna beställiningar",
+      "accountevents": "Egna räkenskaper"
+    },
+
+    "computerplaces": {
+      "group": "Datorplatser",
+      "ownplaces": "Egna Datorplatser",
+      "placemap": "Datorplatser karta"
+    },
+
+
+    "competitions": {
+      "group": "Demo Compos",
+      "compos": "Alla compos",
+      "myentries": "Egna poster"
+    },
+
+
+    "profile": {
+      "group": "Profil",
+      "myinformation": "Egna information",
+      "requestrole": "Begäran roll",
+      "changepassword": "Ändra lösenord",
+      "setgameids": "Ange spel-id"
+    },
+
+    "tournaments": {
+      "group": "Turnering",
+      "tournamentslist": "Allt Turnering",
+      "myparticipations": "Egna Turnering"
+    },
+
+    "lecturesandcourses": {
+      "group": "Föreläsningar och kurser",
+      "participate": "Delta"
+    }
+
+
   }
   }
 }
 }

code/moya-web/src/main/java/fi/codecrew/moya/HostnameFilter.java

@@ -211,6 +211,7 @@ public class HostnameFilter implements Filter {
 			} else if (!httpRequest.getUserPrincipal().getName().equals(User.ANONYMOUS_LOGINNAME + '@' + hostname)) {
 			} else if (!httpRequest.getUserPrincipal().getName().equals(User.ANONYMOUS_LOGINNAME + '@' + hostname)) {
 				authtype = AuthType.USER;
 				authtype = AuthType.USER;
 				sessionmgmt.updateSessionUser(httpRequest.getSession().getId(), httpRequest.getUserPrincipal().getName());
 				sessionmgmt.updateSessionUser(httpRequest.getSession().getId(), httpRequest.getUserPrincipal().getName());
+				//sessionmgmt.updateSessionUser(httpRequest.getSession().getId(), "tkfftk");
 			}
 			}
 
 
 			// Update logging context
 			// Update logging context