Merge branch 'master' into issue-68

Author: alirizaadiyahsi

angular/package-lock.json

@@ -31,7 +31,7 @@
     "@types/moment": "^2.13.0",
     "@types/moment-timezone": "^0.2.34",
     "@types/toastr": "^2.1.33",
-    "abp-ng2-module": "^3.2.1",
+    "abp-ng2-module": "^3.2.2",
     "abp-web-resources": "^3.8.2",
     "animate.css": "^3.5.2",
     "block-ui": "^2.70.1",

angular/package.json

@@ -26,7 +26,8 @@ export class AppPreBootstrap {
         }).done(result => {
             AppConsts.appBaseUrl = result.appBaseUrl;
             AppConsts.remoteServiceBaseUrl = result.remoteServiceBaseUrl;
-            
+            AppConsts.localeMappings = result.localeMappings;
+
             callback();
         });
     }

angular/src/AppPreBootstrap.ts

@@ -45,7 +45,7 @@ <h2>
                 </table>
 
                 <div class="text-align: center;" *ngIf="totalItems > pageSize">
-                    <pagination-controls (pageChange)="getDataPage($event)" id="server"></pagination-controls>
+                    <abp-pagination-controls (pageChange)="getDataPage($event)" id="server"></abp-pagination-controls>
                 </div>
                 <button type="button" data-toggle="modal" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" (click)="createRole()">
                     <i class="material-icons">add</i>
@@ -56,4 +56,4 @@ <h2>
 </div>
 
 <create-role-modal #createRoleModal (modalSave)="refresh()"></create-role-modal>
-<edit-role-modal #editRoleModal (modalSave)="refresh()"></edit-role-modal>
+<edit-role-modal #editRoleModal (modalSave)="refresh()"></edit-role-modal>

angular/src/app/roles/roles.component.html

@@ -52,7 +52,7 @@ <h2>
                 </table>
 
                 <div class="text-align: center;" *ngIf="totalItems > pageSize">
-                    <pagination-controls (pageChange)="getDataPage($event)" id="server"></pagination-controls>
+                    <abp-pagination-controls (pageChange)="getDataPage($event)" id="server"></abp-pagination-controls>
                 </div>
                 <button type="button" data-toggle="modal" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" (click)="createTenant()">
                     <i class="material-icons">add</i>

angular/src/app/tenants/tenants.component.html

@@ -99,4 +99,4 @@ <h4 class="modal-title">
             </form>
         </div>
     </div>
-</div>
+</div>

angular/src/app/users/edit-user/edit-user.component.html

@@ -56,7 +56,7 @@ <h2>
             <!-- ******************************************************** -->
 
                 <div class="text-align: center;" *ngIf="totalItems > pageSize">
-                    <pagination-controls (pageChange)="getDataPage($event)" id="server"></pagination-controls>
+                    <abp-pagination-controls (pageChange)="getDataPage($event)" id="server"></abp-pagination-controls>
                 </div>
                 <button type="button" data-toggle="modal" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" (click)="createUser()">
                     <i class="material-icons">add</i>
@@ -67,4 +67,4 @@ <h2>
 </div>
 
 <create-user-modal #createUserModal (modalSave)="refresh()"></create-user-modal>
-<edit-user-modal #editUserModal (modalSave)="refresh()"></edit-user-modal>
+<edit-user-modal #editUserModal (modalSave)="refresh()"></edit-user-modal>

angular/src/app/users/users.component.html

@@ -1,4 +1,18 @@
 {
   "remoteServiceBaseUrl": "http://localhost:21021",
-  "appBaseUrl": "http://localhost:4200"
-}
+  "appBaseUrl": "http://localhost:4200",
+  "localeMappings": [
+    {
+      "from": "pt-BR",
+      "to": "pt"
+    },
+    {
+      "from": "zh-CN",
+      "to": "zh"
+    },
+    {
+      "from": "he-IL",
+      "to": "he"
+    }
+  ]
+}

angular/src/assets/appconfig.json

@@ -1,7 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule, Injector, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
-import { PlatformLocation } from '@angular/common';
+import { PlatformLocation, registerLocaleData } from '@angular/common';
 
 import { AbpModule } from '@abp/abp.module';
 import { AbpHttpInterceptor } from '@abp/abpHttpInterceptor';
@@ -20,6 +20,8 @@ import { AppPreBootstrap } from './AppPreBootstrap';
 import { ModalModule } from 'ngx-bootstrap';
 import { HttpClientModule } from '@angular/common/http';
 
+import * as _ from 'lodash';
+
 export function appInitializerFactory(injector: Injector,
     platformLocation: PlatformLocation) {
     return () => {
@@ -35,7 +37,17 @@ export function appInitializerFactory(injector: Injector,
                 appSessionService.init().then(
                     (result) => {
                         abp.ui.clearBusy();
-                        resolve(result);
+
+                        if (shouldLoadLocale()) {
+                            let angularLocale = convertAbpLocaleToAngularLocale(abp.localization.currentLanguage.name);
+                            import(`@angular/common/locales/${angularLocale}.js`)
+                                .then(module => {
+                                    registerLocaleData(module.default);
+                                    resolve(result);
+                                }, reject);
+                        } else {
+                            resolve(result);
+                        }
                     },
                     (err) => {
                         abp.ui.clearBusy();
@@ -47,6 +59,23 @@ export function appInitializerFactory(injector: Injector,
     }
 }
 
+export function convertAbpLocaleToAngularLocale(locale: string): string {
+    if (!AppConsts.localeMappings) {
+        return locale;
+    }
+
+    let localeMapings = _.filter(AppConsts.localeMappings, { from: locale });
+    if (localeMapings && localeMapings.length) {
+        return localeMapings[0]['to'];
+    }
+
+    return locale;
+}
+
+export function shouldLoadLocale(): boolean {
+    return abp.localization.currentLanguage.name && abp.localization.currentLanguage.name !== 'en-US';
+}
+
 export function getRemoteServiceBaseUrl(): string {
     return AppConsts.remoteServiceBaseUrl;
 }

angular/src/root.module.ts

@@ -4,6 +4,8 @@ export class AppConsts {
     static appBaseUrl: string;
     static appBaseHref: string; // returns angular's base-href parameter value if used during the publish
 
+    static localeMappings: any = [];
+
     static readonly userManagement = {
         defaultAdminUserName: 'admin'
     };