UUI interface Multi-language development

Change-Id: I14cac372a76127f33f85e2bb50be117dbcdabe7d
Issue-ID: USECASEUI-211
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

6 files changed, 68 insertions, 74 deletions

diff --git a/usecaseui-portal/src/app/app.component.html b/usecaseui-portal/src/app/app.component.html
index 22c22dc7..021cf263 100644
--- a/usecaseui-portal/src/app/app.component.html
+++ b/usecaseui-portal/src/app/app.component.html
@@ -47,7 +47,7 @@
         <span title><i class="anticon anticon-home"></i> {{"i18nTextDefine_Services" | translate}} </span>
         <ul>
           <li nz-menu-item><a routerLink='services/services-list'> {{"i18nTextDefine_ServicesList" | translate}} </a></li>
-          <li nz-menu-item><a routerLink='services/onboard-vnf-vm'> {{"i18nTextDefine_Onboard_VNF/VM" | translate}} </a></li>
+          <li nz-menu-item><a routerLink='services/onboard-vnf-vm'> {{"i18nTextDefine_PackageManagement" | translate}} </a></li>
         </ul>
       </li>
       <!-- <hr>
@@ -78,14 +78,14 @@
       </li>
     </ul>
 
-    <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomRight'">
-      <button nz-button nz-dropdown><span>{{selectLanguage | translate}}</span> <i class="anticon anticon-down"></i></button>
-      <ul nz-menu>
-        <li nz-menu-item (click)="changeLanguage(item)" *ngFor="let item of Language">
-          <a>{{item | translate}}</a>
-        </li>
-      </ul>
-    </nz-dropdown>
+    <!--<nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomRight'">-->
+      <!--<button nz-button nz-dropdown><span>{{selectLanguage | translate}}</span> <i class="anticon anticon-down"></i></button>-->
+      <!--<ul nz-menu>-->
+        <!--<li nz-menu-item (click)="changeLanguage(item)" *ngFor="let item of Language">-->
+          <!--<a>{{item | translate}}</a>-->
+        <!--</li>-->
+      <!--</ul>-->
+    <!--</nz-dropdown>-->
   </nz-sider>
   <nz-layout style="margin-left: 260px;  height:100vh; position:relative;">
       <router-outlet></router-outlet>
diff --git a/usecaseui-portal/src/app/app.component.ts b/usecaseui-portal/src/app/app.component.ts
index 1a7c48d8..dc8b03e9 100644
--- a/usecaseui-portal/src/app/app.component.ts
+++ b/usecaseui-portal/src/app/app.component.ts
@@ -28,22 +28,24 @@ export class AppComponent {
 
     constructor(private translate: TranslateService,private myhttp: HomesService) {
         this.currentLanguageGet();
-        translate.addLangs(['en', 'zh']);
+        // translate.addLangs(['en', 'zh']);
         // translate.use('en');
     }
 
   
-  Language:String[] = ["zh","en"];
+    // Language:String[] = ["zh","en"];
     //209.05.08 Get the currentLanguage
     currentloginId = null;
     currentLanguage = "en";
     currentLanguageGet() {
         this.currentloginId = sessionStorage.getItem("loginId") || null;
         if (this.currentloginId != null) {
+            console.log(this.currentloginId);
             this.myhttp.getCurrentLanguage(this.currentloginId)
                 .subscribe(
                     (data) => {
-                        this.currentLanguage = data.languageName.toLowerCase();
+                        console.log(data,"-------------getCurrentLanguage");
+                        this.currentLanguage = data.languageAlias.toLowerCase();
                         this.translate.use(this.currentLanguage);
                     },
                     (err) => {
@@ -51,14 +53,14 @@ export class AppComponent {
                     }
                 )
         }else {
-           this.translate.setDefaultLang('en');
+           this.translate.setDefaultLang(this.currentLanguage);
         }
     }
+    //
+    // selectLanguage = "en";
 
-    selectLanguage = "en";
-
-  changeLanguage(item){
-    this.selectLanguage = item;
-    this.translate.use(item);
-  }
+  // changeLanguage(item){
+  //   this.selectLanguage = item;
+  //   this.translate.use(item);
+  // }
 }
diff --git a/usecaseui-portal/src/app/home/home.component.html b/usecaseui-portal/src/app/home/home.component.html
index 6c79ce7b..34954314 100644
--- a/usecaseui-portal/src/app/home/home.component.html
+++ b/usecaseui-portal/src/app/home/home.component.html
@@ -24,7 +24,7 @@
       <p>{{serviceNumber}} {{"services has been created" | translate}}</p> -->
       <app-pie [initData]="serviceChartInit" [chartData]="serviceChartData"></app-pie>
       <div>
-        <h5><span>{{"i18nTextDefine_Total" | translate}}:</span> {{serviceNumber}} <span>{{"i18nTextDefine_cutomers_and" | translate}}</span> {{serviceNumber}} <span>{{"i18nTextDefine_service_intance" | translate}}</span></h5>
+        <h5><span>{{"i18nTextDefine_Total" | translate}}:</span> {{serviceNumber}} <span>{{"i18nTextDefine_cutomers_and" | translate}}</span> {{serviceNumber}} <span>{{"i18nTextDefine_service_instance" | translate}}</span></h5>
       </div>
       <p class="tip">
         <a href="#" style="color:#3C4F8C">{{"i18nTextDefine_ViewDetails" | translate}}</a>
diff --git a/usecaseui-portal/src/app/homes.service.ts b/usecaseui-portal/src/app/homes.service.ts
index 8c0ab162..a556a954 100644
--- a/usecaseui-portal/src/app/homes.service.ts
+++ b/usecaseui-portal/src/app/homes.service.ts
@@ -31,7 +31,7 @@ export class HomesService {
     home_servicebarData:this.baseUrl + "",	
     sourceNames: this.baseUrl + "/alarm/getSourceNames",
     listSortMasters:this.baseUrl+"/listSortMasters",
-    currentLanguage:this.baseUrl+"/auxapi/languageSetting/user/",
+    currentLanguage:this.baseUrl+"/ONAPPORTAL/auxapi/languageSetting/user/",
 
   }
 
diff --git a/usecaseui-portal/src/assets/i18n/en.json b/usecaseui-portal/src/assets/i18n/en.json
index f45e5e32..fe7d4fae 100644
--- a/usecaseui-portal/src/assets/i18n/en.json
+++ b/usecaseui-portal/src/assets/i18n/en.json
@@ -9,7 +9,7 @@
     "i18nTextDefine_Monitor":"Monitor",
     "i18nTextDefine_Services":"Services",
     "i18nTextDefine_ServicesList":"Services List",
-    "i18nTextDefine_Onboard_VNF/VM":"Onboard VNF/VM ",
+    "i18nTextDefine_PackageManagement":"Package Management",
     "i18nTextDefine_Alarm":"Alarm",
     "i18nTextDefine_Performance":"Performance",
     "i18nTextDefine_NetworkTopology":"Network Topology",
@@ -19,10 +19,9 @@
   "i18nTextDefine_PACKAGE":"PACKAGE",
   "i18nTextDefine_Total":"Total",
   "i18nTextDefine_cutomers_and":"cutomers and",
-  "i18nTextDefine_service_intance":"service intance",
+  "i18nTextDefine_service_instance":"Service instance",
   "i18nTextDefine_ViewDetails":"View Details",
   "i18nTextDefine_ALARM":"ALARM",
-  "i18nTextDefine_DEVICES":"DEVICES",
   "i18nTextDefine_VNF_Alarm":"VNF Alarm",
   "i18nTextDefine_VM_Alarm":"VM Alarm",
   "i18nTextDefine_VM_Performance":"VM PERFORMANCE",
@@ -56,15 +55,16 @@
   "i18nTextDefine_ScalingDirection":"Scaling Direction",
   "i18nTextDefine_delete":"Delete",
   "i18nTextDefine_SureDelete":"Are you sure delete this instance?",
-  "i18nTextDefine_terminationType":"terminationType",
+  "i18nTextDefine_terminationType":"Termination Type",
   "i18nTextDefine_graceful":"graceful",
   "i18nTextDefine_forceful":"forceful",
-  "i18nTextDefine_gracefulTerminationTimeout":"gracefulTerminationTimeout",
+  "i18nTextDefine_gracefulTerminationTimeout":"graceful Termination Timeout",
   "i18nTextDefine_Heal":"Heal",
   "i18nTextDefine_SureHeal":"Are you sure heal this instance?",
   "i18nTextDefine_degreeHealing":"degreeHealing",
+  "i18nTextDefine_actionsHealing":"actionsHealing",
   "i18nTextDefine_healScript":"healScript",
-  "i18nTextDefine_additionalParamsforNs":"additionalParamsforNs",
+  "i18nTextDefine_additionalParamsforNs":"additional Params for NS",
   "i18nTextDefine_cause":"cause",
   "i18nTextDefine_action":"action",
   "i18nTextDefine_actionvminfo":"actionvminfo",
@@ -73,12 +73,8 @@
   "i18nTextDefine_InstanceCreation":"Instance Creation",
   "i18nTextDefine_InstanceTopology":"Instance Topology",
   "i18nTextDefine_Add":"Add",
-  "i18nTextDefine_topology":"topology",
-  "i18nTextDefine_PostCode":"Post Code",
-  "i18nTextDefine_Address":"Address",
-  "i18nTextDefine_emails":"emails",
   "i18nTextDefine_Base":"Base",
-  "i18nTextDefine_templateInputs":"template Inputs",
+  "i18nTextDefine_templateInputs":"Template Inputs",
 
   "ccvpn-detail-component":"--:",
   "i18nTextDefine_InstanceDetail":"Instance Detail",
@@ -98,12 +94,12 @@
   "management-component":"--:",
   "i18nTextDefine_Create_initial_customer":"Create initial customer",
   "i18nTextDefine_Customer_not_in_ONAP":"Customer has not been created in ONAP",
-  "i18nTextDefine_createCustomer&serviceType":"please create customer and its service type",
-  "i18nTextDefine_input_customerName":"input customer name",
+  "i18nTextDefine_createCustomer":"Please create customer and its service type",
+  "i18nTextDefine_Input_customerName":"Input customer name",
 
   "customer-component":"--:",
   "i18nTextDefine_Instance_Count_of_Customer":"Instance Count of Customer",
-  "i18nTextDefine_users":"users",
+  "i18nTextDefine_users":"Users",
   "i18nTextDefine_Instance_Count_of_ServiceType":"Instance Count of Service Type",
   "i18nTextDefine_Input_ServicesType":"Input services type",
   "i18nTextDefine_Input_Sure_deleteCustomer":"Are you sure delete this Customer ?",
@@ -122,5 +118,5 @@
   "i18nTextDefine_RightPort":"Right Port",
   "i18nTextDefine_PartnerNetwork":"Partner Network",
   "i18nTextDefine_HostUrl":"Host Url",
-  "i18nTextDefine_deleteLink":"delete Link"
+  "i18nTextDefine_DeleteLink":"Delete Link"
 }
\ No newline at end of file
diff --git a/usecaseui-portal/src/assets/i18n/zh.json b/usecaseui-portal/src/assets/i18n/zh.json
index 168ef95b..78b18f0d 100644
--- a/usecaseui-portal/src/assets/i18n/zh.json
+++ b/usecaseui-portal/src/assets/i18n/zh.json
@@ -9,7 +9,7 @@
   "i18nTextDefine_Monitor":"监控",
   "i18nTextDefine_Services":"服务",
   "i18nTextDefine_ServicesList":"服务列表",
-  "i18nTextDefine_Onboard_VNF/VM":"分发 VNF/VM ",
+  "i18nTextDefine_PackageManagement":"包管理",
   "i18nTextDefine_Alarm":"告警",
   "i18nTextDefine_Performance":"性能",
   "i18nTextDefine_NetworkTopology":"网络拓扑",
@@ -18,14 +18,13 @@
   "i18nTextDefine_SERVICES":"服务",
   "i18nTextDefine_PACKAGE":"包",
   "i18nTextDefine_Total":"总数",
-  "i18nTextDefine_cutomers_and":"用户 和 ",
-  "i18nTextDefine_service_intance":"服务实例",
+  "i18nTextDefine_cutomers_and":"用户和",
+  "i18nTextDefine_service_instance":"服务实例",
   "i18nTextDefine_ViewDetails":"查看详情",
   "i18nTextDefine_ALARM":"告警",
-  "i18nTextDefine_DEVICES":"设备",
-  "i18nTextDefine_VNF_Alarm":"VNF 告警",
-  "i18nTextDefine_VM_Alarm":"VM 告警",
-  "i18nTextDefine_VM_Performance":"VM 性能",
+  "i18nTextDefine_VNF_Alarm":"VNF告警",
+  "i18nTextDefine_VM_Alarm":"VM告警",
+  "i18nTextDefine_VM_Performance":"VM性能",
 
   "services-list-component":"--:",
   "i18nTextDefine_ServiceType":"服务类型",
@@ -33,21 +32,21 @@
   "i18nTextDefine_Failed":"失败",
   "i18nTextDefine_Success":"成功",
   "i18nTextDefine_InProgress":"执行中",
-  "i18nTextDefine_End_To_End_Service":"End To End 服务",
-  "i18nTextDefine_Network_Service":"Network 服务",
-  "i18nTextDefine_Cross_Domain_and_Cross_Layer_VPN":"跨域和跨层VPN",
+  "i18nTextDefine_End_To_End_Service":"端到端服务",
+  "i18nTextDefine_Network_Service":"NS服务",
+  "i18nTextDefine_Cross_Domain_and_Cross_Layer_VPN":"CCVPN服务",
   "i18nTextDefine_NO":"序号",
   "i18nTextDefine_Name":"名称",
   "i18nTextDefine_Description":"描述",
-  "i18nTextDefine_UseCase":"使用实例",
+  "i18nTextDefine_UseCase":"场景用例",
   "i18nTextDefine_Status":"状态",
-  "i18nTextDefine_Action":"功能",
+  "i18nTextDefine_Action":"动作",
   "i18nTextDefine_Template":"模板",
   "i18nTextDefine_ServiceCreation":"服务创建",
   "i18nTextDefine_Cancel":"取消",
   "i18nTextDefine_modelOk":"确认",
   "i18nTextDefine_Scale":"缩扩容",
-  "i18nTextDefine_SureScale":"您确定缩放此实例吗？",
+  "i18nTextDefine_SureScale":"您确定缩扩容此实例吗？",
   "i18nTextDefine_InstanceName":"实例名称",
   "i18nTextDefine_InstanceID":"实例ID",
   "i18nTextDefine_ScaleType":"缩扩容类型",
@@ -55,28 +54,25 @@
   "i18nTextDefine_Number_Of_Steps":"级数",
   "i18nTextDefine_ScalingDirection":"缩扩容方向",
   "i18nTextDefine_delete":"删除",
-  "i18nTextDefine_SureDelete":"你确定删除此实例吗？",
+  "i18nTextDefine_SureDelete":"您确定删除此实例吗？",
   "i18nTextDefine_terminationType":"终止类型",
-  "i18nTextDefine_graceful":"舒缓",
-  "i18nTextDefine_forceful":"强力",
-  "i18nTextDefine_gracefulTerminationTimeout":"舒缓终止超时时间",
+  "i18nTextDefine_graceful":"优雅",
+  "i18nTextDefine_forceful":"强制",
+  "i18nTextDefine_gracefulTerminationTimeout":"优雅终止超时时间",
   "i18nTextDefine_Heal":"自愈",
-  "i18nTextDefine_SureHeal":"你确定自愈此实例吗？",
+  "i18nTextDefine_SureHeal":"您确定自愈此实例吗？",
   "i18nTextDefine_degreeHealing":"自愈程度",
+  "i18nTextDefine_actionsHealing":"自愈行为",
   "i18nTextDefine_healScript":"自愈脚本",
-  "i18nTextDefine_additionalParamsforNs":"为NS添加参数",
+  "i18nTextDefine_additionalParamsforNs":"NS附加参数",
   "i18nTextDefine_cause":"原因",
-  "i18nTextDefine_action":"功能",
+  "i18nTextDefine_action":"动作",
   "i18nTextDefine_actionvminfo":"操作虚拟机信息",
 
   "ccvpn-creation-component":"--:",
   "i18nTextDefine_InstanceCreation":"实例创建",
   "i18nTextDefine_InstanceTopology":"实例拓扑",
   "i18nTextDefine_Add":"新增",
-  "i18nTextDefine_topology":"拓扑",
-  "i18nTextDefine_PostCode":"邮编",
-  "i18nTextDefine_Address":"地址",
-  "i18nTextDefine_emails":"邮箱",
   "i18nTextDefine_Base":"基本信息",
   "i18nTextDefine_templateInputs":"模板输入",
 
@@ -84,30 +80,30 @@
   "i18nTextDefine_InstanceDetail":"实例详情",
 
   "onboard-vnf-vm-component":"--:",
-  "i18nTextDefine_Click_CSAR_File":"单击或拖动CSAR文件",
-  "i18nTextDefine_Uploaded_files":"上传的文件",
+  "i18nTextDefine_Click_CSAR_File":"单击此处或拖入CSAR文件",
+  "i18nTextDefine_Uploaded_files":"已上传文件",
   "i18nTextDefine_Uploading":"上传中",
   "i18nTextDefine_StartUpload":"开始上传",
-  "i18nTextDefine_File_upload_completed":"文件上传完成",
+  "i18nTextDefine_File_upload_completed":"文件上传完毕",
   "i18nTextDefine_Version":"版本",
   "i18nTextDefine_OnboardingState":"分发状态",
-  "i18nTextDefine_OperationalState":"运行状态",
+  "i18nTextDefine_OperationalState":"操作状态",
   "i18nTextDefine_UsageState":"使用状态",
   "i18nTextDefine_Operationbutton":"操作按钮",
 
   "management-component":"--:",
   "i18nTextDefine_Create_initial_customer":"创建初始用户",
-  "i18nTextDefine_Customer_not_in_ONAP":"尚未在ONAP中创建用户",
+  "i18nTextDefine_Customer_not_in_ONAP":"ONAP尚未存在已创建用户",
   "i18nTextDefine_createCustomer&serviceType":"请创建用户及其服务类型",
   "i18nTextDefine_input_customerName":"输入用户名称",
 
   "customer-component":"--:",
   "i18nTextDefine_Instance_Count_of_Customer":"用户实例计数",
   "i18nTextDefine_users":"用户",
-  "i18nTextDefine_Instance_Count_of_ServiceType":"服务类型计数",
+  "i18nTextDefine_Instance_Count_of_ServiceType":"服务类型实例计数",
   "i18nTextDefine_Input_ServicesType":"输入服务类型",
-  "i18nTextDefine_Input_Sure_deleteCustomer":"你确定删除此用户吗？",
-  "i18nTextDefine_Input_Sure_deleteServiceType":"你确定删除此服务类型吗？",
+  "i18nTextDefine_Input_Sure_deleteCustomer":"您确定删除此用户吗？",
+  "i18nTextDefine_Input_Sure_deleteServiceType":"您确定删除此服务类型吗？",
   "i18nTextDefine_CustomerName":"用户名称",
   "i18nTextDefine_CustomerID":"用户ID",
 
@@ -115,12 +111,12 @@
   "i18nTextDefine_AddLink":"添加链接",
   "i18nTextDefine_SetAttribtes":"设置属性",
   "i18nTextDefine_LinkName":"链接名称",
-  "i18nTextDefine_LeftPort":"左侧部分",
-  "i18nTextDefine_Network":"网云",
-  "i18nTextDefine_Node":"子节点",
-  "i18nTextDefine_TerminalPoint":"终端节点",
-  "i18nTextDefine_RightPort":"右侧部分",
-  "i18nTextDefine_PartnerNetwork":"合作方网云",
+  "i18nTextDefine_LeftPort":"左侧端口",
+  "i18nTextDefine_Network":"网络",
+  "i18nTextDefine_Node":"节点",
+  "i18nTextDefine_TerminalPoint":"终端",
+  "i18nTextDefine_RightPort":"右侧端口",
+  "i18nTextDefine_PartnerNetwork":"伙伴网络",
   "i18nTextDefine_HostUrl":"主机网址",
   "i18nTextDefine_deleteLink":"删除链接"
 }
\ No newline at end of file