From 7842cb9e82e236a2ae38aba49192b24f536ab846 Mon Sep 17 00:00:00 2001
From: Chris Thielen <github@sandgnat.com>
Date: Mon, 31 Oct 2016 19:01:34 -0500
Subject: [PATCH 01/20] Remove ui-router for ng1

---
 generators/client-2/files.js                  |  4 +-
 generators/client-2/templates/_package.json   |  2 -
 .../templates/src/main/webapp/_index.html     |  7 +-
 .../src/main/webapp/app/_app.module.ts        |  6 +-
 .../src/main/webapp/app/_app.ng2module.ts     | 12 +--
 .../src/main/webapp/app/_router.config.ts     | 26 ++++++
 .../src/main/webapp/app/_upgrade_adapter.ts   |  2 -
 .../webapp/app/account/_account.module.ts     |  3 +-
 .../main/webapp/app/admin/_admin.module.ts    |  3 +-
 .../webapp/app/blocks/config/_http.config.ts  | 15 +---
 .../_ui-router-defer-intercept.config.ts      |  6 --
 .../app/blocks/handlers/_state.handler.ts     | 88 ++++++++-----------
 .../webapp/app/entities/_entity.module.ts     |  1 -
 .../src/main/webapp/app/layouts/_index.ts     |  1 +
 .../layouts/main/_jhipster-main.component.ts  |  7 ++
 .../app/layouts/main/_jhipster-main.html      |  5 ++
 16 files changed, 95 insertions(+), 93 deletions(-)
 create mode 100644 generators/client-2/templates/src/main/webapp/app/_router.config.ts
 delete mode 100644 generators/client-2/templates/src/main/webapp/app/blocks/config/_ui-router-defer-intercept.config.ts
 create mode 100644 generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts
 create mode 100644 generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html

diff --git a/generators/client-2/files.js b/generators/client-2/files.js
index 16fc4c0b412f..ecc41683e7c0 100644
--- a/generators/client-2/files.js
+++ b/generators/client-2/files.js
@@ -94,13 +94,13 @@ const files = {
                 '_app.ng2module.ts',
                 '_app.state.ts',
                 '_app.constants.ts',
+                '_router.config.ts',
                 'blocks/handlers/_state.handler.ts',
                 'blocks/config/_http.config.ts',
                 'blocks/config/_localstorage.config.ts',
                 'blocks/config/_compile.config.ts',
                 'blocks/config/_uib-pager.config.ts',
                 'blocks/config/_uib-pagination.config.ts',
-                'blocks/config/_ui-router-defer-intercept.config.ts',
                 //interceptors
                 'blocks/interceptor/_auth-expired.interceptor.ts',
                 'blocks/interceptor/_errorhandler.interceptor.ts',
@@ -140,6 +140,8 @@ const files = {
                 'layouts/profiles/_profile.service.ts',
                 'layouts/profiles/_profile-info.model.ts',
                 'layouts/profiles/_page-ribbon.component.ts',
+                'layouts/main/_jhipster-main.component.ts',
+                { file: 'layouts/main/_jhipster-main.html', method: 'copyHtml' },
                 'layouts/navbar/_navbar.component.ts',
                 { file: 'layouts/navbar/_navbar.html', method: 'copyHtml' },
                 'layouts/footer/_footer.component.ts',
diff --git a/generators/client-2/templates/_package.json b/generators/client-2/templates/_package.json
index a79e4ad5d979..d5c24c77522b 100644
--- a/generators/client-2/templates/_package.json
+++ b/generators/client-2/templates/_package.json
@@ -17,7 +17,6 @@
     "@angular/platform-browser-dynamic": "2.0.1",
     "@angular/upgrade": "2.0.1",
     "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.10",
-    "angular-ui-router": "1.0.0-beta.3",
     "core-js": "2.4.1",
     "jquery": "3.1.0",
     <%_ if (enableTranslation){ _%>
@@ -27,7 +26,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.12",
     "systemjs": "0.19.27",
-    "ui-router-ng1-to-ng2": "1.0.15",
     "ui-router-ng2": "1.0.0-beta.3",
     "ui-router-visualizer": "2.0.11",
     "zone.js": "0.6.23"
diff --git a/generators/client-2/templates/src/main/webapp/_index.html b/generators/client-2/templates/src/main/webapp/_index.html
index 13c5e5697362..82949e1252f1 100644
--- a/generators/client-2/templates/src/main/webapp/_index.html
+++ b/generators/client-2/templates/src/main/webapp/_index.html
@@ -9,6 +9,7 @@
     <meta name="google" value="notranslate">
     <%_ } _%>
     <meta name="viewport" content="width=device-width">
+    <base href="/"/>
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css content/css/vendor.css -->
     <!-- bower:css -->
@@ -26,9 +27,9 @@
         <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
     <page-ribbon></page-ribbon>
-    <div ui-view="navbar" ng-cloak></div>
+    <jhipster-main></jhipster-main>
     <div class="container">
-        <div class="well" ui-view="content">
+        <div class="well">
             <!-- inject:troubleshoot -->
             <!-- This content is for troubleshooting purpose and will be removed by `gulp install` task -->
             <h1>An error has occured :-(</h1>
@@ -74,8 +75,6 @@ <h3>If you want to chat with contributors and other users</h3>
             </p>
             <!-- endinject -->
         </div>
-
-        <footer></footer>
     </div>
 
     <!-- Google Analytics: uncomment and change UA-XXXXX-X to be your site's ID.
diff --git a/generators/client-2/templates/src/main/webapp/app/_app.module.ts b/generators/client-2/templates/src/main/webapp/app/_app.module.ts
index 7b944551888d..1559cb82e2cf 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.module.ts
@@ -11,7 +11,6 @@ import { StateHandler } from './blocks/handlers/state.handler';<% if (enableTran
 
 import { TranslationConfig } from './blocks/config/translation.config';
 import { TranslationStorageProvider } from './blocks/config/translation-storage.provider';<% } %>
-import { UIRouterDeferInterceptConfig } from './blocks/config/ui-router-defer-intercept.config';
 
 import { CompileServiceConfig } from './blocks/config/compile.config';
 import { HttpConfig } from './blocks/config/http.config';
@@ -19,7 +18,7 @@ import { PagerConfig } from './blocks/config/uib-pager.config';
 import { PaginationConfig } from './blocks/config/uib-pagination.config';
 
 import { HomeComponent } from './home';
-import { NavbarComponent, FooterComponent, PageRibbonComponent } from './layouts';
+import { JHipsterMainComponent, NavbarComponent, FooterComponent, PageRibbonComponent } from './layouts';
 
 import { AuthExpiredInterceptor } from './blocks/interceptor/auth-expired.interceptor';
 <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
@@ -39,7 +38,6 @@ angular
         'ngCacheBuster',
         'ngFileUpload',
         'ui.bootstrap',
-        'ui.router.upgrade',
         'infinite-scroll',
         'angular-loading-bar',
         // jhipster-needle-angularjs-add-module JHipster will add new module here
@@ -51,11 +49,11 @@ angular
     .config(HttpConfig)
     .config(PagerConfig)
     .config(PaginationConfig)
-    .config(UIRouterDeferInterceptConfig)
     .directive('<%=jhiPrefix%>LoginModal', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>LoginModalComponent))
     .directive('home', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(HomeComponent))
     .directive('navbar', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(NavbarComponent))
     .directive('footer', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(FooterComponent))
+    .directive('jhipsterMain', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(JHipsterMainComponent))
     .factory('AuthExpiredInterceptor', AuthExpiredInterceptor)
     <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
     .factory('AuthInterceptor', AuthInterceptor)
diff --git a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
index 366e99ecd13b..898ae6170f9d 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { UIRouterModule } from 'ui-router-ng2';
-import { Ng1ToNg2Module } from 'ui-router-ng1-to-ng2';
+import { UIRouterModule, RootModule } from 'ui-router-ng2';
 import { Ng2Webstorage } from 'ng2-webstorage';
 
 import { <%=angular2AppName%>SharedModule } from './shared';
@@ -10,7 +9,9 @@ import { <%=angular2AppName%>AccountModule } from './account/account.ng2module';
 
 import { appState } from './app.state';
 import { HomeComponent, homeState } from './home';
+import { JHipsterRouterConfig } from "./router.config";
 import {
+    JHipsterMainComponent,
     NavbarComponent,
     FooterComponent,
     ProfileService,
@@ -27,6 +28,7 @@ import { localStorageConfig } from './blocks/config/localstorage.config';
 localStorageConfig();
 
 let routerConfig = {
+    configClass: JHipsterRouterConfig,
     otherwise: '/',
     states: [
         appState,
@@ -39,14 +41,14 @@ let routerConfig = {
 @NgModule({
     imports: [
         BrowserModule,
+        UIRouterModule.forRoot(routerConfig),
         Ng2Webstorage,
-        Ng1ToNg2Module,
-        UIRouterModule.forChild(routerConfig),
         <%=angular2AppName%>SharedModule,
         <%=angular2AppName%>AdminModule,
         <%=angular2AppName%>AccountModule
     ],
     declarations: [
+        JHipsterMainComponent,
         HomeComponent,
         NavbarComponent,
         ErrorComponent,
@@ -59,6 +61,6 @@ let routerConfig = {
         { provide: Window, useValue: window },
         { provide: Document, useValue: document }
     ],
-    bootstrap: [ HomeComponent ]
+    bootstrap: [ JHipsterMainComponent ]
 })
 export class <%=angular2AppName%>AppModule {}
diff --git a/generators/client-2/templates/src/main/webapp/app/_router.config.ts b/generators/client-2/templates/src/main/webapp/app/_router.config.ts
new file mode 100644
index 000000000000..5d8152e04c9d
--- /dev/null
+++ b/generators/client-2/templates/src/main/webapp/app/_router.config.ts
@@ -0,0 +1,26 @@
+import { Injectable } from "@angular/core";
+import { UIRouter, trace, Category, Transition } from "ui-router-ng2";
+import { DEBUG_INFO_ENABLED } from "./app.constants";
+import { registerTransitionHooks } from "./blocks/handlers/state.handler";
+declare var SystemJS;
+
+@Injectable()
+export class JHipsterRouterConfig {
+    constructor(router: UIRouter) {
+
+        if (DEBUG_INFO_ENABLED) {
+            trace.enable(Category.TRANSITION);
+            SystemJS.import('ui-router-visualizer').then(vis => vis.visualizer(router));
+        }
+
+        router.urlMatcherFactory.type('boolean', {
+            decode: function(val: string): boolean { return val === '1' || val === 'true'; },
+            encode: function(val: boolean) { return val ? '1' : '0'; },
+            equals: function(a, b) { return this.is(a) && a === b; },
+            is: function(val) { return [true,false].indexOf(val) >= 0; },
+            pattern: /0|1|true|false/
+        });
+
+        registerTransitionHooks(router.transitionService);
+    }
+}
diff --git a/generators/client-2/templates/src/main/webapp/app/_upgrade_adapter.ts b/generators/client-2/templates/src/main/webapp/app/_upgrade_adapter.ts
index 58373f5ada55..1d3b7cd046b5 100644
--- a/generators/client-2/templates/src/main/webapp/app/_upgrade_adapter.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_upgrade_adapter.ts
@@ -1,10 +1,8 @@
 import { UpgradeAdapter } from '@angular/upgrade';
-import { uiRouterNgUpgrade } from 'ui-router-ng1-to-ng2';
 import { forwardRef } from '@angular/core';
 import { <%=angular2AppName%>AppModule } from './app.ng2module';
 
 export var upgradeAdapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => <%=angular2AppName%>AppModule));
-uiRouterNgUpgrade.setUpgradeAdapter(upgradeAdapter);
 upgradeAdapter.upgradeNg1Provider('$stateParams');
 upgradeAdapter.upgradeNg1Provider('$uibModal');
 upgradeAdapter.upgradeNg1Provider('$state');
diff --git a/generators/client-2/templates/src/main/webapp/app/account/_account.module.ts b/generators/client-2/templates/src/main/webapp/app/account/_account.module.ts
index 05874c68a7b5..63aa3d3a9622 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/_account.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/account/_account.module.ts
@@ -33,8 +33,7 @@ angular
         'tmh.dynamicLocale',
         <%_ } _%>
         'ngResource',
-        'ui.bootstrap',
-        'ui.router'
+        'ui.bootstrap'
     ])
     <%_ if (enableSocialSignIn) { _%>
     <%_ if (authenticationType == 'jwt') { _%>
diff --git a/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts b/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts
index 9ff95d147945..da636be68b96 100644
--- a/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts
@@ -30,8 +30,7 @@ angular
         'tmh.dynamicLocale',
         <%_ } _%>
         'ngResource',
-        'ui.bootstrap',
-        'ui.router'
+        'ui.bootstrap'
     ])
     <%_ if (!skipUserManagement) { _%>
     .directive('userMgmt', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(UserMgmtComponent))
diff --git a/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts b/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts
index b727e6c75376..aa95659f30b9 100644
--- a/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts
+++ b/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts
@@ -1,23 +1,12 @@
-HttpConfig.$inject = ['$urlRouterProvider', '$httpProvider', 'httpRequestInterceptorCacheBusterProvider', '$urlMatcherFactoryProvider'];
+HttpConfig.$inject = ['$httpProvider', 'httpRequestInterceptorCacheBusterProvider'];
 
-export function HttpConfig($urlRouterProvider, $httpProvider, httpRequestInterceptorCacheBusterProvider, $urlMatcherFactoryProvider) {
+export function HttpConfig($httpProvider, httpRequestInterceptorCacheBusterProvider) {
     //Cache everything except rest api requests
     httpRequestInterceptorCacheBusterProvider.setMatchlist([/.*api.*/, /.*protected.*/], true);
 
-    $urlRouterProvider.otherwise('/');
-
     $httpProvider.interceptors.push('ErrorHandlerInterceptor');
     $httpProvider.interceptors.push('AuthExpiredInterceptor');<% if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { %>
     $httpProvider.interceptors.push('AuthInterceptor');<% } %>
     $httpProvider.interceptors.push('NotificationInterceptor');
     // jhipster-needle-angularjs-add-interceptor JHipster will add new application http interceptor here
-
-    $urlMatcherFactoryProvider.type('boolean', {
-        name : 'boolean',
-        decode: function(val) { return val === true || val === 'true'; },
-        encode: function(val) { return val ? 1 : 0; },
-        equals: function(a, b) { return this.is(a) && a === b; },
-        is: function(val) { return [true,false,0,1].indexOf(val) >= 0; },
-        pattern: /bool|true|0|1/
-    });
 }
diff --git a/generators/client-2/templates/src/main/webapp/app/blocks/config/_ui-router-defer-intercept.config.ts b/generators/client-2/templates/src/main/webapp/app/blocks/config/_ui-router-defer-intercept.config.ts
deleted file mode 100644
index f3a0260ef024..000000000000
--- a/generators/client-2/templates/src/main/webapp/app/blocks/config/_ui-router-defer-intercept.config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-UIRouterDeferInterceptConfig.$inject = ['$urlRouterProvider'];
-
-export function UIRouterDeferInterceptConfig($urlRouterProvider) {
-    // Wait until ng-upgrade is ready, in app.main.ts
-    $urlRouterProvider.deferIntercept();
-}
diff --git a/generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts b/generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts
index 5d305a2be583..293d12832753 100644
--- a/generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts
+++ b/generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts
@@ -1,17 +1,8 @@
 import { VERSION, DEBUG_INFO_ENABLED } from '../../app.constants';
-import { Transition } from 'ui-router-ng2';
-declare var SystemJS;
+import { TransitionService, Transition } from 'ui-router-ng2';
 
-StateHandler.$inject = ['$rootScope', '$transitions', <% if (enableTranslation) { %>/*'<%=jhiPrefixCapitalized%>LanguageService',*/<% } %> '$window',
-        /*'Auth', 'Principal',*/ '$uiRouter', '$trace'];
-
-export function StateHandler($rootScope, $transitions, <% if (enableTranslation) { %>/*<%=jhiPrefixCapitalized%>LanguageService,*/<% } %> $window,
-    /*Auth, Principal,*/ $uiRouter, $trace) {
-
-    if (DEBUG_INFO_ENABLED) {
-        $trace.enable('TRANSITION');
-        SystemJS.import('ui-router-visualizer').then(vis => vis.visualizer($uiRouter));
-    }
+StateHandler.$inject = ['$rootScope'];
+export function StateHandler($rootScope) {
 
     return {
         initialize: initialize
@@ -19,48 +10,43 @@ export function StateHandler($rootScope, $transitions, <% if (enableTranslation)
 
     function initialize() {
         $rootScope.VERSION = VERSION;
-        let deregistrationFns = [];
+    }
+}
 
-        deregistrationFns.push($transitions.onStart({}, (transition: Transition) => {
-            $rootScope.toState = transition.to();
-            $rootScope.toParams = transition.params();
-            $rootScope.fromState = transition.from();
+export function registerTransitionHooks($transitions: TransitionService) {
+    $transitions.onStart({}, (transition: Transition) => {
+        let $rootScope = transition.injector().get('$rootScope');
+        $rootScope.toState = transition.to();
+        $rootScope.toParams = transition.params();
+        $rootScope.fromState = transition.from();
 
-            /*if (Principal.isIdentityResolved()) { //TODO needs to fixed after migration
-                Auth.authorize();
-            }*/
+        /*if (Principal.isIdentityResolved()) { //TODO needs to fixed after migration
+         Auth.authorize();
+         }*/
 
-            <% if (enableTranslation) { %>
+        <% if (enableTranslation) { %>
             // Update the language //TODO needs to fixed after migration
+            // let $translate = transition.injector().get('$translate');
             /*<%=jhiPrefixCapitalized%>LanguageService.getCurrent().then(function (language) {
-                $translate.use(language);
-            });*/
-            <% } %>
-        }));
-
-        // Redirect to a state with an external URL (http://stackoverflow.com/a/30221248/1098564)
-        deregistrationFns.push($transitions.onStart({ to: state => state.external }, (transition: Transition) => {
-            $window.open(transition.to().url, '_self');
-            return false;
-        }));
-
-        deregistrationFns.push($transitions.onSuccess({}, (transition: Transition) => {
-            let toState = transition.to();
-            var titleKey =<% if (enableTranslation) { %> 'global.title' <% }else { %> '<%= baseName %>' <% } %>;
-
-            // Set the page title key to the one configured in state or use default one
-            if (toState.data.pageTitle) {
-                titleKey = toState.data.pageTitle;
-            }
-            <%_ if (enableTranslation) { _%>
-            //JhiLanguageService.updateTitle(titleKey); //TODO needs to fixed after migration
-            <%_ } else { _%>
-            $window.document.title = titleKey;
-            <%_ } _%>
-        }));
-
-        $rootScope.$on('$destroy', function () {
-            deregistrationFns.forEach(deregisterFn => deregisterFn());
-        });
-    }
+             $translate.use(language);
+             });*/
+        <% } %>
+    });
+
+    // Redirect to a state with an external URL (http://stackoverflow.com/a/30221248/1098564)
+    $transitions.onStart({ to: state => state['external'] }, (transition: Transition) => {
+        window.open(transition.to().url, '_self');
+        return false;
+    });
+
+    $transitions.onSuccess({}, (transition: Transition) => {
+        let toState = transition.to();
+        var titleKey =<% if (enableTranslation) { %> 'global.title' <% }else { %> '<%= baseName %>' <% } %>;
+
+        // Set the page title key to the one configured in state or use default one
+        if (toState.data.pageTitle) {
+            titleKey = toState.data.pageTitle;
+        }
+        <% if (enableTranslation) { %>transition.injector().get('TranslationHandler').updateTitle(titleKey);<% } else { %>$window.document.title = titleKey;<% } %>
+    });
 }
diff --git a/generators/client-2/templates/src/main/webapp/app/entities/_entity.module.ts b/generators/client-2/templates/src/main/webapp/app/entities/_entity.module.ts
index 777906c65581..06e116030cb4 100644
--- a/generators/client-2/templates/src/main/webapp/app/entities/_entity.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/entities/_entity.module.ts
@@ -4,6 +4,5 @@ angular
         'ngResource',
         'ngFileUpload',
         'ui.bootstrap',
-        'ui.router',
         'infinite-scroll'
     ]);
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts b/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts
index efb19d78d745..a5f9b4a29486 100644
--- a/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts
+++ b/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts
@@ -1,5 +1,6 @@
 export * from './error/error.component';
 export * from './error/error.state';
+export * from './main/jhipster-main.component';
 export * from './footer/footer.component';
 export * from './navbar/navbar.component';
 <%_ if (enableTranslation){ _%>
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts b/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts
new file mode 100644
index 000000000000..9b7c372c66f4
--- /dev/null
+++ b/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'jhipster-main',
+    templateUrl: 'app/layouts/main/jhipster-main.html'
+})
+export class JHipsterMainComponent {}
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html b/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html
new file mode 100644
index 000000000000..cf301f683202
--- /dev/null
+++ b/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html
@@ -0,0 +1,5 @@
+<div ui-view="navbar"></div>
+<div class="container">
+    <div class="well" ui-view="content"></div>
+    <footer></footer>
+</div>

From e612f037293c88ca4832a2abcf49c3b0898b5920 Mon Sep 17 00:00:00 2001
From: Chris Thielen <github@sandgnat.com>
Date: Mon, 31 Oct 2016 20:19:31 -0500
Subject: [PATCH 02/20] Use ng2 style onEnter hooks

---
 .../user-management/_user-management.state.ts | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts b/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts
index 4bcf4e1fb3b1..233f1270994f 100644
--- a/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts
+++ b/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts
@@ -1,4 +1,5 @@
 import { Transition } from 'ui-router-ng2';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { UserMgmtComponent } from './user-management.component';
 import { UserMgmtDetailComponent } from './user-management-detail.component';
 import { UserMgmtDialogComponent } from './user-management-dialog.component';
@@ -83,9 +84,9 @@ export const userMgmtNewState = {
     data: {
         authorities: ['ROLE_ADMIN']
     },
-    onEnter: ['$transition$', (trans: Transition) => {
-        let $state = trans.injector().get('$state');
-        let modalService = trans.injector().get('NgbModal');
+    onEnter: (trans: Transition) => {
+        let $state = trans.router.stateService;
+        let modalService = trans.injector().get(NgbModal);
         const modalRef  = modalService.open(UserMgmtDialogComponent, { size: 'lg', backdrop: 'static'});
         modalRef.componentInstance.user = new User(null, null, null, null, null, true, null, null, null, null, null, null, null);
         modalRef.result.then((result) => {
@@ -95,7 +96,7 @@ export const userMgmtNewState = {
             console.log(`Dismissed ${reason}`);
             $state.go('user-management');
         });
-    }]
+    }
 };
 
 
@@ -105,12 +106,12 @@ export const userMgmtEditState = {
     data: {
         authorities: ['ROLE_ADMIN']
     },
-    onEnter: ['$transition$', (trans: Transition) => {
-        let $stateParams = trans.injector().get('$stateParams');
-        let $state = trans.injector().get('$state');
-        let modalService = trans.injector().get('NgbModal');
+    onEnter: (trans: Transition) => {
+        let $state = trans.router.stateService;
+        let modalService = trans.injector().get(NgbModal);
         let userService: UserService = trans.injector().get('UserService');
-        userService.find($stateParams.login).subscribe(user => {
+        var login = trans.params()['login'];
+        userService.find(login).subscribe(user => {
             const modalRef  = modalService.open(UserMgmtDialogComponent, { size: 'lg', backdrop: 'static'});
             modalRef.componentInstance.user = user;
             modalRef.result.then((result) => {
@@ -121,7 +122,7 @@ export const userMgmtEditState = {
                 $state.go('user-management');
             });
         });
-    }]
+    }
 };
 
 
@@ -131,12 +132,12 @@ export const userMgmtDeleteState = {
     data: {
         authorities: ['ROLE_ADMIN']
     },
-    onEnter: ['$transition$', (trans: Transition) => {
-        let $stateParams = trans.injector().get('$stateParams');
-        let $state = trans.injector().get('$state');
-        let modalService = trans.injector().get('NgbModal');
+    onEnter: (trans: Transition) => {
+        let $state = trans.router.stateService;
+        let modalService = trans.injector().get(NgbModal);
         let userService: UserService = trans.injector().get('UserService');
-        userService.find($stateParams.login).subscribe(user => {
+        var login = trans.params()['login'];
+        userService.find(login).subscribe(user => {
             const modalRef  = modalService.open(UserMgmtDeleteDialogComponent, { size: 'md'});
             modalRef.componentInstance.user = user;
             modalRef.result.then((result) => {
@@ -147,5 +148,5 @@ export const userMgmtDeleteState = {
                 $state.go('user-management');
             });
         });
-    }]
+    }
 };

From 3cc404a3a1479e305f24dfb64e6da343c4a9c7e5 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Fri, 4 Nov 2016 13:53:37 -0600
Subject: [PATCH 03/20] Fix translations with links

ng2-translate does not process directives in translation keys. This is a workaround.

See https://github.com/ocombe/ng2-translate/issues/223 for more information.
---
 generators/client-2/templates/_package.json          |  2 +-
 .../main/webapp/app/account/register/_register.html  |  7 ++++---
 .../src/main/webapp/app/home/_home.component.ts      |  4 ----
 .../templates/src/main/webapp/app/home/_home.html    | 11 ++++++-----
 .../templates/src/main/webapp/i18n/en/_global.json   | 12 ++++++++++++
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/generators/client-2/templates/_package.json b/generators/client-2/templates/_package.json
index a79e4ad5d979..7d2d704759ef 100644
--- a/generators/client-2/templates/_package.json
+++ b/generators/client-2/templates/_package.json
@@ -21,7 +21,7 @@
     "core-js": "2.4.1",
     "jquery": "3.1.0",
     <%_ if (enableTranslation){ _%>
-    "ng2-translate": "3.1.1",
+    "ng2-translate": "4.0.0",
     <%_ } _%>
     "ng2-webstorage": "1.3.0",
     "reflect-metadata": "0.1.3",
diff --git a/generators/client-2/templates/src/main/webapp/app/account/register/_register.html b/generators/client-2/templates/src/main/webapp/app/account/register/_register.html
index c3f3f8b5f7be..1843f1f74999 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/register/_register.html
+++ b/generators/client-2/templates/src/main/webapp/app/account/register/_register.html
@@ -31,7 +31,7 @@ <h1 translate="register.title">Registration</h1>
             <form name="form" role="form" (ngSubmit)="register()" #registerForm="ngForm">
                 <div class="form-group">
                     <label class="control-label" for="login" translate="global.form.username">Username</label>
-                    <input type="text" class="form-control" [(ngModel)]="registerAccount.login" id="login" name="login" #login="ngModel" placeholder="{{'global.form.login.placeholder' | translate}}"
+                    <input type="text" class="form-control" [(ngModel)]="registerAccount.login" id="login" name="login" #login="ngModel" placeholder="{{'global.form.username.placeholder' | translate}}"
                             required minlength="1" maxlength="50" pattern="^[_'.@A-Za-z0-9-]*$">
                     <div *ngIf="login.dirty && login.invalid">
                         <p class="help-block" *ngIf="login.errors.required" translate="register.messages.validate.login.required">
@@ -117,8 +117,9 @@ <h1 translate="register.title">Registration</h1>
                 <button type="submit" [disabled]="registerForm.form.invalid" class="btn btn-primary" translate="register.form.button">Register</button>
             </form>
             <p></p>
-            <div class="alert alert-warning" translate="global.messages.info.authenticated" translate-compile>
-                If you want to <a class="alert-link" (click)="openLogin()">sign in</a>, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").
+            <div class="alert alert-warning">
+                <span jhi-translate="global.messages.info.authenticated.prefix">If you want to </span>
+                <a class="alert-link" (click)="openLogin()">sign in</a><span jhi-translate="global.messages.info.authenticated.suffix">, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
             </div>
         </div>
         <%_ if (enableSocialSignIn) { _%>
diff --git a/generators/client-2/templates/src/main/webapp/app/home/_home.component.ts b/generators/client-2/templates/src/main/webapp/app/home/_home.component.ts
index ce573ebf9c71..785a2ee26ab9 100644
--- a/generators/client-2/templates/src/main/webapp/app/home/_home.component.ts
+++ b/generators/client-2/templates/src/main/webapp/app/home/_home.component.ts
@@ -28,10 +28,6 @@ export class HomeComponent implements OnInit {
         return this.principal.isAuthenticated();
     }
 
-    register() {
-        this.$state.go('register');
-    }
-
     login() {
         this.modalRef = this.loginModalService.open();
     }
diff --git a/generators/client-2/templates/src/main/webapp/app/home/_home.html b/generators/client-2/templates/src/main/webapp/app/home/_home.html
index 41c6470a8914..94c4c85e60f3 100644
--- a/generators/client-2/templates/src/main/webapp/app/home/_home.html
+++ b/generators/client-2/templates/src/main/webapp/app/home/_home.html
@@ -13,13 +13,14 @@ <h1 jhi-translate="home.title">Welcome, Java Hipster!</h1>
                         translate-values="{username: '{{account.login}}'}"> You are logged in as user "{{account.login}}". </span>
                 </div>
 
-                <div class="alert alert-warning" *ngSwitchCase="false" jhi-translate="global.messages.info.authenticated" translate-compile>
-                    If you want to <a class="alert-link" href="" (click)="login()">sign in</a>, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").
+                <div class="alert alert-warning" *ngSwitchCase="false">
+                    <span jhi-translate="global.messages.info.authenticated.prefix">If you want to </span>
+                    <a class="alert-link" (click)="login()">sign in</a><span jhi-translate="global.messages.info.authenticated.suffix"></span>
                 </div>
 
-
-                <div class="alert alert-warning" *ngSwitchCase="false" jhi-translate="global.messages.info.register" translate-compile>
-                    You don't have an account yet? <a class="alert-link" uiSref="register">Register a new account</a>
+                <div class="alert alert-warning" *ngSwitchCase="false">
+                    <span jhi-translate="global.messages.info.register.noaccount">You don't have an account yet?</span>
+                    <a class="alert-link" uiSref="register" jhi-translate="global.messages.info.register.link">Register a new account</a>
                 </div>
             </div>
 
diff --git a/generators/languages/templates/src/main/webapp/i18n/en/_global.json b/generators/languages/templates/src/main/webapp/i18n/en/_global.json
index e15eb83ce5b3..8b32a98edd7b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/en/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/en/_global.json
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion == 'angular1') { _%>
                 "authenticated": "If you want to <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>, you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\").",
                 "register": "You don't have an account yet? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Register a new account</a>"
+                <%_ } else if (angularVersion == 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "If you want to ",
+                    "link": "sign in",
+                    "suffix": ", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
+                },
+                "register": {
+                    "noaccount": "You don't have an account yet?",
+                    "link": "Register a new account"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "The password and its confirmation do not match!"

From 8b0e6d6d8fc31346a0f55b55a54ed41457ca6123 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Fri, 4 Nov 2016 14:07:19 -0600
Subject: [PATCH 04/20] Fix compiler error

jhi-missing-translation.config.ts(3,14): error TS2420: Class 'JhiMissingTranslationHandler' incorrectly implements interface 'MissingTranslationHandler'.
---
 .../app/shared/language/_jhi-missing-translation.config.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts b/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts
index 14cab4d8472f..c7dab9fbbc7b 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts
@@ -1,7 +1,7 @@
-import {MissingTranslationHandler} from 'ng2-translate/ng2-translate';
+import { MissingTranslationHandler, MissingTranslationHandlerParams } from 'ng2-translate';
 
 export class <%=jhiPrefixCapitalized%>MissingTranslationHandler implements MissingTranslationHandler {
-    handle(key: string) {
-        return `translation-not-found[${key}]`;
+    handle(params: MissingTranslationHandlerParams): any {
+        return `translation-not-found[${params.key}`;
     }
 }

From d5bac6456f254e09adb608a21258460f19093ac1 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Fri, 4 Nov 2016 14:38:01 -0600
Subject: [PATCH 05/20] Revert to previous version of ng2-translate because
 SystemJS is a pain

---
 generators/client-2/templates/_package.json                 | 2 +-
 .../client-2/templates/src/main/webapp/app/home/_home.html  | 2 +-
 .../app/shared/language/_jhi-missing-translation.config.ts  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generators/client-2/templates/_package.json b/generators/client-2/templates/_package.json
index 7d2d704759ef..a79e4ad5d979 100644
--- a/generators/client-2/templates/_package.json
+++ b/generators/client-2/templates/_package.json
@@ -21,7 +21,7 @@
     "core-js": "2.4.1",
     "jquery": "3.1.0",
     <%_ if (enableTranslation){ _%>
-    "ng2-translate": "4.0.0",
+    "ng2-translate": "3.1.1",
     <%_ } _%>
     "ng2-webstorage": "1.3.0",
     "reflect-metadata": "0.1.3",
diff --git a/generators/client-2/templates/src/main/webapp/app/home/_home.html b/generators/client-2/templates/src/main/webapp/app/home/_home.html
index 94c4c85e60f3..8120c7ee7f98 100644
--- a/generators/client-2/templates/src/main/webapp/app/home/_home.html
+++ b/generators/client-2/templates/src/main/webapp/app/home/_home.html
@@ -15,7 +15,7 @@ <h1 jhi-translate="home.title">Welcome, Java Hipster!</h1>
 
                 <div class="alert alert-warning" *ngSwitchCase="false">
                     <span jhi-translate="global.messages.info.authenticated.prefix">If you want to </span>
-                    <a class="alert-link" (click)="login()">sign in</a><span jhi-translate="global.messages.info.authenticated.suffix"></span>
+                    <a class="alert-link" (click)="login()" jhi-translate="global.messages.info.authenticated.link">sign in</a><span jhi-translate="global.messages.info.authenticated.suffix"></span>
                 </div>
 
                 <div class="alert alert-warning" *ngSwitchCase="false">
diff --git a/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts b/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts
index c7dab9fbbc7b..14cab4d8472f 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/language/_jhi-missing-translation.config.ts
@@ -1,7 +1,7 @@
-import { MissingTranslationHandler, MissingTranslationHandlerParams } from 'ng2-translate';
+import {MissingTranslationHandler} from 'ng2-translate/ng2-translate';
 
 export class <%=jhiPrefixCapitalized%>MissingTranslationHandler implements MissingTranslationHandler {
-    handle(params: MissingTranslationHandlerParams): any {
-        return `translation-not-found[${params.key}`;
+    handle(key: string) {
+        return `translation-not-found[${key}]`;
     }
 }

From 4789e520b98db8f1dbb43eef0985ee912af2c2b6 Mon Sep 17 00:00:00 2001
From: Deepu k Sasidharan <d4udts@gmail.com>
Date: Sun, 6 Nov 2016 22:01:56 +0100
Subject: [PATCH 06/20] ng2: polish ui router removal for ng1

---
 generators/client-2/files.js                  |  8 ++--
 .../templates/src/main/webapp/_index.html     | 10 ++---
 .../src/main/webapp/app/_app.module.ts        | 19 ++++-----
 .../src/main/webapp/app/_app.ng2module.ts     | 16 ++++----
 .../main/webapp/app/admin/_admin.module.ts    |  3 +-
 .../app/admin/tracker/_tracker.state.ts       | 14 +++----
 .../user-management/_user-management.state.ts |  8 ++--
 .../_register-transition-hooks.ts}            | 40 ++++++++-----------
 .../app/{ => blocks/config}/_router.config.ts |  6 +--
 .../src/main/webapp/app/layouts/_index.ts     |  2 +-
 .../layouts/main/_jhipster-main.component.ts  |  7 ----
 .../app/layouts/main/_main.component.ts       |  7 ++++
 .../main/{_jhipster-main.html => _main.html}  |  1 +
 13 files changed, 65 insertions(+), 76 deletions(-)
 rename generators/client-2/templates/src/main/webapp/app/blocks/{handlers/_state.handler.ts => config/_register-transition-hooks.ts} (54%)
 rename generators/client-2/templates/src/main/webapp/app/{ => blocks/config}/_router.config.ts (82%)
 delete mode 100644 generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts
 create mode 100644 generators/client-2/templates/src/main/webapp/app/layouts/main/_main.component.ts
 rename generators/client-2/templates/src/main/webapp/app/layouts/main/{_jhipster-main.html => _main.html} (82%)

diff --git a/generators/client-2/files.js b/generators/client-2/files.js
index ecc41683e7c0..baa29449aa4c 100644
--- a/generators/client-2/files.js
+++ b/generators/client-2/files.js
@@ -94,8 +94,8 @@ const files = {
                 '_app.ng2module.ts',
                 '_app.state.ts',
                 '_app.constants.ts',
-                '_router.config.ts',
-                'blocks/handlers/_state.handler.ts',
+                'blocks/config/_register-transition-hooks.ts',
+                'blocks/config/_router.config.ts',
                 'blocks/config/_http.config.ts',
                 'blocks/config/_localstorage.config.ts',
                 'blocks/config/_compile.config.ts',
@@ -140,8 +140,8 @@ const files = {
                 'layouts/profiles/_profile.service.ts',
                 'layouts/profiles/_profile-info.model.ts',
                 'layouts/profiles/_page-ribbon.component.ts',
-                'layouts/main/_jhipster-main.component.ts',
-                { file: 'layouts/main/_jhipster-main.html', method: 'copyHtml' },
+                'layouts/main/_main.component.ts',
+                'layouts/main/_main.html',
                 'layouts/navbar/_navbar.component.ts',
                 { file: 'layouts/navbar/_navbar.html', method: 'copyHtml' },
                 'layouts/footer/_footer.component.ts',
diff --git a/generators/client-2/templates/src/main/webapp/_index.html b/generators/client-2/templates/src/main/webapp/_index.html
index 82949e1252f1..7813c26784c7 100644
--- a/generators/client-2/templates/src/main/webapp/_index.html
+++ b/generators/client-2/templates/src/main/webapp/_index.html
@@ -26,12 +26,11 @@
     <!--[if lt IE 9]>
         <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
-    <page-ribbon></page-ribbon>
-    <jhipster-main></jhipster-main>
+    <<%=jhiPrefix%>-main></<%=jhiPrefix%>-main>
+    <!-- inject:troubleshoot -->
+    <!-- This content is for troubleshooting purpose and will be removed by `gulp install` task -->
     <div class="container">
         <div class="well">
-            <!-- inject:troubleshoot -->
-            <!-- This content is for troubleshooting purpose and will be removed by `gulp install` task -->
             <h1>An error has occured :-(</h1>
             <i>There was an error when generating this application with <a href="http://jhipster.github.io/">JHipster</a></i>
             <p>If you are seeing this, it means something went wrong during the initial setup of the application.</p>
@@ -73,10 +72,9 @@ <h3>If you want to chat with contributors and other users</h3>
             <p>
                 Join our chat room on <a href="https://gitter.im/jhipster/generator-jhipster" target="_blank">Gitter.im</a>. Please note that this is a public chat room, and that we expect you to respect other people and write in a correct English language!
             </p>
-            <!-- endinject -->
         </div>
     </div>
-
+    <!-- endinject -->
     <!-- Google Analytics: uncomment and change UA-XXXXX-X to be your site's ID.
     <script>
         (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
diff --git a/generators/client-2/templates/src/main/webapp/app/_app.module.ts b/generators/client-2/templates/src/main/webapp/app/_app.module.ts
index 1559cb82e2cf..6d1d02870612 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.module.ts
@@ -7,7 +7,7 @@ import './entities/entity.module';
 import { upgradeAdapter } from './upgrade_adapter';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
-import { StateHandler } from './blocks/handlers/state.handler';<% if (enableTranslation) { %>
+import { VERSION } from "./app.constants";<% if (enableTranslation) { %>
 
 import { TranslationConfig } from './blocks/config/translation.config';
 import { TranslationStorageProvider } from './blocks/config/translation-storage.provider';<% } %>
@@ -18,7 +18,7 @@ import { PagerConfig } from './blocks/config/uib-pager.config';
 import { PaginationConfig } from './blocks/config/uib-pagination.config';
 
 import { HomeComponent } from './home';
-import { JHipsterMainComponent, NavbarComponent, FooterComponent, PageRibbonComponent } from './layouts';
+import { <%=jhiPrefixCapitalized%>MainComponent, NavbarComponent, FooterComponent, PageRibbonComponent } from './layouts';
 
 import { AuthExpiredInterceptor } from './blocks/interceptor/auth-expired.interceptor';
 <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
@@ -53,25 +53,20 @@ angular
     .directive('home', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(HomeComponent))
     .directive('navbar', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(NavbarComponent))
     .directive('footer', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(FooterComponent))
-    .directive('jhipsterMain', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(JHipsterMainComponent))
+    .directive('<%=jhiPrefix%>Main', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>MainComponent))
     .factory('AuthExpiredInterceptor', AuthExpiredInterceptor)
     <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
     .factory('AuthInterceptor', AuthInterceptor)
     <%_ } _%>
     .factory('ErrorHandlerInterceptor', ErrorHandlerInterceptor)
-    .factory('NotificationInterceptor', NotificationInterceptor)
-    .factory('StateHandler',StateHandler)<% if (enableTranslation) { %>
+    .factory('NotificationInterceptor', NotificationInterceptor)<% if (enableTranslation) { %>
     .factory('TranslationStorageProvider', TranslationStorageProvider)
     .config(TranslationConfig)<% } %>
-    <%_ if (websocket === 'spring-websocket') { _%>
-    .factory('TrackerService', upgradeAdapter.downgradeNg2Provider(<%=jhiPrefixCapitalized%>TrackerService))
-    <%_ } _%>
     .directive('pageRibbon',  <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(PageRibbonComponent))
-    .factory('NgbModal', upgradeAdapter.downgradeNg2Provider(NgbModal))
     .run(run);
 
-run.$inject = ['StateHandler'];
+run.$inject = ['$rootScope'];
 
-function run(StateHandler) {
-    StateHandler.initialize();
+function run($rootScope) {
+    $rootScope.VERSION = VERSION;
 }
diff --git a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
index 898ae6170f9d..db86f4287390 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
@@ -9,9 +9,9 @@ import { <%=angular2AppName%>AccountModule } from './account/account.ng2module';
 
 import { appState } from './app.state';
 import { HomeComponent, homeState } from './home';
-import { JHipsterRouterConfig } from "./router.config";
+import { <%=jhiPrefixCapitalized%>RouterConfig } from './blocks/config/router.config';
 import {
-    JHipsterMainComponent,
+    <%=jhiPrefixCapitalized%>MainComponent,
     NavbarComponent,
     FooterComponent,
     ProfileService,
@@ -28,7 +28,7 @@ import { localStorageConfig } from './blocks/config/localstorage.config';
 localStorageConfig();
 
 let routerConfig = {
-    configClass: JHipsterRouterConfig,
+    configClass: <%=jhiPrefixCapitalized%>RouterConfig,
     otherwise: '/',
     states: [
         appState,
@@ -48,19 +48,21 @@ let routerConfig = {
         <%=angular2AppName%>AccountModule
     ],
     declarations: [
-        JHipsterMainComponent,
+        <%=jhiPrefixCapitalized%>MainComponent,
         HomeComponent,
         NavbarComponent,
         ErrorComponent,
         PageRibbonComponent,
-        FooterComponent<% if (enableTranslation){ %>,
-        ActiveMenuDirective<% } %>
+        <%_ if (enableTranslation){ _%>
+        ActiveMenuDirective,
+        <%_ } _%>
+        FooterComponent
     ],
     providers: [
         ProfileService,
         { provide: Window, useValue: window },
         { provide: Document, useValue: document }
     ],
-    bootstrap: [ JHipsterMainComponent ]
+    bootstrap: [ <%=jhiPrefixCapitalized%>MainComponent ]
 })
 export class <%=angular2AppName%>AppModule {}
diff --git a/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts b/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts
index da636be68b96..4b1b824ec944 100644
--- a/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/admin/_admin.module.ts
@@ -43,9 +43,8 @@ angular
     .directive('<%=jhiPrefix%>Health', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>HealthCheckComponent))
     .directive('<%=jhiPrefix%>HealthModal', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>HealthModalComponent))
     .directive('<%=jhiPrefix%>Audit', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(AuditsComponent))
-    .directive('<%=jhiPrefix%>Configuration', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>ConfigurationComponent))
     .directive('<%=jhiPrefix%>Logs', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(LogsComponent))
     <%_ if (applicationType === 'gateway') { _%>
     .directive('<%=jhiPrefix%>Gateway', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>GatewayComponent))
     <%_ } _%>
-    .factory('UserService', upgradeAdapter.downgradeNg2Provider(UserService));
+    .directive('<%=jhiPrefix%>Configuration', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>ConfigurationComponent));
diff --git a/generators/client-2/templates/src/main/webapp/app/admin/tracker/_tracker.state.ts b/generators/client-2/templates/src/main/webapp/app/admin/tracker/_tracker.state.ts
index 58ed09e2e16e..20f69761024c 100644
--- a/generators/client-2/templates/src/main/webapp/app/admin/tracker/_tracker.state.ts
+++ b/generators/client-2/templates/src/main/webapp/app/admin/tracker/_tracker.state.ts
@@ -1,6 +1,6 @@
 import { Transition } from 'ui-router-ng2';
 import { <%=jhiPrefixCapitalized%>TrackerComponent } from './tracker.component';
-import { <%=jhiPrefixCapitalized%>LanguageService } from '../../shared';
+import { <% if (enableTranslation){ %><%=jhiPrefixCapitalized%>LanguageService, <% } %><%=jhiPrefixCapitalized%>TrackerService } from '../../shared';
 
 export const trackerState = {
     name: '<%=jhiPrefix%>-tracker',
@@ -18,10 +18,10 @@ export const trackerState = {
         deps: [<%=jhiPrefixCapitalized%>LanguageService],
         resolveFn: (languageService) => languageService.setLocations(['tracker'])
     }],
-    onEnter: ['$transition$', (trans: Transition) => {
-        trans.injector().get('TrackerService').subscribe();
-    }],
-    onExit: ['$transition$', (trans: Transition) => {
-        trans.injector().get('TrackerService').unsubscribe();
-    }]
+    onEnter: (trans: Transition) => {
+        trans.injector().get(<%=jhiPrefixCapitalized%>TrackerService).subscribe();
+    },
+    onExit: (trans: Transition) => {
+        trans.injector().get(<%=jhiPrefixCapitalized%>TrackerService).unsubscribe();
+    }
 }
diff --git a/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts b/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts
index 233f1270994f..3ee557eb26e2 100644
--- a/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts
+++ b/generators/client-2/templates/src/main/webapp/app/admin/user-management/_user-management.state.ts
@@ -109,8 +109,8 @@ export const userMgmtEditState = {
     onEnter: (trans: Transition) => {
         let $state = trans.router.stateService;
         let modalService = trans.injector().get(NgbModal);
-        let userService: UserService = trans.injector().get('UserService');
-        var login = trans.params()['login'];
+        let userService: UserService = trans.injector().get(UserService);
+        let login = trans.params()['login'];
         userService.find(login).subscribe(user => {
             const modalRef  = modalService.open(UserMgmtDialogComponent, { size: 'lg', backdrop: 'static'});
             modalRef.componentInstance.user = user;
@@ -135,8 +135,8 @@ export const userMgmtDeleteState = {
     onEnter: (trans: Transition) => {
         let $state = trans.router.stateService;
         let modalService = trans.injector().get(NgbModal);
-        let userService: UserService = trans.injector().get('UserService');
-        var login = trans.params()['login'];
+        let userService: UserService = trans.injector().get(UserService);
+        let login = trans.params()['login'];
         userService.find(login).subscribe(user => {
             const modalRef  = modalService.open(UserMgmtDeleteDialogComponent, { size: 'md'});
             modalRef.componentInstance.user = user;
diff --git a/generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts b/generators/client-2/templates/src/main/webapp/app/blocks/config/_register-transition-hooks.ts
similarity index 54%
rename from generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts
rename to generators/client-2/templates/src/main/webapp/app/blocks/config/_register-transition-hooks.ts
index 293d12832753..4ca966a9a79f 100644
--- a/generators/client-2/templates/src/main/webapp/app/blocks/handlers/_state.handler.ts
+++ b/generators/client-2/templates/src/main/webapp/app/blocks/config/_register-transition-hooks.ts
@@ -1,17 +1,5 @@
-import { VERSION, DEBUG_INFO_ENABLED } from '../../app.constants';
 import { TransitionService, Transition } from 'ui-router-ng2';
-
-StateHandler.$inject = ['$rootScope'];
-export function StateHandler($rootScope) {
-
-    return {
-        initialize: initialize
-    };
-
-    function initialize() {
-        $rootScope.VERSION = VERSION;
-    }
-}
+import { Principal, AuthService<% if (enableTranslation) { %>, <%=jhiPrefixCapitalized%>LanguageService<% } %> } from '../../shared';
 
 export function registerTransitionHooks($transitions: TransitionService) {
     $transitions.onStart({}, (transition: Transition) => {
@@ -19,17 +7,18 @@ export function registerTransitionHooks($transitions: TransitionService) {
         $rootScope.toState = transition.to();
         $rootScope.toParams = transition.params();
         $rootScope.fromState = transition.from();
-
-        /*if (Principal.isIdentityResolved()) { //TODO needs to fixed after migration
-         Auth.authorize();
-         }*/
+        let principal = transition.injector().get(Principal);
+        let auth = transition.injector().get(AuthService);
+        if (principal.isIdentityResolved()) {
+            auth.authorize();
+        }
 
         <% if (enableTranslation) { %>
-            // Update the language //TODO needs to fixed after migration
-            // let $translate = transition.injector().get('$translate');
-            /*<%=jhiPrefixCapitalized%>LanguageService.getCurrent().then(function (language) {
-             $translate.use(language);
-             });*/
+        // Update the language //FIXME not sure if this is required, its causing some weird error as well
+        /*let languageService = transition.injector().get(<%=jhiPrefixCapitalized%>LanguageService);
+        languageService.getCurrent().then(current => {
+            languageService.changeLanguage(current);
+        });*/
         <% } %>
     });
 
@@ -47,6 +36,11 @@ export function registerTransitionHooks($transitions: TransitionService) {
         if (toState.data.pageTitle) {
             titleKey = toState.data.pageTitle;
         }
-        <% if (enableTranslation) { %>transition.injector().get('TranslationHandler').updateTitle(titleKey);<% } else { %>$window.document.title = titleKey;<% } %>
+        <%_ if (enableTranslation) { _%>
+        let languageService = transition.injector().get(<%=jhiPrefixCapitalized%>LanguageService);
+        languageService.updateTitle(titleKey);
+        <%_ } else { _%>
+        window.document.title = titleKey;
+        <%_ } _%>
     });
 }
diff --git a/generators/client-2/templates/src/main/webapp/app/_router.config.ts b/generators/client-2/templates/src/main/webapp/app/blocks/config/_router.config.ts
similarity index 82%
rename from generators/client-2/templates/src/main/webapp/app/_router.config.ts
rename to generators/client-2/templates/src/main/webapp/app/blocks/config/_router.config.ts
index 5d8152e04c9d..1f4406a5863c 100644
--- a/generators/client-2/templates/src/main/webapp/app/_router.config.ts
+++ b/generators/client-2/templates/src/main/webapp/app/blocks/config/_router.config.ts
@@ -1,11 +1,11 @@
 import { Injectable } from "@angular/core";
 import { UIRouter, trace, Category, Transition } from "ui-router-ng2";
-import { DEBUG_INFO_ENABLED } from "./app.constants";
-import { registerTransitionHooks } from "./blocks/handlers/state.handler";
+import { DEBUG_INFO_ENABLED } from "../../app.constants";
+import { registerTransitionHooks } from "./register-transition-hooks";
 declare var SystemJS;
 
 @Injectable()
-export class JHipsterRouterConfig {
+export class <%=jhiPrefixCapitalized%>RouterConfig {
     constructor(router: UIRouter) {
 
         if (DEBUG_INFO_ENABLED) {
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts b/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts
index a5f9b4a29486..ee3e0aaf0a6a 100644
--- a/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts
+++ b/generators/client-2/templates/src/main/webapp/app/layouts/_index.ts
@@ -1,6 +1,6 @@
 export * from './error/error.component';
 export * from './error/error.state';
-export * from './main/jhipster-main.component';
+export * from './main/main.component';
 export * from './footer/footer.component';
 export * from './navbar/navbar.component';
 <%_ if (enableTranslation){ _%>
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts b/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts
deleted file mode 100644
index 9b7c372c66f4..000000000000
--- a/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-    selector: 'jhipster-main',
-    templateUrl: 'app/layouts/main/jhipster-main.html'
-})
-export class JHipsterMainComponent {}
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/main/_main.component.ts b/generators/client-2/templates/src/main/webapp/app/layouts/main/_main.component.ts
new file mode 100644
index 000000000000..8f01af77e866
--- /dev/null
+++ b/generators/client-2/templates/src/main/webapp/app/layouts/main/_main.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: '<%=jhiPrefix%>-main',
+    templateUrl: 'app/layouts/main/main.html'
+})
+export class <%=jhiPrefixCapitalized%>MainComponent {}
diff --git a/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html b/generators/client-2/templates/src/main/webapp/app/layouts/main/_main.html
similarity index 82%
rename from generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html
rename to generators/client-2/templates/src/main/webapp/app/layouts/main/_main.html
index cf301f683202..81c0aa4f60bc 100644
--- a/generators/client-2/templates/src/main/webapp/app/layouts/main/_jhipster-main.html
+++ b/generators/client-2/templates/src/main/webapp/app/layouts/main/_main.html
@@ -1,3 +1,4 @@
+<page-ribbon></page-ribbon>
 <div ui-view="navbar"></div>
 <div class="container">
     <div class="well" ui-view="content"></div>

From fc86573f2325a61ebe7ff7ff763fd0a99375b5b5 Mon Sep 17 00:00:00 2001
From: Pascal Grimaud <pascalgrimaud@gmail.com>
Date: Mon, 7 Nov 2016 08:21:56 +0100
Subject: [PATCH 07/20] ng2: fix swagger api

---
 .../client-2/templates/src/main/webapp/swagger-ui/_index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/swagger-ui/_index.html b/generators/client-2/templates/src/main/webapp/swagger-ui/_index.html
index 8374944f0c60..fa6152414842 100644
--- a/generators/client-2/templates/src/main/webapp/swagger-ui/_index.html
+++ b/generators/client-2/templates/src/main/webapp/swagger-ui/_index.html
@@ -36,12 +36,12 @@
                     return urlMatches[1];
                 },
                 "securityConfig": function(cb) {
-                    $.getJSON(this.baseUrl() + "/configuration/security", function(data) {
+                    $.getJSON(this.baseUrl() + "/swagger-resources/configuration/security", function(data) {
                         cb(data);
                     });
                 },
                 "uiConfig": function(cb) {
-                    $.getJSON(this.baseUrl() + "/configuration/ui", function(data) {
+                    $.getJSON(this.baseUrl() + "/swagger-resources/configuration/ui", function(data) {
                         cb(data);
                     });
                 }

From 66c2c7c55018f573aa7bae56e54d3da73b17a8c8 Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Mon, 31 Oct 2016 11:33:43 +0100
Subject: [PATCH 08/20] fix for social module

---
 .../src/main/webapp/app/shared/_shared.ng2module.ts          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
index 79c04dc5aff5..76bb52326d00 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
@@ -20,12 +20,13 @@ import {
     HasAuthorityDirective,
     HasAnyAuthorityDirective,
 <% if (enableSocialSignIn) { %>
-    <%=jhiPrefixCapitalized%>SocialComponent,
     SocialService,
 <%_ } _%>
     <%=jhiPrefixCapitalized%>LoginModalComponent
 } from './';
-
+<% if (enableSocialSignIn) { %>
+import { <%=jhiPrefixCapitalized%>SocialComponent } from './social/social.component';
+<%_ } _%>
 @NgModule({
     imports: [
         <%=angular2AppName%>SharedLibsModule,

From cf084e4ae262655001fc389a5556738dd5862e5b Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Mon, 31 Oct 2016 13:45:54 +0100
Subject: [PATCH 09/20] use of new external module ng2-cookies

---
 generators/client-2/templates/_package.json   |  1 +
 generators/client-2/templates/gulp/_copy.js   |  1 +
 .../src/main/webapp/_system.config.js         |  2 ++
 .../account/social/_social-auth.component.ts  | 26 +++----------------
 .../webapp/app/shared/auth/_csrf.service.ts   | 18 +++----------
 5 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/generators/client-2/templates/_package.json b/generators/client-2/templates/_package.json
index d5c24c77522b..518f38cb0bc0 100644
--- a/generators/client-2/templates/_package.json
+++ b/generators/client-2/templates/_package.json
@@ -19,6 +19,7 @@
     "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.10",
     "core-js": "2.4.1",
     "jquery": "3.1.0",
+    "ng2-cookies": "1.0.3",
     <%_ if (enableTranslation){ _%>
     "ng2-translate": "3.1.1",
     <%_ } _%>
diff --git a/generators/client-2/templates/gulp/_copy.js b/generators/client-2/templates/gulp/_copy.js
index 3da9495ea838..7d1e98737640 100644
--- a/generators/client-2/templates/gulp/_copy.js
+++ b/generators/client-2/templates/gulp/_copy.js
@@ -113,6 +113,7 @@ function deps(){
         'node_modules/ui-router-ng1-to-ng2/**/*.js',
         'node_modules/ui-router-ng2/**/*.js',
         'node_modules/ui-router-visualizer/**/*.js',
+        'node_modules/ng2-cookies/**',
         'node_modules/ng2-webstorage/bundles/**/*.js',
         <%_ if(enableTranslation) { _%>
         'node_modules/ng2-translate/bundles/ng2-translate.js',
diff --git a/generators/client-2/templates/src/main/webapp/_system.config.js b/generators/client-2/templates/src/main/webapp/_system.config.js
index 0409f243554f..4a6727360e69 100644
--- a/generators/client-2/templates/src/main/webapp/_system.config.js
+++ b/generators/client-2/templates/src/main/webapp/_system.config.js
@@ -17,6 +17,7 @@
         'ui-router-ng1-to-ng2': 'vendor/ui-router-ng1-to-ng2/ng1-to-ng2.js',
         'ui-router-visualizer': 'vendor/ui-router-visualizer/release/visualizer.min.js',
         'jquery' : 'vendor/jquery/dist',
+        'ng2-cookies': 'vendor/ng2-cookies',
         'ng2-webstorage': 'vendor/ng2-webstorage',
         <%_ if (enableTranslation){ _%>
         'ng2-translate': 'vendor/ng2-translate/bundles',
@@ -36,6 +37,7 @@
         '@ng-bootstrap/ng-bootstrap': { main: '/bundles/ng-bootstrap', defaultExtension: 'js' },
         'ui-router-ng2': {},
         'jquery': { main: 'jquery.min', defaultExtension: 'js' },
+        'ng2-cookies': {main: 'index', defaultExtension: 'js'},
         'ng2-webstorage': { main: 'bundles/core.umd.js', defaultExtension: 'js' },
         <%_ if (enableTranslation){ _%>
         'ng2-translate': {main: 'ng2-translate', defaultExtension: 'js'},
diff --git a/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts b/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts
index 0e4b144f87ff..67509f2b8265 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts
+++ b/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { StateService } from 'ui-router-ng2';
 import { AuthService, LoginService } from '../../shared';
+import { Cookie } from 'ng2-cookies/ng2-cookies';
 
 @Component({
     selector: '<%=jhiPrefix%>-auth',
@@ -10,34 +11,15 @@ export class SocialAuthComponent implements OnInit {
 
     constructor (
         private $state: StateService,
-        private $document: Document,
         private Auth: AuthService,
         private loginService: LoginService
     ) {}
 
     ngOnInit() {
-        //let token = this.$document.cookie.get('social-authentication');
-        let doc = this.$document;
-        if (doc) {
-            let token;
-            let name = 'social-authentication';
-            let ca = doc.cookie.split(';');
-            for (var i = 0; i < ca.length; i++) {
-                var c = ca[i];
-                while (c.charAt(0) === ' ') {
-                    c = c.substring(1);
-                }
-                if (c.indexOf(name) !== -1) {
-                    token = c.substring(name.length, c.length);
-                    break;
-                }
-            }
+        let token = Cookie.get('social-authentication')
+        if (token.length) {
             this.loginService.loginWithToken(token, false).then(() => {
-                    let doc = this.$document.cookie;
-                    let b = doc.indexOf('social-authentication');
-                    let e = doc.indexOf(';', b);
-                    doc = doc.substring(b, e) + doc.substring(e);
-                    //this.$document.cookie.remove('social-authentication');
+                    Cookie.delete('social-authentication');
                     this.Auth.authorize(true);
                  }, () => {
                     this.$state.go('social-register', {'success': 'false'});
diff --git a/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts b/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
index 3e034752223b..934769824714 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
@@ -1,25 +1,13 @@
 import { Injectable } from '@angular/core';
+import { Cookie } from 'ng2-cookies/ng2-cookies';
 
 @Injectable()
 export class CSRFService {
 
-    constructor(private $document: Document) {}
+    constructor() {}
 
     getCSRF(name?: string) {
         name = `${name ? name : 'XSRF-TOKEN'}=`;
-        let doc = this.$document;
-        if (doc) {
-            let ca = doc.cookie.split(';');
-            for (var i = 0; i < ca.length; i++) {
-                var c = ca[i];
-                while (c.charAt(0) === ' ') {
-                    c = c.substring(1);
-                }
-                if (c.indexOf(name) !== -1) {
-                    return c.substring(name.length, c.length);
-                }
-            }
-        }
-        return '';
+        return Cookie.get(name);
     }
 }

From de6392a9c0a8142a83cd663153051140aa6a9623 Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Mon, 31 Oct 2016 13:48:22 +0100
Subject: [PATCH 10/20] unfix social module

---
 .../src/main/webapp/app/shared/_shared.ng2module.ts          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
index 76bb52326d00..79c04dc5aff5 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
@@ -20,13 +20,12 @@ import {
     HasAuthorityDirective,
     HasAnyAuthorityDirective,
 <% if (enableSocialSignIn) { %>
+    <%=jhiPrefixCapitalized%>SocialComponent,
     SocialService,
 <%_ } _%>
     <%=jhiPrefixCapitalized%>LoginModalComponent
 } from './';
-<% if (enableSocialSignIn) { %>
-import { <%=jhiPrefixCapitalized%>SocialComponent } from './social/social.component';
-<%_ } _%>
+
 @NgModule({
     imports: [
         <%=angular2AppName%>SharedLibsModule,

From 0c5b655b10c685132fcd24e3594b49362068da0d Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Mon, 7 Nov 2016 14:17:29 +0100
Subject: [PATCH 11/20] first version angular2-cookies

---
 generators/client-2/templates/_package.json              | 2 +-
 generators/client-2/templates/gulp/_copy.js              | 2 +-
 .../client-2/templates/src/main/webapp/_system.config.js | 6 +++---
 .../templates/src/main/webapp/app/_app.ng2module.ts      | 1 +
 .../webapp/app/account/social/_social-auth.component.ts  | 9 +++++----
 .../src/main/webapp/app/shared/auth/_csrf.service.ts     | 6 +++---
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/generators/client-2/templates/_package.json b/generators/client-2/templates/_package.json
index 518f38cb0bc0..ee6a2b8715a7 100644
--- a/generators/client-2/templates/_package.json
+++ b/generators/client-2/templates/_package.json
@@ -19,7 +19,7 @@
     "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.10",
     "core-js": "2.4.1",
     "jquery": "3.1.0",
-    "ng2-cookies": "1.0.3",
+    "angular2-cookie": "1.2.5",
     <%_ if (enableTranslation){ _%>
     "ng2-translate": "3.1.1",
     <%_ } _%>
diff --git a/generators/client-2/templates/gulp/_copy.js b/generators/client-2/templates/gulp/_copy.js
index 7d1e98737640..60fd25133429 100644
--- a/generators/client-2/templates/gulp/_copy.js
+++ b/generators/client-2/templates/gulp/_copy.js
@@ -113,7 +113,7 @@ function deps(){
         'node_modules/ui-router-ng1-to-ng2/**/*.js',
         'node_modules/ui-router-ng2/**/*.js',
         'node_modules/ui-router-visualizer/**/*.js',
-        'node_modules/ng2-cookies/**',
+        'node_modules/angular2-cookie/**',
         'node_modules/ng2-webstorage/bundles/**/*.js',
         <%_ if(enableTranslation) { _%>
         'node_modules/ng2-translate/bundles/ng2-translate.js',
diff --git a/generators/client-2/templates/src/main/webapp/_system.config.js b/generators/client-2/templates/src/main/webapp/_system.config.js
index 4a6727360e69..096c0386e202 100644
--- a/generators/client-2/templates/src/main/webapp/_system.config.js
+++ b/generators/client-2/templates/src/main/webapp/_system.config.js
@@ -17,7 +17,7 @@
         'ui-router-ng1-to-ng2': 'vendor/ui-router-ng1-to-ng2/ng1-to-ng2.js',
         'ui-router-visualizer': 'vendor/ui-router-visualizer/release/visualizer.min.js',
         'jquery' : 'vendor/jquery/dist',
-        'ng2-cookies': 'vendor/ng2-cookies',
+        'angular2-cookie': 'vendor/angular2-cookie',
         'ng2-webstorage': 'vendor/ng2-webstorage',
         <%_ if (enableTranslation){ _%>
         'ng2-translate': 'vendor/ng2-translate/bundles',
@@ -30,14 +30,14 @@
         'layouts' : 'app/layouts',
         'shared' : 'app/shared'
     };
-    // packages tells the System loader how to load when no filename and/or no extension
+        // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
         'app': { main: 'app.main' },
         'rxjs': {},
         '@ng-bootstrap/ng-bootstrap': { main: '/bundles/ng-bootstrap', defaultExtension: 'js' },
         'ui-router-ng2': {},
         'jquery': { main: 'jquery.min', defaultExtension: 'js' },
-        'ng2-cookies': {main: 'index', defaultExtension: 'js'},
+        'angular2-cookie': {main: 'index', defaultExtension: 'js'},
         'ng2-webstorage': { main: 'bundles/core.umd.js', defaultExtension: 'js' },
         <%_ if (enableTranslation){ _%>
         'ng2-translate': {main: 'ng2-translate', defaultExtension: 'js'},
diff --git a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
index db86f4287390..00cbe108ac78 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { UIRouterModule, RootModule } from 'ui-router-ng2';
 import { Ng2Webstorage } from 'ng2-webstorage';
+import { CookieService } from 'angular2-cookie/services/cookies.service';
 
 import { <%=angular2AppName%>SharedModule } from './shared';
 import { <%=angular2AppName%>AdminModule } from './admin/admin.ng2module'; //TODO these couldnt be used from barrels due to an error
diff --git a/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts b/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts
index 67509f2b8265..79842add93f4 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts
+++ b/generators/client-2/templates/src/main/webapp/app/account/social/_social-auth.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { StateService } from 'ui-router-ng2';
 import { AuthService, LoginService } from '../../shared';
-import { Cookie } from 'ng2-cookies/ng2-cookies';
+import { CookieService } from 'angular2-cookie/core';
 
 @Component({
     selector: '<%=jhiPrefix%>-auth',
@@ -12,14 +12,15 @@ export class SocialAuthComponent implements OnInit {
     constructor (
         private $state: StateService,
         private Auth: AuthService,
-        private loginService: LoginService
+        private loginService: LoginService,
+        private cookieService: CookieService
     ) {}
 
     ngOnInit() {
-        let token = Cookie.get('social-authentication')
+        let token = this.cookieService.get('social-authentication')
         if (token.length) {
             this.loginService.loginWithToken(token, false).then(() => {
-                    Cookie.delete('social-authentication');
+                    this.cookieService.remove('social-authentication');
                     this.Auth.authorize(true);
                  }, () => {
                     this.$state.go('social-register', {'success': 'false'});
diff --git a/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts b/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
index 934769824714..0617b61c78cc 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
-import { Cookie } from 'ng2-cookies/ng2-cookies';
+import { CookieService } from 'angular2-cookie/core';
 
 @Injectable()
 export class CSRFService {
 
-    constructor() {}
+    constructor(private cookieService: CookieService) {}
 
     getCSRF(name?: string) {
         name = `${name ? name : 'XSRF-TOKEN'}=`;
-        return Cookie.get(name);
+        return this.cookieService.get(name);
     }
 }

From eea5f3cc5a417b3689899cae6c5b10e6ff6b3ab0 Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Mon, 7 Nov 2016 16:41:28 +0100
Subject: [PATCH 12/20] polish

---
 generators/client-2/templates/gulp/_copy.js                     | 2 +-
 generators/client-2/templates/src/main/webapp/_system.config.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/client-2/templates/gulp/_copy.js b/generators/client-2/templates/gulp/_copy.js
index 60fd25133429..e5c84101be9d 100644
--- a/generators/client-2/templates/gulp/_copy.js
+++ b/generators/client-2/templates/gulp/_copy.js
@@ -113,7 +113,7 @@ function deps(){
         'node_modules/ui-router-ng1-to-ng2/**/*.js',
         'node_modules/ui-router-ng2/**/*.js',
         'node_modules/ui-router-visualizer/**/*.js',
-        'node_modules/angular2-cookie/**',
+        'node_modules/angular2-cookie/**/*.js',
         'node_modules/ng2-webstorage/bundles/**/*.js',
         <%_ if(enableTranslation) { _%>
         'node_modules/ng2-translate/bundles/ng2-translate.js',
diff --git a/generators/client-2/templates/src/main/webapp/_system.config.js b/generators/client-2/templates/src/main/webapp/_system.config.js
index 096c0386e202..a296d03f0be4 100644
--- a/generators/client-2/templates/src/main/webapp/_system.config.js
+++ b/generators/client-2/templates/src/main/webapp/_system.config.js
@@ -30,7 +30,7 @@
         'layouts' : 'app/layouts',
         'shared' : 'app/shared'
     };
-        // packages tells the System loader how to load when no filename and/or no extension
+    // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
         'app': { main: 'app.main' },
         'rxjs': {},

From 4809d4f94c13374c5c3fbf4fabcf3f91237c55d6 Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Mon, 7 Nov 2016 18:01:00 +0100
Subject: [PATCH 13/20] bug fix

---
 .../client-2/templates/src/main/webapp/app/_app.ng2module.ts    | 1 -
 .../templates/src/main/webapp/app/account/_account.ng2module.ts | 2 ++
 .../templates/src/main/webapp/app/shared/_shared.ng2module.ts   | 2 ++
 .../templates/src/main/webapp/app/shared/auth/_csrf.service.ts  | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
index 00cbe108ac78..db86f4287390 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { UIRouterModule, RootModule } from 'ui-router-ng2';
 import { Ng2Webstorage } from 'ng2-webstorage';
-import { CookieService } from 'angular2-cookie/services/cookies.service';
 
 import { <%=angular2AppName%>SharedModule } from './shared';
 import { <%=angular2AppName%>AdminModule } from './admin/admin.ng2module'; //TODO these couldnt be used from barrels due to an error
diff --git a/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts
index 88eb768e3a77..3b269db33199 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts
@@ -1,5 +1,6 @@
 import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { UIRouterModule } from 'ui-router-ng2';
+import { CookieService } from 'angular2-cookie/services/cookies.service';
 
 import { <%=angular2AppName%>SharedModule } from '../shared';
 
@@ -80,6 +81,7 @@ let ACCOUNT_STATES = [
         SettingsComponent
     ],
     providers: [
+        CookieService,
         <%_ if (authenticationType === 'session') { _%>
         SessionsService,
         <%_ } _%>
diff --git a/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
index 79c04dc5aff5..ec687a024f7a 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/_shared.ng2module.ts
@@ -1,4 +1,5 @@
 import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CookieService } from 'angular2-cookie/services/cookies.service';
 
 import {
     <%=angular2AppName%>SharedLibsModule,
@@ -40,6 +41,7 @@ import {
         HasAnyAuthorityDirective
     ],
     providers: [
+        CookieService,
         LoginService,
         LoginModalService,
         AccountService,
diff --git a/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts b/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
index 0617b61c78cc..6f1064112a48 100644
--- a/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
+++ b/generators/client-2/templates/src/main/webapp/app/shared/auth/_csrf.service.ts
@@ -7,7 +7,7 @@ export class CSRFService {
     constructor(private cookieService: CookieService) {}
 
     getCSRF(name?: string) {
-        name = `${name ? name : 'XSRF-TOKEN'}=`;
+        name = `${name ? name : 'XSRF-TOKEN'}`;
         return this.cookieService.get(name);
     }
 }

From 59c083e8724d02bf1d3b837bc9b2c2aee1013ef9 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Mon, 7 Nov 2016 21:53:57 -0700
Subject: [PATCH 14/20] Add missing key

---
 .../src/main/webapp/app/account/register/_register.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/account/register/_register.html b/generators/client-2/templates/src/main/webapp/app/account/register/_register.html
index 1843f1f74999..506d9e252900 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/register/_register.html
+++ b/generators/client-2/templates/src/main/webapp/app/account/register/_register.html
@@ -119,7 +119,7 @@ <h1 translate="register.title">Registration</h1>
             <p></p>
             <div class="alert alert-warning">
                 <span jhi-translate="global.messages.info.authenticated.prefix">If you want to </span>
-                <a class="alert-link" (click)="openLogin()">sign in</a><span jhi-translate="global.messages.info.authenticated.suffix">, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
+                <a class="alert-link" (click)="openLogin()" jhi-translate="global.messages.info.authenticated.link">sign in</a><span jhi-translate="global.messages.info.authenticated.suffix">, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
             </div>
         </div>
         <%_ if (enableSocialSignIn) { _%>

From dbfa1c2df719bcb4481cf28fa6b4de5e157d414d Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Mon, 7 Nov 2016 22:24:20 -0700
Subject: [PATCH 15/20] Remove links from i18n messages

---
 .../src/main/webapp/app/account/activate/_activate.html    | 7 +++++--
 .../password-reset/finish/_password-reset-finish.html      | 7 ++++---
 .../templates/src/main/webapp/i18n/en/_global.json         | 6 +++---
 .../templates/src/main/webapp/i18n/en/activate.json        | 4 ++++
 .../languages/templates/src/main/webapp/i18n/en/reset.json | 6 +++++-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/account/activate/_activate.html b/generators/client-2/templates/src/main/webapp/app/account/activate/_activate.html
index 27f84f0e4a4b..530843b134f1 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/activate/_activate.html
+++ b/generators/client-2/templates/src/main/webapp/app/account/activate/_activate.html
@@ -3,8 +3,11 @@
         <div class="col-md-8 col-md-offset-2">
             <h1 translate="activate.title">Activation</h1>
 
-            <div class="alert alert-success" *ngIf="success" translate="activate.messages.success" translate-compile>
-                <strong>Your user has been activated.</strong> Please <a class="alert-link" (click)="login()">sign in</a>.
+            <div class="alert alert-success" *ngIf="success">
+                <span jhi-translate="activate.messages.success">
+                    <strong>Your user has been activated.</strong> Please
+                    <a class="alert-link" (click)="login()" jhi-translate="global.messages.info.authenticated.link">sign in</a>.
+                </span>
             </div>
 
             <div class="alert alert-danger" *ngIf="error" translate="activate.messages.error">
diff --git a/generators/client-2/templates/src/main/webapp/app/account/password-reset/finish/_password-reset-finish.html b/generators/client-2/templates/src/main/webapp/app/account/password-reset/finish/_password-reset-finish.html
index 3433faea34ec..e20eb23fb951 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/password-reset/finish/_password-reset-finish.html
+++ b/generators/client-2/templates/src/main/webapp/app/account/password-reset/finish/_password-reset-finish.html
@@ -15,9 +15,10 @@ <h1 translate="reset.finish.title">Reset password</h1>
                 <p translate="reset.finish.messages.error">Your password couldn't be reset. Remember a password request is only valid for 24 hours.</p>
             </div>
 
-            <div class="alert alert-success" *ngIf="success">
-                <p translate="reset.finish.messages.success" translate-compile><strong>Your password has been reset.</strong> Please <a class="alert-link" (click)="login()">sign in</a>.</p>
-            </div>
+            <p class="alert alert-success" *ngIf="success">
+                <span translate="reset.finish.messages.success"><strong>Your password has been reset.</strong> Please </span>
+                <a class="alert-link" (click)="login()" translate="global.messages.info.authenticated.link">sign in</a>.
+            </p>
 
             <div class="alert alert-danger" *ngIf="doNotMatch" translate="global.messages.error.dontmatch">
                 The password and its confirmation do not match!
diff --git a/generators/languages/templates/src/main/webapp/i18n/en/_global.json b/generators/languages/templates/src/main/webapp/i18n/en/_global.json
index 8b32a98edd7b..3ee537bdd737 100644
--- a/generators/languages/templates/src/main/webapp/i18n/en/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/en/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administration",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,10 +48,10 @@
         },
         "messages": {
             "info": {
-                <%_ if (angularVersion == 'angular1') { _%>
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "If you want to <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>, you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\").",
                 "register": "You don't have an account yet? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Register a new account</a>"
-                <%_ } else if (angularVersion == 'angular2') { _%>
+                <%_ } else if (angularVersion === 'angular2') { _%>
                 "authenticated": {
                     "prefix": "If you want to ",
                     "link": "sign in",
diff --git a/generators/languages/templates/src/main/webapp/i18n/en/activate.json b/generators/languages/templates/src/main/webapp/i18n/en/activate.json
index 7c9e31cdcc24..1e7d36fa9a05 100644
--- a/generators/languages/templates/src/main/webapp/i18n/en/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/en/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activation",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Your user has been activated.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Your user has been activated.</strong> Please ",
+            <%_ } _%>
             "error": "<strong>Your user could not be activated.</strong> Please use the registration form to sign up."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/en/reset.json b/generators/languages/templates/src/main/webapp/i18n/en/reset.json
index d790e6753d44..cdb97bd5b191 100644
--- a/generators/languages/templates/src/main/webapp/i18n/en/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/en/reset.json
@@ -20,7 +20,11 @@
             },
             "messages": {
                 "info": "Choose a new password",
-                "success": "<strong>Your password has been reset.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
+                <%_ if (angularVersion === 'angular1') { _%>
+                    "success": "<strong>Your password has been reset.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                    "success": "<strong>Your password has been reset.</strong> Please ",
+                <%_ } _%>
                 "keymissing": "The reset key is missing.",
                 "error": "Your password couldn't be reset. Remember a password request is only valid for 24 hours."
             }

From a7162ea32fba290c8ce6abf60934b5755b6e19c0 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Mon, 7 Nov 2016 22:25:13 -0700
Subject: [PATCH 16/20] Translate Catalan

---
 .../templates/src/main/webapp/i18n/ca/_global.json | 14 +++++++++++++-
 .../src/main/webapp/i18n/ca/activate.json          |  4 ++++
 .../templates/src/main/webapp/i18n/ca/reset.json   |  6 +++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/generators/languages/templates/src/main/webapp/i18n/ca/_global.json b/generators/languages/templates/src/main/webapp/i18n/ca/_global.json
index 34a65adc011c..b0f1149fbe7f 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ca/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ca/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administració",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Administració d'usuaris",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Si vol <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autenticar-se</a>, pot usar els comptes per defect:<br/>- Administrador (nom d'usuari=\"admin\" i contrasenya=\"admin\") <br/>- Usuari (nom d'usuari=\"user\" i contrasenya=\"user\").",
                 "register": "No disposa d'un compte encara? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Registri un nou compte</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Si vol ",
+                    "link": "autenticar-se",
+                    "suffix": ", pot usar els comptes per defect:<br/>- Administrador (nom d'usuari=\"admin\" i contrasenya=\"admin\") <br/>- Usuari (nom d'usuari=\"user\" i contrasenya=\"user\")."
+                },
+                "register": {
+                    "noaccount": "No disposa d'un compte encara?",
+                    "link": "Registri un nou compte"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "La contrasenya i la confirmació no coincideixen!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/ca/activate.json b/generators/languages/templates/src/main/webapp/i18n/ca/activate.json
index 71653e2cf499..d654378796af 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ca/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ca/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activació",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>S'ha activat el seu usuari.</strong> Si us plau <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">accedeix-hi</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>S'ha activat el seu usuari.</strong> Si us plau ",
+            <%_ } _%>
             "error": "<strong>No s'ha pogut activar el seu usuari.</strong> Si us plau utilitzi el formulari de registre per obtenir un compte."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ca/reset.json b/generators/languages/templates/src/main/webapp/i18n/ca/reset.json
index 18647c80f268..641a419a933c 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ca/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ca/reset.json
@@ -20,7 +20,11 @@
             },
             "messages": {
                 "info": "Trii la seva nova contrasenya",
-                "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, <a href=\"#/login\">inicii sessió</a>.",
+                    <%_ if (angularVersion === 'angular1') { _%>
+                    "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, <a href=\"#/login\">inicii sessió</a>.",
+                    <%_ } else if (angularVersion === 'angular2') { _%>
+                    "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, ",
+                    <%_ } _%>
                 "keymissing": "Falta especificar la clau de reinicialització.",
                 "error": "La seva contrasenya no ha pogut ser reinicialitzada. Recordi que les peticions de canvi de contrasenya només son valides durant 24 hores."
             }

From 2e61b7b34ecaaf1903d7e37ec32e38040929d2f5 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Tue, 8 Nov 2016 12:26:48 -0700
Subject: [PATCH 17/20] Finished splitting text with links for ng2-translate

---
 .../src/main/webapp/i18n/ca/activate.json        |  2 +-
 .../templates/src/main/webapp/i18n/ca/reset.json | 13 +++++--------
 .../src/main/webapp/i18n/cs/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/cs/activate.json        |  6 +++++-
 .../templates/src/main/webapp/i18n/cs/reset.json |  7 ++++---
 .../src/main/webapp/i18n/da/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/da/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/da/reset.json |  7 ++++---
 .../src/main/webapp/i18n/de/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/de/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/de/reset.json |  7 ++++---
 .../src/main/webapp/i18n/el/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/el/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/el/reset.json |  7 ++++---
 .../templates/src/main/webapp/i18n/en/reset.json |  7 ++-----
 .../src/main/webapp/i18n/es/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/es/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/es/reset.json |  7 ++++---
 .../src/main/webapp/i18n/fr/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/fr/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/fr/reset.json |  7 ++++---
 .../src/main/webapp/i18n/gl/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/gl/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/gl/reset.json |  7 ++++---
 .../src/main/webapp/i18n/hi/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/hi/activate.json        |  6 +++++-
 .../templates/src/main/webapp/i18n/hi/reset.json |  7 ++++---
 .../src/main/webapp/i18n/hu/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/hu/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/hu/reset.json |  7 ++++---
 .../src/main/webapp/i18n/it/_global.json         | 16 ++++++++++++++--
 .../src/main/webapp/i18n/it/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/it/reset.json |  7 ++++---
 .../src/main/webapp/i18n/ja/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/ja/activate.json        |  6 +++++-
 .../templates/src/main/webapp/i18n/ja/reset.json |  7 ++++---
 .../src/main/webapp/i18n/ko/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/ko/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/ko/reset.json |  7 ++++---
 .../src/main/webapp/i18n/mr/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/mr/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/mr/reset.json |  9 +++++----
 .../src/main/webapp/i18n/nl/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/nl/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/nl/reset.json |  7 ++++---
 .../src/main/webapp/i18n/pl/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/pl/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/pl/reset.json |  7 ++++---
 .../src/main/webapp/i18n/pt-br/_global.json      | 14 +++++++++++++-
 .../src/main/webapp/i18n/pt-br/activate.json     |  4 ++++
 .../src/main/webapp/i18n/pt-br/reset.json        |  4 ++++
 .../src/main/webapp/i18n/pt-pt/_global.json      | 14 +++++++++++++-
 .../src/main/webapp/i18n/pt-pt/activate.json     |  4 ++++
 .../src/main/webapp/i18n/pt-pt/reset.json        |  7 ++++---
 .../src/main/webapp/i18n/ro/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/ro/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/ro/reset.json |  7 ++++---
 .../src/main/webapp/i18n/ru/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/ru/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/ru/reset.json |  7 ++++---
 .../src/main/webapp/i18n/sk/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/sk/activate.json        |  6 +++++-
 .../templates/src/main/webapp/i18n/sk/reset.json |  7 ++++---
 .../src/main/webapp/i18n/sv/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/sv/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/sv/reset.json |  7 ++++---
 .../src/main/webapp/i18n/ta/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/ta/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/ta/reset.json |  7 ++++---
 .../src/main/webapp/i18n/tr/_global.json         | 14 +++++++++++++-
 .../src/main/webapp/i18n/tr/activate.json        |  4 ++++
 .../templates/src/main/webapp/i18n/tr/reset.json |  7 ++++---
 .../src/main/webapp/i18n/zh-cn/_global.json      | 14 +++++++++++++-
 .../src/main/webapp/i18n/zh-cn/activate.json     |  6 +++++-
 .../src/main/webapp/i18n/zh-cn/reset.json        |  7 ++++---
 .../src/main/webapp/i18n/zh-tw/_global.json      | 14 +++++++++++++-
 .../src/main/webapp/i18n/zh-tw/activate.json     |  6 +++++-
 .../src/main/webapp/i18n/zh-tw/reset.json        |  7 ++++---
 78 files changed, 541 insertions(+), 119 deletions(-)

diff --git a/generators/languages/templates/src/main/webapp/i18n/ca/activate.json b/generators/languages/templates/src/main/webapp/i18n/ca/activate.json
index d654378796af..a90c8412440f 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ca/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ca/activate.json
@@ -5,7 +5,7 @@
             <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>S'ha activat el seu usuari.</strong> Si us plau <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">accedeix-hi</a>.",
             <%_ } else if (angularVersion === 'angular2') { _%>
-                "success": "<strong>S'ha activat el seu usuari.</strong> Si us plau ",
+            "success": "<strong>S'ha activat el seu usuari.</strong> Si us plau ",
             <%_ } _%>
             "error": "<strong>No s'ha pogut activar el seu usuari.</strong> Si us plau utilitzi el formulari de registre per obtenir un compte."
         }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ca/reset.json b/generators/languages/templates/src/main/webapp/i18n/ca/reset.json
index 641a419a933c..492565fde8e2 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ca/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ca/reset.json
@@ -9,9 +9,7 @@
                 "info": "Introdueixi l'adreca de correu que va fer servir per registrar-se",
                 "success": "Comprovi el seu correu, li hem enviat instruccions per reinicialitzar la seva contrasenya.",
                 "notfound": "<strong>L'adreca de correu no existeix!</strong> Si us plau, corregeixi i torni-ho a intentar"
-
             }
-
         },
         "finish" : {
             "title": "Reinicialitzar la seva contrasenya",
@@ -20,15 +18,14 @@
             },
             "messages": {
                 "info": "Trii la seva nova contrasenya",
-                    <%_ if (angularVersion === 'angular1') { _%>
-                    "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, <a href=\"#/login\">inicii sessió</a>.",
-                    <%_ } else if (angularVersion === 'angular2') { _%>
-                    "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, ",
-                    <%_ } _%>
+                <%_ if (angularVersion === 'angular1') { _%>
+                "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, <a href=\"#/login\">inicii sessió</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>La contrasenya ha estat canviada.</strong> Si us plau, ",
+                <%_ } _%>
                 "keymissing": "Falta especificar la clau de reinicialització.",
                 "error": "La seva contrasenya no ha pogut ser reinicialitzada. Recordi que les peticions de canvi de contrasenya només son valides durant 24 hores."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/cs/_global.json b/generators/languages/templates/src/main/webapp/i18n/cs/_global.json
index d11de91c7a80..557700c560f6 100644
--- a/generators/languages/templates/src/main/webapp/i18n/cs/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/cs/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administrace",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Brána",
                 <%_ } _%>
                 "userManagement": "Správa uživatelů",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Pokud se chcete <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">přihlásit</a>, můžete vyzkoušet predvolené účty:<br/>- Administrátor (jméno=\"admin\" a heslo=\"admin\") <br/>- Uživatel (jméno=\"user\" a heslo=\"user\").",
                 "register": "Ještě nemáte účet? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Zaregistrujte si nový účet.</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Pokud se chcete ",
+                    "link": "přihlásit",
+                    "suffix": ", můžete vyzkoušet predvolené účty:<br/>- Administrátor (jméno=\"admin\" a heslo=\"admin\") <br/>- Uživatel (jméno=\"user\" a heslo=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Ještě nemáte účet?",
+                    "link": "Zaregistrujte si nový účet."
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Nové heslo a potvrzení nového hesla se neshodují!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/cs/activate.json b/generators/languages/templates/src/main/webapp/i18n/cs/activate.json
index 58aa5b6bbc03..0d163e4d22ba 100644
--- a/generators/languages/templates/src/main/webapp/i18n/cs/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/cs/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktivace",
         "messages": {
-            "success": "<strong>Váš uživatelský účet byl aktivován.</strong><a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">Přihlašte sa</a>.",
+            <%_ if (angularVersion === 'angular1') { _%>
+            "success": "<strong>Váš uživatelský účet byl aktivován.</strong> <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">Přihlašte sa</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Váš uživatelský účet byl aktivován.</strong> ",
+            <%_ } _%>
             "error": "<strong>Váš uživatelský účet nemohl být aktivován.</strong> Prosím použijte registračný formulář pro přihlášení."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/cs/reset.json b/generators/languages/templates/src/main/webapp/i18n/cs/reset.json
index 93c888cde068..6385f0b5d247 100644
--- a/generators/languages/templates/src/main/webapp/i18n/cs/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/cs/reset.json
@@ -9,9 +9,7 @@
                 "info": "Zadejte e-mailovou adresu, kterou jste použili při registraci",
                 "success": "Na Váš e-mail sme Vám poslali informace o tom jak si můžete obnovit Vaše heslo.",
                 "notfound": "<strong>E-mailová adresa nebyla registrována!</strong> Prosím zkontrolujte nebo zkuste zadat znovu."
-
             }
-
         },
         "finish" : {
             "title": "Obnovit heslo",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Vyberte si nové heslo",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Vaše heslo bylo obnoveno.</strong> Můžete se <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">přihlásit</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Vaše heslo bylo obnoveno.</strong> Můžete se ",
+                <%_ } _%>
                 "keymissing": "Chybí klíč na obnovení hesla.",
                 "error": "Vaše heslo nemohlo být obnoveno. Požadavek na obnovení hesla je platný pouze 24 hodin."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/da/_global.json b/generators/languages/templates/src/main/webapp/i18n/da/_global.json
index e84bd60bb5e4..b8c2b0a875cd 100644
--- a/generators/languages/templates/src/main/webapp/i18n/da/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/da/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administration",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Hvis du ønsker at <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">logge ind</a>, så kan du prøve det med:<br/>- Administrator (brugernavn=\"admin\" and kodeord=\"admin\") <br/>- User (brugernavn=\"user\" and kodeord=\"user\").",
                 "register": "You don't have an account yet? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Register a new account</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Hvis du ønsker at ",
+                    "link": "logge ind",
+                    "suffix": ", så kan du prøve det med:<br/>- Administrator (brugernavn=\"admin\" and kodeord=\"admin\") <br/>- User (brugernavn=\"user\" and kodeord=\"user\")."
+                },
+                "register": {
+                    "noaccount": "You don't have an account yet?",
+                    "link": "Register a new account"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Kodeordet og dets bekræftelse matcher ikke!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/da/activate.json b/generators/languages/templates/src/main/webapp/i18n/da/activate.json
index 2c268e574475..cbae83cd5eea 100644
--- a/generators/languages/templates/src/main/webapp/i18n/da/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/da/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktivering",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Din bruger er blevet aktiveret.</strong> Du bedes venligst <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autentificere</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Din bruger er blevet aktiveret.</strong> Du bedes venligst ",
+            <%_ } _%>
             "error": "<strong>Din bruger kunne ikke blive aktiveret.</strong> Anvend venligst registeringsformularen for at oprette en bruger."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/da/reset.json b/generators/languages/templates/src/main/webapp/i18n/da/reset.json
index d790e6753d44..4824b8e3ed0b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/da/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/da/reset.json
@@ -9,9 +9,7 @@
                 "info": "Enter the e-mail address you used to register",
                 "success": "Check your e-mails for details on how to reset your password.",
                 "notfound": "<strong>E-Mail address isn't registered!</strong> Please check and try again"
-
             }
-
         },
         "finish" : {
             "title": "Reset password",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Choose a new password",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Your password has been reset.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Your password has been reset.</strong> Please ",
+                <%_ } _%>
                 "keymissing": "The reset key is missing.",
                 "error": "Your password couldn't be reset. Remember a password request is only valid for 24 hours."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/de/_global.json b/generators/languages/templates/src/main/webapp/i18n/de/_global.json
index ea0d86f18f3e..c2175c393d0a 100644
--- a/generators/languages/templates/src/main/webapp/i18n/de/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/de/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administration",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Benutzerverwaltung",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Wenn Sie sich <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">anmelden</a> möchten, versuchen Sie es mit <br/>- Administrator (Name=\"admin\" und Passwort=\"admin\")<br/>- Benutzer (Name=\"user\" und Passwort=\"user\").",
                 "register": "Sie haben noch keinen Zugang? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Registrieren Sie sich</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Wenn Sie sich ",
+                    "link": "anmelden",
+                    "suffix": " möchten, versuchen Sie es mit <br/>- Administrator (Name=\"admin\" und Passwort=\"admin\")<br/>- Benutzer (Name=\"user\" und Passwort=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Sie haben noch keinen Zugang?",
+                    "link": "Registrieren Sie sich"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Das bestätigte Passwort entspricht nicht dem neuen Passwort!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/de/activate.json b/generators/languages/templates/src/main/webapp/i18n/de/activate.json
index ccae91f9cc88..1793404ac002 100644
--- a/generators/languages/templates/src/main/webapp/i18n/de/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/de/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktivierung",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Ihr Benutzer wurde aktiviert.</strong> Bitte <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">anmelden</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Ihr Benutzer wurde aktiviert.</strong> Bitte ",
+            <%_ } _%>
             "error": "<strong>Ihr Benutzer konnte nicht aktiviert werden.</strong> Bitte benutzen Sie die Registrierungsmaske, um sich zu registrieren."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/de/reset.json b/generators/languages/templates/src/main/webapp/i18n/de/reset.json
index 9a9ad7842c62..834cc0670475 100644
--- a/generators/languages/templates/src/main/webapp/i18n/de/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/de/reset.json
@@ -9,9 +9,7 @@
                 "info": "Geben Sie die E-Mail Adresse ein, welche Sie bei der Registrierung verwendet haben.",
                 "success": "Eine E-Mail mit weiteren Instruktionen für das Zurücksetzen des Passworts wurde gesendet.",
                 "notfound": "<strong>Diese E-Mail Adresse existiert nicht!</strong> Überprüfen Sie Ihre E-Mail Adresse und versuchen Sie es nochmal."
-
             }
-
         },
         "finish" : {
             "title": "Passwort zurücksetzen",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Wählen Sie ein neues Passwort",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Ihr Passwort wurde zurückgesetzt.</strong> Bitte <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">melden</a> Sie sich erneut an.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Ihr Passwort wurde zurückgesetzt.</strong> Bitte ",
+                <%_ } _%>
                 "keymissing": "Der Reset Schlüssel fehlt.",
                 "error": "Ihr Passwort konnte nicht zurückgesetzt werden. Zur Erinnerung Ihre Anfrage ist nur 24 Stunden gültig."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/el/_global.json b/generators/languages/templates/src/main/webapp/i18n/el/_global.json
index 9338463aecd8..b9172b586c98 100644
--- a/generators/languages/templates/src/main/webapp/i18n/el/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/el/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Διαχείριση",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Πύλη",
                 <%_ } _%>
                 "userManagement": "Διαχείριση χρηστών",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Αν θέλετε να <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">συνδεθείτε</a>, μπορείτε να δοκιμάσετε τους ακολουθους ήδη υπάρχων λογαριασμούς:<br/>- Διαχειριστής (login=\"admin\" και κωδικός=\"admin\") <br/>- Χρήστης (login=\"user\" και κωδικός=\"user\").",
                 "register": "Δεν έχετε λογαριασμό; <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Δημιουργήστε έναν νέο λογαριασμό</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Αν θέλετε να ",
+                    "link": "συνδεθείτε",
+                    "suffix": ", μπορείτε να δοκιμάσετε τους ακολουθους ήδη υπάρχων λογαριασμούς:<br/>- Διαχειριστής (login=\"admin\" και κωδικός=\"admin\") <br/>- Χρήστης (login=\"user\" και κωδικός=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Δεν έχετε λογαριασμό; ",
+                    "link": "Δημιουργήστε έναν νέο λογαριασμό"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Ο κωδικός και η επιβεβαίωση του δεν ταιριάζουν"
diff --git a/generators/languages/templates/src/main/webapp/i18n/el/activate.json b/generators/languages/templates/src/main/webapp/i18n/el/activate.json
index baa95a823675..1742fa34d8db 100644
--- a/generators/languages/templates/src/main/webapp/i18n/el/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/el/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Ενεργοποίηση",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Ο λογαριασμός σας έχει ενεργοποιηθεί.</strong> Παρακαλούμε <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">συνδεθείτε</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Ο λογαριασμός σας έχει ενεργοποιηθεί.</strong> Παρακαλούμε ",
+            <%_ } _%>
             "error": "<strong>Ο λογαριασμός σας δεν μπορεί να ενεργοποιηθεί.</strong> Παρακαλούμε χρησιμοποιήστε τη φόρμα εγγραφής να εγγραφείτε"
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/el/reset.json b/generators/languages/templates/src/main/webapp/i18n/el/reset.json
index 16450e70f454..29fa18c32835 100644
--- a/generators/languages/templates/src/main/webapp/i18n/el/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/el/reset.json
@@ -9,9 +9,7 @@
                 "info": "Εισάγεται το e-mail που χρησιμοποιήσατε κατά την εγγραφη σας",
                 "success": "Κοιτάξτε το email σας για λεπτομέρειες για το πως θα επαναφέρεται τον κωδικό σας.",
                 "notfound": "<strong>Αυτό το e-mail δεν είναι εγγεγραμμένο!</strong> Παρακαλούμε ελέξτε το και δοκιμάστε ξανά"
-
             }
-
         },
         "finish" : {
             "title": "Επαναφορά κωδικού",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Επιλέξτε έναν κανούργιο κωδικό",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Έχει γίνει επαναφορά του κωδικού σας.</strong> Παρακαλούμε <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">συνδεθείτε</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Έχει γίνει επαναφορά του κωδικού σας.</strong> Παρακαλούμε ",
+                <%_ } _%>
                 "keymissing": "κωδικός επαναφοράς είναι απών.",
                 "error": "Ο κωδικός σας δεν μπορεί να επανεφέρθη. Μια αίτηση για επαναφορά κωδικού είναι έγκυρη μονο για 24 ώρες."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/en/reset.json b/generators/languages/templates/src/main/webapp/i18n/en/reset.json
index cdb97bd5b191..4824b8e3ed0b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/en/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/en/reset.json
@@ -9,9 +9,7 @@
                 "info": "Enter the e-mail address you used to register",
                 "success": "Check your e-mails for details on how to reset your password.",
                 "notfound": "<strong>E-Mail address isn't registered!</strong> Please check and try again"
-
             }
-
         },
         "finish" : {
             "title": "Reset password",
@@ -21,14 +19,13 @@
             "messages": {
                 "info": "Choose a new password",
                 <%_ if (angularVersion === 'angular1') { _%>
-                    "success": "<strong>Your password has been reset.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
+                "success": "<strong>Your password has been reset.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
                 <%_ } else if (angularVersion === 'angular2') { _%>
-                    "success": "<strong>Your password has been reset.</strong> Please ",
+                "success": "<strong>Your password has been reset.</strong> Please ",
                 <%_ } _%>
                 "keymissing": "The reset key is missing.",
                 "error": "Your password couldn't be reset. Remember a password request is only valid for 24 hours."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/es/_global.json b/generators/languages/templates/src/main/webapp/i18n/es/_global.json
index 7f77770bd8a9..8941c3545376 100644
--- a/generators/languages/templates/src/main/webapp/i18n/es/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/es/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administración",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Gestión de usuarios",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Si desea <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">iniciar una sesión</a>, puede intentar con las cuentas predeterminadas:<br/>- Administrator (usuario=\"admin\" y contraseña=\"admin\") <br/>- Usuario (usuario=\"user\" y contraseña=\"user\").",
                 "register": "¿No tienes una cuenta todavía? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Crea una cuenta</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Si desea ",
+                    "link": "iniciar una sesión",
+                    "suffix": ", puede intentar con las cuentas predeterminadas:<br/>- Administrator (usuario=\"admin\" y contraseña=\"admin\") <br/>- Usuario (usuario=\"user\" y contraseña=\"user\")."
+                },
+                "register": {
+                    "noaccount": "¿No tienes una cuenta todavía?",
+                    "link": "Crea una cuenta"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "¡La contraseña y la confirmación de contraseña no coinciden!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/es/activate.json b/generators/languages/templates/src/main/webapp/i18n/es/activate.json
index 1739278974e0..e1e64f841289 100644
--- a/generators/languages/templates/src/main/webapp/i18n/es/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/es/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activación",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Su cuenta ha sido activada.</strong> Por favor, <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">inicia la sesión</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Su cuenta ha sido activada.</strong> Por favor, ",
+            <%_ } _%>
             "error": "<strong>Su cuenta no pudo ser activada.</strong> Por favor, utilice el formulario de inscripción para registrarse."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/es/reset.json b/generators/languages/templates/src/main/webapp/i18n/es/reset.json
index ec4c37e2f1b9..3a37b5f6e98a 100644
--- a/generators/languages/templates/src/main/webapp/i18n/es/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/es/reset.json
@@ -9,9 +9,7 @@
                 "info": "Introduzca la dirección de correo electrónico que utilizó para registrarse",
                 "success": "Revise su correo electrónico para obtener más información sobre cómo restablecer su contraseña.",
                 "notfound": "<strong>¡Dirección de correo no registrada!</strong> Por favor, compruebe e inténtelo de nuevo"
-
             }
-
         },
         "finish" : {
             "title": "Restablecer la contraseña",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Elija una contraseña nueva",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Su contraseña ha sido restablecida.</strong> Por favor, <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">inicie sesión</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Su contraseña ha sido restablecida.</strong> Por favor, ",
+                <%_ } _%>
                 "keymissing": "Falta la clave de reinicio.",
                 "error": "Su contraseña no puede ser restablecida. Recuerde que una solicitud de reinicio de contraseña sólo es válida durante 24 horas."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/fr/_global.json b/generators/languages/templates/src/main/webapp/i18n/fr/_global.json
index 2cdef02439cf..70ffdf0cf496 100644
--- a/generators/languages/templates/src/main/webapp/i18n/fr/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/fr/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administration",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Gestion des utilisateurs",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Si vous voulez vous <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">connecter</a>, vous pouvez utiliser les comptes par défaut : <br/> - Administrateur (nom d'utilisateur=\"admin\" et mot de passe =\"admin\") <br/> - Utilisateur (nom d'utilisateur=\"user\" et mot de passe =\"user\").",
                 "register": "Vous n'avez pas encore de compte ? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Créer un compte</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Si vous voulez vous ",
+                    "link": "connecter",
+                    "suffix": ", vous pouvez utiliser les comptes par défaut : <br/> - Administrateur (nom d'utilisateur=\"admin\" et mot de passe =\"admin\") <br/> - Utilisateur (nom d'utilisateur=\"user\" et mot de passe =\"user\")."
+                },
+                "register": {
+                    "noaccount": "Vous n'avez pas encore de compte ?",
+                    "link": "Créer un compte"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Le nouveau mot de passe et sa confirmation ne sont pas égaux !"
diff --git a/generators/languages/templates/src/main/webapp/i18n/fr/activate.json b/generators/languages/templates/src/main/webapp/i18n/fr/activate.json
index 7bd86b77dd44..22510aa59f60 100644
--- a/generators/languages/templates/src/main/webapp/i18n/fr/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/fr/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activation",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Votre compte utilisateur a été activé.</strong> Merci de vous <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">authentifier</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Votre compte utilisateur a été activé.</strong> Merci de vous ",
+            <%_ } _%>
             "error": "<strong>Votre compte utilisateur n'a pas pu être activé.</strong> Utilisez le formulaire d'enregistrement pour en créer un nouveau."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/fr/reset.json b/generators/languages/templates/src/main/webapp/i18n/fr/reset.json
index b966dbe1cfcb..fc671e574d6d 100644
--- a/generators/languages/templates/src/main/webapp/i18n/fr/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/fr/reset.json
@@ -9,9 +9,7 @@
                 "info": "Veuillez renseigner l'addresse email utilisée pour vous enregistrer",
                 "success": "Veuillez vérifier vos nouveaux emails et suivre les instructions pour réinitialiser votre mot de passe.",
                 "notfound": "<strong>L'adresse email n'existe pas !</strong> Merci de la vérifier et de rééssayer."
-
             }
-
         },
         "finish" : {
             "title": "Réinitialisation du mot de passe",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Choisir un nouveau mot de passe",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Votre mot de passe a été réinitialisé.</strong> Merci de <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">vous authentifier</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Votre mot de passe a été réinitialisé.</strong> Merci de ",
+                <%_ } _%>
                 "keymissing": "La clef de réinitilisation est manquante",
                 "error": "Votre mot de passe n'a pas pu être réinitialisée. La demande de réinitialisation n'est valable que 24 heures."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/_global.json b/generators/languages/templates/src/main/webapp/i18n/gl/_global.json
index ce58cd080b4c..0d5706489038 100644
--- a/generators/languages/templates/src/main/webapp/i18n/gl/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/gl/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administración",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Xestión de usuarios",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Se desexa <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">iniciar unha sesión</a>, pode intentalo coas contas predeterminadas:<br/>- Administrator (usuario=\"admin\" e contrasinal=\"admin\") <br/>- Usuario (usuario=\"user\" e contrasinal=\"user\").",
                 "register": "Aínda non tes unha conta de usuario? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Crea unha conta</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Se desexa ",
+                    "link": "iniciar unha sesión",
+                    "suffix": ", pode intentalo coas contas predeterminadas:<br/>- Administrator (usuario=\"admin\" e contrasinal=\"admin\") <br/>- Usuario (usuario=\"user\" e contrasinal=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Aínda non tes unha conta de usuario?",
+                    "link": "Crea unha conta"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "O contrasinal e a confirmación non coinciden!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/activate.json b/generators/languages/templates/src/main/webapp/i18n/gl/activate.json
index 076fe8031757..88ea3722a4b7 100644
--- a/generators/languages/templates/src/main/webapp/i18n/gl/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/gl/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activación",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>A súa conta foi activada.</strong> Por favor <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">inicie a sesión</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>A súa conta foi activada.</strong> Por favor ",
+            <%_ } _%>
             "error": "<strong>A súa conta non puido ser activada.</strong> Por favor utilice o formulario de inscrición para rexistrarse."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/reset.json b/generators/languages/templates/src/main/webapp/i18n/gl/reset.json
index ae7b2dd013ab..2080ca76ae5b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/gl/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/gl/reset.json
@@ -9,9 +9,7 @@
                 "info": "Introduza a dirección de correo electrónico que utilizou para rexistrarse",
                 "success": "Revise o seu correo electrónico para obter máis información sobre como restablecer o seu contrasinal.",
                 "notfound": "<strong>Dirección de correo non rexistrada!</strong>Por favor comprobe e ténteo de novo"
-
             }
-
         },
         "finish" : {
             "title": "Restablecer o contrasinal",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Elixa un contrasinal novo",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>O seu contrasinal foi restablecida.</strong> Por favor <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">inicie sesión</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>O seu contrasinal foi restablecida.</strong> Por favor ",
+                <%_ } _%>
                 "keymissing": "Falta a clave de reinicio.",
                 "error": "O seu contrasinal non pode ser restablecida. Lembre que unha solicitude de reinicio de contrasinal só é válida durante 24 horas."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/hi/_global.json b/generators/languages/templates/src/main/webapp/i18n/hi/_global.json
index aba53b1dbafa..e62bfcaafadc 100644
--- a/generators/languages/templates/src/main/webapp/i18n/hi/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/hi/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "प्रशासन",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "गेटवे",
                 <%_ } _%>
                 "userManagement": "उपयोगकर्ता प्रबंधन",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "आप <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन</a> करने के लिए चाहते हैं, तो आप डिफ़ॉल्ट खातों का प्रयास कर सकते हैं <br/>- व्यवस्थापक (लॉगिन = \"admin\" और पासवर्ड = \"admin\") <br/>- उपयोगकर्ता(लॉगिन \"user\" और पासवर्ड= \"user\")",
                 "register": "आपका खाता मौजूद नहीं है? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">एक नया खाता पंजीकृत करें</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "आप ",
+                    "link": "साइन इन",
+                    "suffix": " करने के लिए चाहते हैं, तो आप डिफ़ॉल्ट खातों का प्रयास कर सकते हैं <br/>- व्यवस्थापक (लॉगिन = \"admin\" और पासवर्ड = \"admin\") <br/>- उपयोगकर्ता(लॉगिन \"user\" और पासवर्ड= \"user\")"
+                },
+                "register": {
+                    "noaccount": "आपका खाता मौजूद नहीं है?",
+                    "link": "एक नया खाता पंजीकृत करें"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "पासवर्ड और इसकी पुष्टि से मेल नहीं खाती!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/hi/activate.json b/generators/languages/templates/src/main/webapp/i18n/hi/activate.json
index d81856c87ff7..c4a2167949d4 100644
--- a/generators/languages/templates/src/main/webapp/i18n/hi/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/hi/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "सक्रियण",
         "messages": {
-            "success": "<strong>आपका उपयोगकर्ता सक्रिय हो गया है.</strong> कृपया  <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन करें</a>.",
+            <%_ if (angularVersion === 'angular1') { _%>
+            "success": "<strong>आपका उपयोगकर्ता सक्रिय हो गया है.</strong> कृपया <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन करें</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>आपका उपयोगकर्ता सक्रिय हो गया है.</strong> कृपया ",
+            <%_ } _%>
             "error": "<strong>आपके उपयोगकर्ता सक्रिय नहीं किया जा सका.</strong> कृपया साइन इन करने के लिए पंजीकरण फार्म का उपयोग करें."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/hi/reset.json b/generators/languages/templates/src/main/webapp/i18n/hi/reset.json
index ccffe05b60e6..ff9392723a01 100644
--- a/generators/languages/templates/src/main/webapp/i18n/hi/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/hi/reset.json
@@ -9,9 +9,7 @@
                 "info": "रजिस्टर करने के लिए आप ई-मेल दर्ज करें",
                 "success": "अपने पासवर्ड रीसेट करने के जानकारी के लिए अपने ई-मेल्स की जाँच करें.",
                 "notfound": "<strong>पंजीकृत ई-मेल पता नहीं है!</strong> कृपया जाँच करें और पुन: प्रयास करें"
-
             }
-
         },
         "finish" : {
             "title": "अपना पासवर्ड रीसेट करें",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "एक नया पासवर्ड चुनें",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>अपना पासवर्ड रीसेट किया गया है.</strong> कृपया <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन</a> करें.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>अपना पासवर्ड रीसेट किया गया है.</strong> कृपया ",
+                <%_ } _%>
                 "keymissing": "रीसेट कुंजी गुम है।",
                 "error": "अपना पासवर्ड रीसेट नहीं कर सका। याद रखें एक पासवर्ड अनुरोध केवल 24 घंटे के लिए मान्य है।"
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/_global.json b/generators/languages/templates/src/main/webapp/i18n/hu/_global.json
index 56a73f717d8f..0bc314460317 100644
--- a/generators/languages/templates/src/main/webapp/i18n/hu/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/hu/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Adminisztráció",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Felhasználókezelés",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Ha be akar <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">lépni</a>, kipróbálás céljából használható felhasználók:<br/>- Adminisztrátor (azonosító=\"admin\" és a jelszó=\"admin\") <br/>- Felhasználó (azonosító=\"user\" és jelszó=\"user\").",
                 "register": "Nincs még hozzáférése? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Regisztráljon</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Ha be akar ",
+                    "link": "lépni",
+                    "suffix": ", kipróbálás céljából használható felhasználók:<br/>- Adminisztrátor (azonosító=\"admin\" és a jelszó=\"admin\") <br/>- Felhasználó (azonosító=\"user\" és jelszó=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Nincs még hozzáférése?",
+                    "link": "Regisztráljon"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "A jelszó és a jelszó megerősítés nem egyezik meg!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/activate.json b/generators/languages/templates/src/main/webapp/i18n/hu/activate.json
index 6eae092e074d..10b9171a101b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/hu/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/hu/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktiválás",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>A hozzáférése aktiválásra került.</strong> Kérjük <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">lépjen be</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>A hozzáférése aktiválásra került.</strong> Kérjük ",
+            <%_ } _%>
             "error": "<strong>A hozzáférését nem sikerült aktiválni.</strong> Kérjük használja a regisztrációs oldalt, hogy hozzáférést igényeljen."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/reset.json b/generators/languages/templates/src/main/webapp/i18n/hu/reset.json
index 2cfd310400bb..4970a66fefd5 100644
--- a/generators/languages/templates/src/main/webapp/i18n/hu/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/hu/reset.json
@@ -9,9 +9,7 @@
                 "info": "Adja meg e-mail címét, amivel regisztrált",
                 "success": "E-mail címére elküldtük a leírást, hogyan állíthatja vissza jelszavát.",
                 "notfound": "<strong>Ezzel az e-mail címmel nem regisztráltak!</strong> Kérjük ellenőrizze, és próbálja újra!"
-
             }
-
         },
         "finish" : {
             "title": "Jelszó állítás",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Válasszon új jelszót",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Az Ön jelszava meg lett változtatva.</strong> Kérjük <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">lépjen be vele</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Az Ön jelszava meg lett változtatva.</strong> Kérjük ",
+                <%_ } _%>
                 "keymissing": "A jelszó visszaállító kulcs hiányzik.",
                 "error": "Az Ön jelszavát nem lehetett átállítani. Kérjük vegye figyelembe, hogy a jelszó visszaállító kulcs csak 24 óráig érvényes."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/it/_global.json b/generators/languages/templates/src/main/webapp/i18n/it/_global.json
index 94b763c76571..aaa2ed257ec9 100644
--- a/generators/languages/templates/src/main/webapp/i18n/it/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/it/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Amministratore",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Gestione utenti",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
-                "authenticated": "Se vuoi <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\"> avviare una sessione</a>, puoi provare ad utilizzare gli account di default: <br/> - Amministratore (user = \"admin\" e la password = \"admin\") <br/> - utente (user = \"user\" e la password = \"user\")",
+                <%_ if (angularVersion === 'angular1') { _%>
+                "authenticated": "Se vuoi <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">avviare una sessione</a>, puoi provare ad utilizzare gli account di default: <br/> - Amministratore (user = \"admin\" e la password = \"admin\") <br/> - utente (user = \"user\" e la password = \"user\")",
                 "register": "Non hai ancora un account? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Crea un account</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Se vuoi ",
+                    "link": "avviare una sessione",
+                    "suffix": ", puoi provare ad utilizzare gli account di default: <br/> - Amministratore (user = \"admin\" e la password = \"admin\") <br/> - utente (user = \"user\" e la password = \"user\")"
+                },
+                "register": {
+                    "noaccount": "Non hai ancora un account?",
+                    "link": "Crea un account"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "La password e la conferma non corrispondono!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/it/activate.json b/generators/languages/templates/src/main/webapp/i18n/it/activate.json
index 6730b76ff0ef..54cfee5042b6 100644
--- a/generators/languages/templates/src/main/webapp/i18n/it/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/it/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Attivazione",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Il tuo account è stato attivato.</strong> Si prega di <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">accedere</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Il tuo account è stato attivato.</strong> Si prega di ",
+            <%_ } _%>
             "error": "<strong>Il tuo account non può essere verificato.</strong> Si prega di compilare il modulo, per registrarsi."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/it/reset.json b/generators/languages/templates/src/main/webapp/i18n/it/reset.json
index 53f5b005cd91..8c7909b763ab 100644
--- a/generators/languages/templates/src/main/webapp/i18n/it/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/it/reset.json
@@ -9,9 +9,7 @@
                 "info": "Inserire l'indirizzo e-mail utilizzato per la registrazione",
                 "success": "Controlla la tua e-mail per i dettagli su come reimpostare la password.",
                 "notfound": "<strong>E-Mail non registrata!</strong> Si prega di verificarla e riprovare!"
-
             }
-
         },
         "finish" : {
             "title": "Reimposta Password",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Scegliere una nuova password",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>La tua password è stata reimpostata .</strong> Per favore <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autenticati</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>La tua password è stata reimpostata .</strong> Per favore ",
+                <%_ } _%>
                 "keymissing": "La chiave di reimpostazione non è presente.",
                 "error": "La tua password potrebbe non essere ripristinata. Ricorda che la richiesta della password è valida solo per 24 ore."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ja/_global.json b/generators/languages/templates/src/main/webapp/i18n/ja/_global.json
index 9c16424015f1..b7d9cb31e29c 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ja/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ja/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "管理",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">認証</a>を試したければ, デフォルトアカウント:<br/>- 管理者 (ユーザー名=\"admin\", パスワード=\"admin\") <br/>- ユーザー (login=\"user\", password=\"user\").",
                 "register": "アカウントをまだお持ちでないですか? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">アカウントを登録する</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "",
+                    "link": "認証",
+                    "suffix": "を試したければ, デフォルトアカウント:<br/>- 管理者 (ユーザー名=\"admin\", パスワード=\"admin\") <br/>- ユーザー (login=\"user\", password=\"user\")."
+                },
+                "register": {
+                    "noaccount": "アカウントをまだお持ちでないですか?",
+                    "link": "アカウントを登録する"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "パスワードが一致しません!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/ja/activate.json b/generators/languages/templates/src/main/webapp/i18n/ja/activate.json
index cffcce85c133..bf6c38ef7034 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ja/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ja/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "アクティベーション",
         "messages": {
-            "success": "<strong>あなたのアカウントはアクティベートされました。</strong> <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">ログイン</a>してください。",
+            <%_ if (angularVersion === 'angular1') { _%>
+            "success": "<strong>あなたのアカウントはアクティベートされました。</strong> <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">ログイン</a>してください。</a>",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>あなたのアカウントはアクティベートされました。</strong> ",
+            <%_ } _%>
             "error": "<strong>あなたのアカウントはアクティベートされませんでした。</strong>サインアップするために登録フォームを使ってサインアップしてください。"
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ja/reset.json b/generators/languages/templates/src/main/webapp/i18n/ja/reset.json
index d790e6753d44..4824b8e3ed0b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ja/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ja/reset.json
@@ -9,9 +9,7 @@
                 "info": "Enter the e-mail address you used to register",
                 "success": "Check your e-mails for details on how to reset your password.",
                 "notfound": "<strong>E-Mail address isn't registered!</strong> Please check and try again"
-
             }
-
         },
         "finish" : {
             "title": "Reset password",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Choose a new password",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Your password has been reset.</strong> Please <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">sign in</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Your password has been reset.</strong> Please ",
+                <%_ } _%>
                 "keymissing": "The reset key is missing.",
                 "error": "Your password couldn't be reset. Remember a password request is only valid for 24 hours."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/_global.json b/generators/languages/templates/src/main/webapp/i18n/ko/_global.json
index f885779c6a70..0ec3c09ba92f 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ko/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ko/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "관리자",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "tracker": "사용자 트랙커",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">인증</a>을 원하시면, 기본 계정을 사용할 수 있습니다:<br/>- 관리자 (아이디=\"admin\", 비밀번호=\"admin\") <br/>- 사용자 (아이디=\"user\", 비밀번호=\"user\").",
                 "register": "아직 계정이 없습니까? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">새로운 계정을 등록하세요</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "",
+                    "link": "인증",
+                    "suffix": "을 원하시면, 기본 계정을 사용할 수 있습니다:<br/>- 관리자 (아이디=\"admin\", 비밀번호=\"admin\") <br/>- 사용자 (아이디=\"user\", 비밀번호=\"user\")."
+                },
+                "register": {
+                    "noaccount": "아직 계정이 없습니까?",
+                    "link": "새로운 계정을 등록하세요"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "비밀번호가 일치하지 않습니다!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/activate.json b/generators/languages/templates/src/main/webapp/i18n/ko/activate.json
index 274876cefd9d..1ee852b10e06 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ko/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ko/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "계정 활성화",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>당신의 계정이 활성화되었습니다.</strong> <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">인증</a>하기.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>당신의 계정이 활성화되었습니다.</strong> ",
+            <%_ } _%>
             "error": "<strong>당신의 계정이 활성화될 수 없습니다.</strong> 회원가입을 위해 등록 폼을 이용해 주세요."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/reset.json b/generators/languages/templates/src/main/webapp/i18n/ko/reset.json
index e8271d711f76..2a7c30f0b797 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ko/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ko/reset.json
@@ -9,9 +9,7 @@
                 "info": "회원가입 시 사용한 이메일 주소를 입력하세요.",
                 "success": "비밀번호 변경 방법에 대한 자세한 내용은 이메일을 확인하세요.",
                 "notfound": "<strong>등록되지 않은 이메일입니다!</strong> 확인 후 다시 시도하세요."
-
             }
-
         },
         "finish" : {
             "title": "비밀번호 변경",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "새 비밀번호를 선택하세요.",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>비밀번호가 변경되었습니다.</strong> <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">로그인하기</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>비밀번호가 변경되었습니다.</strong> ",
+                <%_ } _%>
                 "keymissing": "변경키가 올바르지 않습니다.",
                 "error": "비밀번호를 변경할 수 없습니다. 비밀번호 변경 요청은 오직 24시간 내에만 유효함을 기억하세요."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/mr/_global.json b/generators/languages/templates/src/main/webapp/i18n/mr/_global.json
index b9091a4f6554..9bd62a410af3 100644
--- a/generators/languages/templates/src/main/webapp/i18n/mr/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/mr/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "प्रशासन",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "गेटवे",
                 <%_ } _%>
                 "userManagement": "वापरकर्ता व्यवस्थापन",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "आपण <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन</a> करू इच्छित असल्यास, तुम्ही मुलभूत खाती प्रयत्न करू शकता:<br/>- प्रशासक (लॉग इन=\"admin\" आणि पासवर्ड=\"admin\") <br/>- वापरकर्ता (लॉग इन=\"user\" आणि पासवर्ड=\"user\").",
                 "register": "आपण खाते नाही? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">नवीन खाते नोंदणी करू</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "आपण ",
+                    "link": "साइन इन",
+                    "suffix": " करू इच्छित असल्यास, तुम्ही मुलभूत खाती प्रयत्न करू शकता:<br/>- प्रशासक (लॉग इन=\"admin\" आणि पासवर्ड=\"admin\") <br/>- वापरकर्ता (लॉग इन=\"user\" आणि पासवर्ड=\"user\")."
+                },
+                "register": {
+                    "noaccount": "आपण खाते नाही?",
+                    "link": "नवीन खाते नोंदणी करू"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "पासवर्ड आणि त्याची पुष्टीकरण जुळत नाही!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/mr/activate.json b/generators/languages/templates/src/main/webapp/i18n/mr/activate.json
index 6346dc91fd70..02eb5bad459b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/mr/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/mr/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "सक्रियन",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>आपला वापरकर्ता सक्रिय झाला आहे.</strong> कृपया <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन करा</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>आपला वापरकर्ता सक्रिय झाला आहे.</strong> कृपया ",
+            <%_ } _%>
             "error": "<strong>आपल्या वापरकर्ता सक्रिय केले जाऊ शकत नाही.</strongकृपया साइन अप करण्यासाठी नोंदणी फॉर्म वापरा."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/mr/reset.json b/generators/languages/templates/src/main/webapp/i18n/mr/reset.json
index efcfe5c37c84..a954c3f0017b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/mr/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/mr/reset.json
@@ -9,9 +9,7 @@
                 "info": "ई-मेल पत्ता नोंदणी करण्यासाठी वापरले प्रविष्ट करा",
                 "success": "आपला संकेतशब्द कसा रीसेट करायचा तपशीलासाठी कृपया आपल्या ई-मेल तपासा.",
                 "notfound": "<strong>ई-मेल पत्ता नोंदणी नाही !</strong> कृपया तपासा आणि पुन्हा प्रयत्न करा"
-
             }
-
         },
         "finish" : {
             "title": "संकेतशब्द रीसेट करा",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "एक नवीन संकेतशब्द निवडा",
-                "success": "<strong>आपला संकेतशब्द रीसेट केला गेला आहे.</strong> कृपया  <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन करा</a>.",
+                <%_ if (angularVersion === 'angular1') { _%>
+                "success": "<strong>आपला संकेतशब्द रीसेट केला गेला आहे.</strong> कृपया <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">साइन इन करा</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>आपला संकेतशब्द रीसेट केला गेला आहे.</strong> कृपया ",
+                <%_ } _%>
                 "keymissing": "रीसेट की गहाळ आहे.",
                 "error": "तुमचा पासवर्ड रीसेट असू शकत नाही एक पासवर्ड विनंती फक्त 24 तास वैध आहे लक्षात ठेवा."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/nl/_global.json b/generators/languages/templates/src/main/webapp/i18n/nl/_global.json
index b9b3a5551290..4d779303531f 100644
--- a/generators/languages/templates/src/main/webapp/i18n/nl/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/nl/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administrator",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Indien u wilt <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">aanmelden</a>, dan kan u de standaard gebruikers proberen:<br/>- Administrator (login=\"admin\" en wachtwoord=\"admin\") <br/>- Gebruiker (login=\"user\" en wachtwoord=\"user\").",
                 "register": "U heeft nog geen gebruiker? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Registreer een nieuwe gebruiker</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Indien u wilt ",
+                    "link": "aanmelden",
+                    "suffix": ", dan kan u de standaard gebruikers proberen:<br/>- Administrator (login=\"admin\" en wachtwoord=\"admin\") <br/>- Gebruiker (login=\"user\" en wachtwoord=\"user\")."
+                },
+                "register": {
+                    "noaccount": "U heeft nog geen gebruiker?",
+                    "link": "Registreer een nieuwe gebruiker"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "Het wachtwoord en zijn bevestiging komen niet overeen!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/nl/activate.json b/generators/languages/templates/src/main/webapp/i18n/nl/activate.json
index 7e718b090afb..77227c9df96c 100644
--- a/generators/languages/templates/src/main/webapp/i18n/nl/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/nl/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activatie",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Uw gebuiker werd geactiveerd.</strong> Gelieve te <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">authenticeren</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Uw gebuiker werd geactiveerd.</strong> Gelieve te ",
+            <%_ } _%>
             "error": "<strong>Uw gebruiker kon niet geactiveerd worden.</strong> Gelieve het registratie formulier te gebruiken om zich in te schrijven."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/nl/reset.json b/generators/languages/templates/src/main/webapp/i18n/nl/reset.json
index f82453c10e6d..6205eeb9c75c 100644
--- a/generators/languages/templates/src/main/webapp/i18n/nl/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/nl/reset.json
@@ -9,9 +9,7 @@
                 "info": "Geef het e-mailadres dat u gebruikte om te registreren",
                 "success": "Controleer uw e-mails voor meer informatie over hoe u uw wachtwoord kan resetten.",
                 "notfound": "<strong>E-mailadres is niet geregistreerd!</strong> Gelieve het te controleren en opnieuw te proberen"
-
             }
-
         },
         "finish" : {
             "title": "Reset wachtwoord",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Kies een nieuw wachtwoord",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Uw wachtwoord is gereset.</strong> Gelieve <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">authenticeer</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Uw wachtwoord is gereset.</strong> Gelieve ",
+                <%_ } _%>
                 "keymissing": "De reset sleutel ontbreekt.",
                 "error": "Uw wachtwoord kon niet gereset worden. Vergeet niet dat een wachtwoord verzoek slechts 24 uur geldig is."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/_global.json b/generators/languages/templates/src/main/webapp/i18n/pl/_global.json
index 0fbdd36ddff0..e61490b67358 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administracja",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Jeśli chcesz się <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">zalogować</a>, możesz spróbować któregoś z domyślnych kont:<br/>- Administrator (login=\"admin\" i hasło=\"admin\") <br/>- Użytkownik (login=\"user\" i hasło=\"user\").",
                 "register": "Nie masz jeszcze konta? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Zarejestruj się</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Jeśli chcesz się ",
+                    "link": "zalogować",
+                    "suffix": ", możesz spróbować któregoś z domyślnych kont:<br/>- Administrator (login=\"admin\" i hasło=\"admin\") <br/>- Użytkownik (login=\"user\" i hasło=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Nie masz jeszcze konta?",
+                    "link": "Zarejestruj się"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Hasło i potwierdzenie nie zgadzają się!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/activate.json b/generators/languages/templates/src/main/webapp/i18n/pl/activate.json
index ba51869164af..7d87fda5e345 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktywacja użytkownika",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Twoje konto zostało aktywowane.</strong> Możesz się teraz <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">zalogować</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Twoje konto zostało aktywowane.</strong> Możesz się teraz ",
+            <%_ } _%>
             "error": "<strong>Twoje konto nie mogło zostać aktywowane.</strong> Użyj proszę formularza rejestracji ponownie."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/reset.json b/generators/languages/templates/src/main/webapp/i18n/pl/reset.json
index 0f3f2b651806..35b8faa1fd81 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/reset.json
@@ -9,9 +9,7 @@
                 "info": "Wpisz e-mail użyty podczas rejestracji.",
                 "success": "Sprawdź e-mail w celu uzyskania szczegołów jak zresetować hasło.",
                 "notfound": "<strong>E-Mail nie był zarejestrowany!</strong> Proszę sprawdź i spróbuj ponownie."
-
             }
-
         },
         "finish" : {
             "title": "Reset hasła",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Wybierz nowe hasło",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Twoje hasło zostało zresetowane.</strong> Proszę <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">zaloguj się</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Twoje hasło zostało zresetowane.</strong> Proszę ",
+                <%_ } _%>
                 "keymissing": "Brakuje klucza resetującego hasło.",
                 "error": "Twoje hasło nie mogło zostać zresetowane. Pamiętaj że prośba o zresetowanie hasła jest ważna tylko przez 24 godziny."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-br/_global.json b/generators/languages/templates/src/main/webapp/i18n/pt-br/_global.json
index 45f1ade138f7..1e1de806d719 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pt-br/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administração",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Gerenciamento de usuário",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Para <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">entrar</a>, utilize as seguintes contas padrões:<br/>- Administrador (usuário=\"admin\" and senha=\"admin\") <br/>- Usuário (usuário=\"user\" and senha=\"user\").",
                 "register": "Não possui uma conta ainda? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Crie uma nova conta</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Para ",
+                    "link": "entrar",
+                    "suffix": ", utilize as seguintes contas padrões:<br/>- Administrador (usuário=\"admin\" and senha=\"admin\") <br/>- Usuário (usuário=\"user\" and senha=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Não possui uma conta ainda?",
+                    "link": "Crie uma nova conta"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "A senha e sua confirmação devem ser iguais!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json b/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json
index 4fee825c5c41..1831f2964171 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Ativação",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Usuário ativado com sucesso.</strong> Favor <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">entrar no sistema</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Usuário ativado com sucesso.</strong> Favor ",
+            <%_ } _%>
             "error": "<strong>O usuário não pode ser ativado.</strong> Favor utilizar o formulário de cadastro para criar uma nova conta."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json b/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json
index a263b9286815..ea2633124224 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json
@@ -20,7 +20,11 @@
             },
             "messages": {
                 "info": "Escolha uma nova senha",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Sua senha foi alterada com sucesso!</strong> Por favor <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">Entre novamente</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Sua senha foi alterada com sucesso!</strong> Por favor ",
+                <%_ } _%>
                 "keymissing": "Chave de reestabelecimento não encontrada.",
                 "error": "Sua senha não pôde ser trocada. Lembre-se, requisição de troca de senha é válida apenas por 24h."
             }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/_global.json b/generators/languages/templates/src/main/webapp/i18n/pt-pt/_global.json
index 6caf18eacdf1..91bab871401d 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administração",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Para <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">entrar</a>, utilize as seguintes contas:<br/>- Administrador (utilizador=\"admin\" e palavra-passe=\"admin\") <br/>- Utilizador (utilizador=\"user\" e palavra-passe=\"user\").",
                 "register": "Ainda não tem uma conta? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Crie uma nova conta</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Para ",
+                    "link": "entrar",
+                    "suffix": ", utilize as seguintes contas:<br/>- Administrador (utilizador=\"admin\" e palavra-passe=\"admin\") <br/>- Utilizador (utilizador=\"user\" e palavra-passe=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Ainda não tem uma conta?",
+                    "link": "Crie uma nova conta"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "A palavra-passe e a sua confirmação devem ser iguais!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json b/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json
index 74ae0486e90b..257dc13d131a 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Ativação",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Utilizador ativado com sucesso.</strong> Por favor <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">entre no sistema</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Utilizador ativado com sucesso.</strong> Por favor ",
+            <%_ } _%>
             "error": "<strong>O utilizador não pode ser ativado.</strong> Por favor utilize o formulário de registo para criar uma nova conta."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json b/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json
index c00e2e2af30d..0df1324fd988 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json
@@ -9,9 +9,7 @@
                 "info": "Introduza o endereço de e-mail utilizado para registar",
                 "success": "Verifique o seu e-mail para mais detalhes sobre como repor a palavra-passe.",
                 "notfound": "<strong>Endereço de e-mail não registado!</strong> Por favor verifique e tente de novo"
-
             }
-
         },
         "finish" : {
             "title": "Reposição da palavra-passe",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Escolha uma nova palavra-passe",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>A sua palavra-passe foi reposta.</strong> Por favor <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autentique-se</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>A sua palavra-passe foi reposta.</strong> Por favor ",
+                <%_ } _%>
                 "keymissing": "Chave de reposição em falta.",
                 "error": "A sua palavra-passe não pode ser reposta. O pedido de reposição da palavra-passe é válido apenas por 24 horas."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ro/_global.json b/generators/languages/templates/src/main/webapp/i18n/ro/_global.json
index d49b34b94cfd..3414de37ffce 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ro/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ro/_global.json
@@ -23,7 +23,7 @@
             },
             "admin": {
                 "main": "Administrare",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -57,8 +57,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Dacă doriți să vă <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autentificați</a>, puteți încerca conturile implicite:<br/>- Administrator (login=\"admin\" si parola=\"admin\") <br/>- Utilizator (login=\"user\" si parola=\"user\").",
                 "register": "Înca nu aveți un cont? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Înregistrați un nou cont</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Dacă doriți să vă ",
+                    "link": "autentificați",
+                    "suffix": ", puteți încerca conturile implicite:<br/>- Administrator (login=\"admin\" si parola=\"admin\") <br/>- Utilizator (login=\"user\" si parola=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Înca nu aveți un cont?",
+                    "link": "Înregistrați un nou cont"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "Parola si confirmarea ei nu corespund!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/ro/activate.json b/generators/languages/templates/src/main/webapp/i18n/ro/activate.json
index 4961cc4269e7..58e54def6134 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ro/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ro/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Activare",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Contul dumneavoastră a fost activat.</strong> Vă rugăm să vă <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autentificați</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Contul dumneavoastră a fost activat.</strong> Vă rugăm să vă ",
+            <%_ } _%>
             "error": "<strong>Contul dumneavoastră nu a putut fi activat.</strong> Vă rugăm să folosiți formularul de înregistrare."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ro/reset.json b/generators/languages/templates/src/main/webapp/i18n/ro/reset.json
index ead614ddf38d..c99a79ddfe51 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ro/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ro/reset.json
@@ -9,9 +9,7 @@
                 "info": "Introduceți adresa de email folosită la înregistrare",
                 "success": "Verificați-vă emailul pentru instrucțiunile de schimbare a parolei.",
                 "notfound": "<strong>Adresa de email nu a fost înregistrata</strong> Vă rugăm verificați și încercați din nou."
-
             }
-
         },
         "finish" : {
             "title": "Resetează parola",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Alegeți o nouă parolă",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Parola dumneavoastra a fost resetata.</strong> Vă rugăm să vă <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">autentificați</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Parola dumneavoastra a fost resetata.</strong> Vă rugăm să vă ",
+                <%_ } _%>
                 "keymissing": "Cheia de resetare lipsește.",
                 "error": "Parola dumneavoastră nu a fost resetată. Vă reamintim că o cerere de resetare este valabilă doar 24 de ore."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ru/_global.json b/generators/languages/templates/src/main/webapp/i18n/ru/_global.json
index 41226ad5afa3..e636abe3623f 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ru/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ru/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Администрирование",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Управление пользователями",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Если вы хотите <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">авторизироваться</a>, вы можете попробовать аккаунты по умолчанию:<br/>- Администратор (логин=\"admin\" и пароль=\"admin\") <br/>- Пользователь (логин=\"user\" и пароль=\"user\").",
                 "register": "У вас нет аккаунта? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Создать новый аккаунт</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Если вы хотите ",
+                    "link": "авторизироваться",
+                    "suffix": ", вы можете попробовать аккаунты по умолчанию:<br/>- Администратор (логин=\"admin\" и пароль=\"admin\") <br/>- Пользователь (логин=\"user\" и пароль=\"user\")."
+                },
+                "register": {
+                    "noaccount": "У вас нет аккаунта?",
+                    "link": "Создать новый аккаунт"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Пароль и его подтверждение не совпадают!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/ru/activate.json b/generators/languages/templates/src/main/webapp/i18n/ru/activate.json
index b93b5417789e..6289b9c05ff3 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ru/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ru/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Активация",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Ваш аккаут был активиронан.</strong> Пожалуйста, <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">войдите</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Ваш аккаут был активиронан.</strong> Пожалуйста, ",
+            <%_ } _%>
             "error": "<strong>Ваш аккаунт не может быть активирован.</strong> Пожалуйста, воспользуйтесь формой регистрации."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ru/reset.json b/generators/languages/templates/src/main/webapp/i18n/ru/reset.json
index 715aaa205b62..50cce8fa0ec2 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ru/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ru/reset.json
@@ -9,9 +9,7 @@
                 "info": "Введите e-mail, указанный при регистрации",
                 "success": "Проверьте ваш e-mail для подробной информации о том, как сбросить пароль.",
                 "notfound": "<strong>E-mail адрес не зарегистрирован!</strong> Пожалуйста проверьте и попробуйте снова"
-
             }
-
         },
         "finish" : {
             "title": "Сброс пароля",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Выберите новый пароль",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Ваш пароль был сброшен.</strong> Пожалуйста <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">войдите</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Ваш пароль был сброшен.</strong> Пожалуйста ",
+                <%_ } _%>
                 "keymissing": "Ключ сброса отсутствует.",
                 "error": "Ваш пароль не может быть сброшен. Запомнить, запрос пароля действителен только в течение 24 часов."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/sk/_global.json b/generators/languages/templates/src/main/webapp/i18n/sk/_global.json
index 26de61236557..4dff411ec4e3 100644
--- a/generators/languages/templates/src/main/webapp/i18n/sk/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/sk/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administrácia",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Brána",
                 <%_ } _%>
                 "userManagement": "Správa používateľov",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Ak sa chcete <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">prihlásiť</a>, môžete vyskúšať predvolené účty:<br/>- Administrátor (meno=\"admin\" a heslo=\"admin\") <br/>- Používateľ (meno=\"user\" a heslo=\"user\").",
                 "register": "Ešte nemáte účet? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Zaregistrujte si nový účet.</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Ak sa chcete ",
+                    "link": "prihlásiť",
+                    "suffix": ", môžete vyskúšať predvolené účty:<br/>- Administrátor (meno=\"admin\" a heslo=\"admin\") <br/>- Používateľ (meno=\"user\" a heslo=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Ešte nemáte účet?",
+                    "link": "Zaregistrujte si nový účet."
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch": "Nové heslo a potvrdenie nového hesla sa nezhodujú!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/sk/activate.json b/generators/languages/templates/src/main/webapp/i18n/sk/activate.json
index c68e222f561c..eb5946a3ca29 100644
--- a/generators/languages/templates/src/main/webapp/i18n/sk/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/sk/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktivácia",
         "messages": {
-            "success": "<strong>Váš používateľský účet bol aktivovaný.</strong><a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">Prihláste sa</a>.",
+            <%_ if (angularVersion === 'angular1') { _%>
+            "success": "<strong>Váš používateľský účet bol aktivovaný.</strong> <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">Prihláste sa</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Váš používateľský účet bol aktivovaný.</strong> ",
+            <%_ } _%>
             "error": "<strong>Váš používateľský účet nemohol byť aktivovaný.</strong> Prosím použite registračný formulár pre prihlásenie."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/sk/reset.json b/generators/languages/templates/src/main/webapp/i18n/sk/reset.json
index 70a478df44ba..5ec21c162feb 100644
--- a/generators/languages/templates/src/main/webapp/i18n/sk/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/sk/reset.json
@@ -9,9 +9,7 @@
                 "info": "Zadajte e-mailovú adresu, ktorú ste použili pri registrácii",
                 "success": "Na Váš e-mail sme Vám poslali informácie o tom ako si môžete obnoviť Vaše heslo.",
                 "notfound": "<strong>E-mailová adresa nebola registrovaná!</strong> Prosím skontrolujte alebo skúste zadať znovu."
-
             }
-
         },
         "finish" : {
             "title": "Obnoviť heslo",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Vyberte si nové heslo",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Vaše heslo bolo obnovené.</strong> Môžete sa <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">prihlásiť</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Vaše heslo bolo obnovené.</strong> Môžete sa ",
+                <%_ } _%>
                 "keymissing": "Chýba kľúč na obnovenie hesla.",
                 "error": "Vaše heslo nemohlo byť obnovené. Požiadavka na obnovenie hesla je platná len 24 hodín."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/sv/_global.json b/generators/languages/templates/src/main/webapp/i18n/sv/_global.json
index 639b6dc5576a..262acfa08b77 100644
--- a/generators/languages/templates/src/main/webapp/i18n/sv/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/sv/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Administration",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "Hantera användare",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "Om du vill <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">logga in</a> - prova med standard kontot:<br/>- Administratör (användarnamn=\"admin\" och lösenord=\"admin\") <br/>- Användare (login=\"user\" och lösenord=\"user\").",
                 "register": "Har du inget konto? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Du kan registrera ett konto</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "Om du vill ",
+                    "link": "logga in",
+                    "suffix": " - prova med standard kontot:<br/>- Administratör (användarnamn=\"admin\" och lösenord=\"admin\") <br/>- Användare (login=\"user\" och lösenord=\"user\")."
+                },
+                "register": {
+                    "noaccount": "Har du inget konto?",
+                    "link": "Du kan registrera ett konto"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "Lösenorden stämmer inte med varandra!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/sv/activate.json b/generators/languages/templates/src/main/webapp/i18n/sv/activate.json
index 5df663d5d684..accf1cc0d7cf 100644
--- a/generators/languages/templates/src/main/webapp/i18n/sv/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/sv/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktivering",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Ditt användarnamn har blivit aktiverat.</strong>. Vänligen <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">logga in</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Ditt användarnamn har blivit aktiverat.</strong>. Vänligen ",
+            <%_ } _%>
             "error": "<strong>Ditt användarnamn kunde inte aktiveras.</strong> Använd gärna registreringsformuläret."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/sv/reset.json b/generators/languages/templates/src/main/webapp/i18n/sv/reset.json
index 7c7f1bac46a3..70edf587c273 100644
--- a/generators/languages/templates/src/main/webapp/i18n/sv/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/sv/reset.json
@@ -9,9 +9,7 @@
                 "info": "Ange mailadressen du använde för att registrera dig",
                 "success": "Kolla din mail för detaljer om hur du återställer ditt lösenord.",
                 "notfound": "<strong>Mailadressen är inte registrerad!</strong> Vänligen försök igen"
-
             }
-
         },
         "finish" : {
             "title": "Återställ lösenord",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Välj ett nytt lösenord",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Ditt lösenord är återställt.</strong> Vänligen <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">logga in</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Ditt lösenord är återställt.</strong> Vänligen ",
+                <%_ } _%>
                 "keymissing": "Återställningsnyckeln saknas.",
                 "error": "Ditt lösenord kunde inte återställas. Kom ihåg att en lösenordsåterställning endast är giltlig i 24 hours."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ta/_global.json b/generators/languages/templates/src/main/webapp/i18n/ta/_global.json
index dd3c29f7ffec..34383df28f1b 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ta/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ta/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "முக்கிய",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "பயனர் நிர்வாகம்",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "<a href=\"#/login\">அங்கீகரிக்க</a>, நீங்கள் இயல்புநிலை கணக்குகள் முயற்சி செய்யலாம்:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\").",
                 "register": "உங்களுக்கு கணக்கு இல்லை? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">புதிய கணக்கு பதிவு செய்க!</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "",
+                    "link": "அங்கீகரிக்க",
+                    "suffix": ", நீங்கள் இயல்புநிலை கணக்குகள் முயற்சி செய்யலாம்:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
+                },
+                "register": {
+                    "noaccount": "உங்களுக்கு கணக்கு இல்லை?",
+                    "link": "புதிய கணக்கு பதிவு செய்க!"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "கடவுச்சொல் மற்றும் அதன் உறுதி பொருந்தவில்லை!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/ta/activate.json b/generators/languages/templates/src/main/webapp/i18n/ta/activate.json
index 2f87b7e21a03..810202188594 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ta/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ta/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "செயல்படுத்தல்",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>உங்கள் பயனர் செயல்படுத்தப்படுகிறது.</strong> தயவு செய்து <a href=\"#/login\">அங்கிகரிக்கவும்</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>உங்கள் பயனர் செயல்படுத்தப்படுகிறது.</strong> தயவு செய்து ",
+            <%_ } _%>
             "error": "<strong>உங்கள் பயனர் செயல்படுத்த முடியவில்லை.</strong> பதிவு செய்ய பதிவு படிவத்தை பயன்படுத்தவும்."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/ta/reset.json b/generators/languages/templates/src/main/webapp/i18n/ta/reset.json
index 886b0da89515..2e997d754176 100644
--- a/generators/languages/templates/src/main/webapp/i18n/ta/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/ta/reset.json
@@ -9,9 +9,7 @@
                 "info": "பதிவு செய்த மின்னஞ்சலை கொடுக்கவும்",
                 "success": "கடவுச்சொல்லை மாற்ற உங்கள் மின்னஞ்சலை பார்க்கவும்.",
                 "notfound": "<strong>மின்னஞ்சல் பதிவு செய்யப்படவில்லை!</strong> மீண்டும் முயற்சிக்கவும்"
-
             }
-
         },
         "finish" : {
             "title": "கடவுச்சொல் மாற்று",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "புதிய கடவுச்சொல்லை தேர்வு செய்க",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>உங்கள் கடவுச்சொல் மாற்றப்பட்டது.</strong> தயவு செய்து <a href=\"#/login\"> உறுதி செய்க</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>உங்கள் கடவுச்சொல் மாற்றப்பட்டது.</strong> தயவு செய்து ",
+                <%_ } _%>
                 "keymissing": "மாற்று சாவி காணவில்லை.",
                 "error": "உங்கள் கடவுச்சொல்லை மாற்ற இயலவில்லை. கடவுச்சொல் கோரிக்கை 24 மணி நேரம் மட்டுமே செல்லுப்படியாகும்."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/_global.json b/generators/languages/templates/src/main/webapp/i18n/tr/_global.json
index fda89cdc37f2..80254dd5d855 100644
--- a/generators/languages/templates/src/main/webapp/i18n/tr/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/tr/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "Yönetim",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">Giriş</a> yapmak istiyorsanız, varsayılan hesaplardan birini deneyebilirsiniz:<br/>- Yönetici (kullanıcı adı=\"admin\" ve şifre=\"admin\") <br/>- Kullanıcı (kullanıcı adı=\"user\" and şifre=\"user\").",
                 "register": "Henüz bir hesabınız yok mu? <a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">Yeni hesap oluştur</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "",
+                    "link": "Giriş",
+                    "suffix": " yapmak istiyorsanız, varsayılan hesaplardan birini deneyebilirsiniz:<br/>- Yönetici (kullanıcı adı=\"admin\" ve şifre=\"admin\") <br/>- Kullanıcı (kullanıcı adı=\"user\" and şifre=\"user\")."
+                },
+                "register": {
+                    "noaccount": "YHenüz bir hesabınız yok mu?",
+                    "link": "Yeni hesap oluştur"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "Şifreler eşleşmedi!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/activate.json b/generators/languages/templates/src/main/webapp/i18n/tr/activate.json
index 40482b05ed2f..efc0cfa465da 100644
--- a/generators/languages/templates/src/main/webapp/i18n/tr/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/tr/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "Aktivasyon",
         "messages": {
+            <%_ if (angularVersion === 'angular1') { _%>
             "success": "<strong>Kullanıcınızın aktivasyon işlemi tamamlandı.</strong> Lütfen <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">giriş yapın</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>Kullanıcınızın aktivasyon işlemi tamamlandı.</strong> Lütfen ",
+            <%_ } _%>
             "error": "<strong>Kullanıcınızın aktivasyon işlemi yapılamadı.</strong> Lütfen giriş sayfasından kaydolun."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/reset.json b/generators/languages/templates/src/main/webapp/i18n/tr/reset.json
index eee40cfd8840..e173176f7b16 100644
--- a/generators/languages/templates/src/main/webapp/i18n/tr/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/tr/reset.json
@@ -9,9 +9,7 @@
                 "info": "Kayıt olurken kullandığın e-mail adresini gir",
                 "success": "Şifreni nasıl sıfırlayacağını öğrenmek için e-postalarını kontrol et.",
                 "notfound": "<strong>E-Posta adresi kayıtlı değil!</strong> Lütfen kontrol et ve tekrar dene"
-
             }
-
         },
         "finish" : {
             "title": "Şifreyi sıfırla",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "Yeni şifre seç",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>Şifren sıfırlandı.</strong> Lütfen <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">giriş yap</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>Şifren sıfırlandı.</strong> Lütfen ",
+                <%_ } _%>
                 "keymissing": "Şifre sıfırlama anahtarı geçersiz.",
                 "error": "Şifren sıfırlanamaz. Şifre isteği sadece 24 saat geçerlidir."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-cn/_global.json b/generators/languages/templates/src/main/webapp/i18n/zh-cn/_global.json
index 571ad38bac7f..d3a8ec457d41 100644
--- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "管理",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "网关",
                 <%_ } _%>
                 "userManagement": "用户管理",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "如果您要<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登录</a>, 您可以使用默认账号:<br/>- 管理员 (账号=\"admin\"和密码=\"admin\") <br/>- 普通用户 (账号=\"user\"和密码=\"user\").",
                 "register": "您还没有账号？<a class=\"alert-link\" href=\"\" ng-click=\"vm.register()\">注册一个新账号</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "如果您要",
+                    "link": "登录",
+                    "suffix": ", 您可以使用默认账号:<br/>- 管理员 (账号=\"admin\"和密码=\"admin\") <br/>- 普通用户 (账号=\"user\"和密码=\"user\")."
+                },
+                "register": {
+                    "noaccount": "您还没有账号",
+                    "link": "注册一个新账号"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "您输入的密码和确认密码不匹配!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json b/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json
index 9b0e23c1debb..d77c3a9087a6 100644
--- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "启用",
         "messages": {
-            "success": "<strong>您的账号已启用.</strong> 请<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登录</a>.",
+            <%_ if (angularVersion === 'angular1') { _%>
+            "success": "<strong>您的账号已启用.</strong> 请 <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登录</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>您的账号已启用.</strong> 请 ",
+            <%_ } _%>
             "error": "<strong>您的账号无法启用.</strong> 请重新注册."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json b/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json
index bf12685d3cd0..637241c3c23a 100644
--- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json
@@ -9,9 +9,7 @@
                 "info": "请输入您注册时使用的邮件地址",
                 "success": "已将重置密码的操作说明发送到您的邮箱，请检查邮件.",
                 "notfound": "<strong>没有与该邮件地址关联的账号.</strong> 请使用其他邮件地址"
-
             }
-
         },
         "finish" : {
             "title": "重置密码",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "请设置新密码",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>您的密码已被重置.</strong> 请 <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登录</a>.",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>您的密码已被重置.</strong> 请 ",
+                <%_ } _%>
                 "keymissing": "无效的重置密码请求.",
                 "error": "无法重置密码. 您必须在请求重置密码后24小时内完成重置."
             }
         }
     }
-
 }
diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-tw/_global.json b/generators/languages/templates/src/main/webapp/i18n/zh-tw/_global.json
index 9ba094ad4d59..c0b12f357e86 100644
--- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/_global.json
+++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/_global.json
@@ -20,7 +20,7 @@
             },
             "admin": {
                 "main": "管理",
-                <%_ if (applicationType == 'gateway') { _%>
+                <%_ if (applicationType === 'gateway') { _%>
                 "gateway": "Gateway",
                 <%_ } _%>
                 "userManagement": "User management",
@@ -48,8 +48,20 @@
         },
         "messages": {
             "info": {
+                <%_ if (angularVersion === 'angular1') { _%>
                 "authenticated": "如果您要<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登入</a>, 您可以使用預設帳號:<br/>- 管理者 (帳號=\"admin\"與密碼=\"admin\") <br/>- 使用者 (帳號=\"user\"與密碼=\"user\").",
                 "register": "您還沒有帳號？<a class=\"alert-link\" ng-click=\"vm.register()\">註冊一個新帳號</a>"
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "authenticated": {
+                    "prefix": "如果您要",
+                    "link": "登入",
+                    "suffix": ", 您可以使用預設帳號:<br/>- 管理者 (帳號=\"admin\"與密碼=\"admin\") <br/>- 使用者 (帳號=\"user\"與密碼=\"user\")."
+                },
+                "register": {
+                    "noaccount": "您還沒有帳號",
+                    "link": "註冊一個新帳號"
+                }
+                <%_ } _%>
             },
             "error": {
                 "dontmatch" : "您輸入的密碼與密碼確認不符合!"
diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json b/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json
index ec38a0d597ae..b88f4f0b5e4e 100644
--- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json
+++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json
@@ -2,7 +2,11 @@
     "activate": {
         "title": "啟用",
         "messages": {
-            "success": "<strong>您的帳號已啟用.</strong> 請<a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登入</a>.",
+            <%_ if (angularVersion === 'angular1') { _%>
+            "success": "<strong>您的帳號已啟用.</strong> 請 <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登入</a>.",
+            <%_ } else if (angularVersion === 'angular2') { _%>
+            "success": "<strong>您的帳號已啟用.</strong> 請 ",
+            <%_ } _%>
             "error": "<strong>您的帳號已無法啟用.</strong> 請重新註冊."
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json b/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json
index a6d4bc73dd41..d241be5e9831 100644
--- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json
+++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json
@@ -9,9 +9,7 @@
                 "info": "輸入註冊電郵地址",
                 "success": "檢查您的電郵信箱，了解如何重設密碼。",
                 "notfound": "<strong>電郵地址未註冊!</strong> 請檢查並重試"
-
             }
-
         },
         "finish" : {
             "title": "重置密碼",
@@ -20,11 +18,14 @@
             },
             "messages": {
                 "info": "請設置新密碼",
+                <%_ if (angularVersion === 'angular1') { _%>
                 "success": "<strong>您的密碼已重置。</strong> 請 <a class=\"alert-link\" href=\"\" ng-click=\"vm.login()\">登入</a>。",
+                <%_ } else if (angularVersion === 'angular2') { _%>
+                "success": "<strong>您的密碼已重置。</strong> 請 ",
+                <%_ } _%>
                 "keymissing": "沒有輸入重置鑰匙",
                 "error": "重置密碼失敗。記住密碼要求只於24小時內有效。"
             }
         }
     }
-
 }

From 46c9d2980f3b4198d2eb910860cb3711b8199080 Mon Sep 17 00:00:00 2001
From: Matt Raible <matt@raibledesigns.com>
Date: Tue, 8 Nov 2016 17:12:41 -0700
Subject: [PATCH 18/20] Remove extra space

---
 .../client-2/templates/src/main/webapp/app/home/_home.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/home/_home.html b/generators/client-2/templates/src/main/webapp/app/home/_home.html
index 8120c7ee7f98..ffedc934521c 100644
--- a/generators/client-2/templates/src/main/webapp/app/home/_home.html
+++ b/generators/client-2/templates/src/main/webapp/app/home/_home.html
@@ -37,7 +37,7 @@ <h1 jhi-translate="home.title">Welcome, Java Hipster!</h1>
             </ul>
 
             <p>
-             <span jhi-translate="home.like">If you like JHipster, don't forget to give us a star on </span>&nbsp;<a href="https://github.com/jhipster/generator-jhipster" target="_blank" jhi-translate="home.github">Github</a>!
+             <span jhi-translate="home.like">If you like JHipster, don't forget to give us a star on</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" jhi-translate="home.github">Github</a>!
             </p>
         </div>
     </div>

From ae8d4ae01be411722ee941e7cc8e081a5688b81b Mon Sep 17 00:00:00 2001
From: 040796 <flavien.cathala@gmail.com>
Date: Wed, 9 Nov 2016 13:24:21 +0100
Subject: [PATCH 19/20] remove useless cookie service import

---
 .../templates/src/main/webapp/app/account/_account.ng2module.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts
index 3b269db33199..88eb768e3a77 100644
--- a/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/account/_account.ng2module.ts
@@ -1,6 +1,5 @@
 import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { UIRouterModule } from 'ui-router-ng2';
-import { CookieService } from 'angular2-cookie/services/cookies.service';
 
 import { <%=angular2AppName%>SharedModule } from '../shared';
 
@@ -81,7 +80,6 @@ let ACCOUNT_STATES = [
         SettingsComponent
     ],
     providers: [
-        CookieService,
         <%_ if (authenticationType === 'session') { _%>
         SessionsService,
         <%_ } _%>

From fe9d89627d959160f9e096cb975644d0743f492a Mon Sep 17 00:00:00 2001
From: David Steiman <d.steiman@stytex.de>
Date: Sun, 13 Nov 2016 19:41:31 +0100
Subject: [PATCH 20/20] added new auth expired interceptor

---
 .../src/main/webapp/app/_app.module.ts        |   2 -
 .../src/main/webapp/app/_app.ng2module.ts     |  32 ++++-
 .../webapp/app/blocks/config/_http.config.ts  |   1 -
 .../interceptor/_auth-expired.interceptor.ts  | 110 ++++++++++--------
 4 files changed, 90 insertions(+), 55 deletions(-)

diff --git a/generators/client-2/templates/src/main/webapp/app/_app.module.ts b/generators/client-2/templates/src/main/webapp/app/_app.module.ts
index 7d0bdf01daaf..be525f36483b 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.module.ts
@@ -20,7 +20,6 @@ import { PaginationConfig } from './blocks/config/uib-pagination.config';
 import { HomeComponent } from './home';
 import { <%=jhiPrefixCapitalized%>MainComponent, NavbarComponent, FooterComponent, PageRibbonComponent } from './layouts';
 
-import { AuthExpiredInterceptor } from './blocks/interceptor/auth-expired.interceptor';
 import { ErrorHandlerInterceptor } from './blocks/interceptor/errorhandler.interceptor';
 import { NotificationInterceptor } from './blocks/interceptor/notification.interceptor';
 
@@ -51,7 +50,6 @@ angular
     .directive('navbar', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(NavbarComponent))
     .directive('footer', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(FooterComponent))
     .directive('<%=jhiPrefix%>Main', <angular.IDirectiveFactory> upgradeAdapter.downgradeNg2Component(<%=jhiPrefixCapitalized%>MainComponent))
-    .factory('AuthExpiredInterceptor', AuthExpiredInterceptor)
     .factory('ErrorHandlerInterceptor', ErrorHandlerInterceptor)
     .factory('NotificationInterceptor', NotificationInterceptor)<% if (enableTranslation) { %>
     .factory('TranslationStorageProvider', TranslationStorageProvider)
diff --git a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
index 5ea289e7af68..589a7a8cdcea 100644
--- a/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
+++ b/generators/client-2/templates/src/main/webapp/app/_app.ng2module.ts
@@ -1,10 +1,14 @@
 <%_ if(authenticationType === 'uaa') { _%>
 import { AuthInterceptor } from './blocks/interceptor/auth.interceptor';
 <%_ } %>
-import { NgModule } from '@angular/core';
+import { NgModule, Injector } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { UIRouterModule, RootModule } from 'ui-router-ng2';
+<%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+import { Ng2Webstorage, LocalStorageService, SessionStorageService } from 'ng2-webstorage';
+<%_ } if(authenticationType === 'session') { _%>
 import { Ng2Webstorage } from 'ng2-webstorage';
+<% } %>
 
 import { <%=angular2AppName%>SharedModule } from './shared';
 import { <%=angular2AppName%>AdminModule } from './admin/admin.ng2module'; //TODO these couldnt be used from barrels due to an error
@@ -28,6 +32,13 @@ import {
 } from './layouts';
 import { localStorageConfig } from './blocks/config/localstorage.config';
 import { HttpInterceptor } from './blocks/interceptor/http.interceptor';
+import {AuthExpiredInterceptor} from "./blocks/interceptor/auth-expired.interceptor";
+<%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+import {Http, XHRBackend, RequestOptions} from "@angular/http";
+<%_ } if(authenticationType === 'session') { _%>
+import { StateStorageService } from "./shared/auth/state-storage.service";
+<% } %>
+
 
 
 localStorageConfig();
@@ -72,16 +83,22 @@ let routerConfig = {
             useFactory: (
                 backend: XHRBackend,
                 defaultOptions: RequestOptions,
-                <%_ if(authenticationType === 'uaa') { _%>
+                <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
                 localStorage : LocalStorageService,
-                sessionStorage : SessionStorageService
+                sessionStorage : SessionStorageService,
+                injector
+                <%_ } if (authenticationType === 'session') { _%>
+                injector
                 <%_ } _%>
             ) => new HttpInterceptor(
                 backend,
                 defaultOptions,
                 [
-                <%_ if(authenticationType === 'uaa') { _%>
-                    new AuthInterceptor(localStorage, sessionStorage)
+                <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+                    new AuthInterceptor(localStorage, sessionStorage),
+                    new AuthExpiredInterceptor(injector)
+                <%_ } if (authenticationType === 'session') { _%>
+                    new AuthExpiredInterceptor(injector, injector.get("$rootScope"), stateStorageService)
                 <%_ } _%>
                     //other intecetpors can be added here
                 ]
@@ -89,9 +106,12 @@ let routerConfig = {
             deps: [
                 XHRBackend,
                 RequestOptions,
-                <%_ if(authenticationType === 'uaa') { _%>
+                Injector,
+                <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
                 LocalStorageService,
                 SessionStorageService
+                <%_ } if (authenticationType === 'session') { _%>
+                StateStorageService
                 <%_ } _%>
             ]
         }
diff --git a/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts b/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts
index 9382f113cab3..ff5276f0dbfc 100644
--- a/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts
+++ b/generators/client-2/templates/src/main/webapp/app/blocks/config/_http.config.ts
@@ -5,7 +5,6 @@ export function HttpConfig($httpProvider, httpRequestInterceptorCacheBusterProvi
     httpRequestInterceptorCacheBusterProvider.setMatchlist([/.*api.*/, /.*protected.*/], true);
 
     $httpProvider.interceptors.push('ErrorHandlerInterceptor');
-    $httpProvider.interceptors.push('AuthExpiredInterceptor');
     $httpProvider.interceptors.push('NotificationInterceptor');
     // jhipster-needle-angularjs-add-interceptor JHipster will add new application http interceptor here
 }
diff --git a/generators/client-2/templates/src/main/webapp/app/blocks/interceptor/_auth-expired.interceptor.ts b/generators/client-2/templates/src/main/webapp/app/blocks/interceptor/_auth-expired.interceptor.ts
index b1afcbb07e70..1c62602fdaea 100644
--- a/generators/client-2/templates/src/main/webapp/app/blocks/interceptor/_auth-expired.interceptor.ts
+++ b/generators/client-2/templates/src/main/webapp/app/blocks/interceptor/_auth-expired.interceptor.ts
@@ -1,52 +1,70 @@
-import * as angular from 'angular';
+import {HttpInterceptable} from "./http.interceptable";
+import {RequestOptionsArgs, Response} from "@angular/http";
+import {Observable} from "rxjs/Observable";
+import {Injector} from "@angular/core";
+<%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+import {AuthService} from "../../shared/auth/auth.service";
+import {Principal} from "../../shared/auth/principal.service";
+<%_ } if (authenticationType === 'session') { _%>
+import {AuthServerProvider} from "../../shared/auth/auth-jwt.service";
+import {StateStorageService} from "../../shared/auth/state-storage.service";
+<% } %>
+
+
+export class AuthExpiredInterceptor extends HttpInterceptable {
+
+<%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+    constructor(private injector : Injector) {
+        super();
+    }
+<%_ } if (authenticationType === 'session') { _%>
+    constructor(private injector : Injector, private $rootScope, private stateStorageService : StateStorageService) {
+        super();
+    }
+<% } %>
+    requestIntercept(options?: RequestOptionsArgs): RequestOptionsArgs {
+        return options;
+    }
 
 <%_ if (authenticationType === 'oauth2' || authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
-AuthExpiredInterceptor.$inject = ['$rootScope', '$q', '$injector'/*, '$localStorage', '$sessionStorage'*/];
-
-export function AuthExpiredInterceptor($rootScope, $q, $injector/*, $localStorage, $sessionStorage*/) {
-    var service = {
-        responseError: responseError
-    };
-
-    return service;
-
-    function responseError(response) {
-        if (response.status === 401) {
-            //delete $localStorage.authenticationToken;
-            //delete $sessionStorage.authenticationToken;
-            var Principal = $injector.get('Principal');
-            if (Principal.isAuthenticated()) {
-                var Auth = $injector.get('Auth');
-                Auth.authorize(true);
+    responseIntercept(observable: Observable<Response>): Observable<Response> {
+        let self = this;
+
+        return <Observable<Response>> observable.catch((error, source) => {
+            if(error.status === 401) {
+                let principal : Principal = self.injector.get(Principal);
+
+                if(principal.isAuthenticated()) {
+                    let auth : AuthService = self.injector.get(AuthService);
+                    auth.authorize(true);
+                }
+
             }
-        }
-        return $q.reject(response);
+            return Observable.throw(error);
+        });
     }
-}
-<%_ } if (authenticationType === 'session') { _%> 
-AuthExpiredInterceptor.$inject = ['$rootScope', '$q', '$injector', '$document'];
-
-export function AuthExpiredInterceptor($rootScope, $q, $injector, $document) {
-    var service = {
-        responseError: responseError
-    };
-
-    return service;
-
-    function responseError(response) {
-        // If we have an unauthorized request we redirect to the login page
-        // Don't do this check on the account API to avoid infinite loop
-        if (response.status === 401 && angular.isDefined(response.data.path) && response.data.path.indexOf('/api/account') === -1) {
-            var Auth = $injector.get('Auth');
-            var to = $rootScope.toState;
-            var params = $rootScope.toStateParams;
-            Auth.logout();
-            if (to.name !== 'accessdenied') {
-                Auth.storePreviousState(to.name, params);
+
+<%_ } if (authenticationType === 'session') { _%>
+    responseIntercept(observable: Observable<Response>): Observable<Response> {
+        let self = this;
+
+        return <Observable<Response>> observable.catch((error) => {
+            //todo: this is ng1 way...the ng2 would be more like someRouterService.subscribe(url).forEach..... but I don't know how to do this bow
+            if(error.status === 401 && !!error.data.path && error.data.path.indexOf("/api/account") === -1) {
+                let authServerProvider = self.injector.get(AuthServerProvider);
+                let to = self.$rootScope.toState;
+                let toParams = self.$rootScope.toStateParams;
+                authServerProvider.logout();
+
+                if(to.name === 'accessdenied') {
+                    self.stateStorageService.storePreviousState(to.name, toParams);
+                }
+
+                return Observable.throw(error);
             }
-            //var LoginService = $injector.get('LoginService');
-            //LoginService.open();
-        }
-        return $q.reject(response);
+        });
     }
-}<% } %>
+<% } %>
+
+}
+