Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-core/src/main/java/com/java110/core/language/En.java

@@ -79,60 +79,60 @@ public class En extends DefaultLanguage{
         menuCatalogs.put("设置","Set up");
 
         menus.put("小区管理","Community");
-        menus.put("我的小区","My neighborhood");
-        menus.put("小区大屏","Community large screen");
+        menus.put("我的小区","My community");
+        menus.put("小区大屏","Community statistics");
         menus.put("业务受理","Business acceptance");
         menus.put("房屋装修","House renovation");
-        menus.put("结构图","Structure diagram");
-        menus.put("车位结构图","Parking space structure");
+        menus.put("结构图","Room structure");
+        menus.put("车位结构图","Parking structure");
         menus.put("产权登记","Property registration");
-        menus.put("视频监控","Video Surveillance");
+        menus.put("视频监控","Video");
         menus.put("资产管理","Asset");
-        menus.put("楼栋信息","Building");
+        menus.put("楼栋信息","Floor");
         menus.put("单元信息","Unit");
-        menus.put("房屋管理","Housing");
+        menus.put("房屋管理","Room");
         menus.put("商铺管理","Shop");
         menus.put("业主管理","Owner");
         menus.put("业主信息","Owner");
         menus.put("业主成员","Owner members");
         menus.put("绑定业主","Bind the owner");
         menus.put("业主账号","Owner account");
-        menus.put("费用管理","Expense");
-        menus.put("费用项设置","Expense item settings");
-        menus.put("房屋收费","Housing charges");
-        menus.put("车辆收费","Vehicle charges");
+        menus.put("费用管理","Fee");
+        menus.put("费用项设置","Fee settings");
+        menus.put("房屋收费","Room charges");
+        menus.put("车辆收费","Car charges");
         menus.put("合同收费","Contract charges");
-        menus.put("账单催缴","Bill payment");
-        menus.put("费用导入","Cost import");
+        menus.put("账单催缴","Bill fee");
+        menus.put("费用导入","Fee import");
         menus.put("员工收费","Staff charges");
         menus.put("费用汇总表","Summary of Fees");
-        menus.put("退费审核","Refund review");
-        menus.put("欠费信息","Arrears");
+        menus.put("退费审核","Refund audit");
+        menus.put("欠费信息","Owe fee");
         menus.put("抄表类型","Meter reading type");
         menus.put("水电抄表","Water and electricity meter");
-        menus.put("补打收据","Make-up receipt");
-        menus.put("公摊公式","Public share formula");
+        menus.put("补打收据","Reprint receipt");
+        menus.put("公摊公式","Public area formula");
         menus.put("缴费审核","Payment audit");
         menus.put("折扣设置","Discount settings");
-        menus.put("优惠申请","Concession application");
-        menus.put("优惠类型","Offer type");
+        menus.put("优惠申请","Discount apply");
+        menus.put("优惠类型","Discount type");
         menus.put("临时车收费","Temporary car charges");
-        menus.put("临时车缴费清单","Temporary car payment checklist");
-        menus.put("取消费用","Cancellation fee");
-        menus.put("智慧停车","Smart parking");
-        menus.put("停车场管理","Parking lot");
-        menus.put("车位信息","Parking");
+        menus.put("临时车缴费清单","Temporary car fee");
+        menus.put("取消费用","Cancel fee");
+        menus.put("智慧停车","Parking");
+        menus.put("停车场管理","Parking area");
+        menus.put("车位信息","Parking space");
         menus.put("岗亭管理","Booth");
-        menus.put("业主车辆","Owner vehicle");
-        menus.put("进场记录","Approach record");
-        menus.put("在场车辆","Vehicles present");
+        menus.put("业主车辆","Owner car");
+        menus.put("进场记录","inout record");
+        menus.put("在场车辆","car present");
         menus.put("黑白名单","Black and white list");
         menus.put("剩余车位","Remaining parking spaces");
-        menus.put("车位申请","Application for parking space");
+        menus.put("车位申请","apply parking space");
         menus.put("报修管理","Repair");
         menus.put("报修设置","Repair settings");
         menus.put("电话报修","Telephone repair");
-        menus.put("工单池","Ticket pool");
+        menus.put("工单池","Repair pool");
         menus.put("报修待办","Repair pending");
         menus.put("报修已办","Repair has been done");
         menus.put("报修回访","Repair visit");
@@ -144,10 +144,10 @@ public class En extends DefaultLanguage{
         menus.put("合同管理","Contract");
         menus.put("合同类型","Type of contract");
         menus.put("合同甲方","Party A");
-        menus.put("起草合同","Drafting contracts");
-        menus.put("合同查询","Contract query");
-        menus.put("合同变更","Contract changes");
-        menus.put("到期合同","Expired contract");
+        menus.put("起草合同","Create contracts");
+        menus.put("合同查询","Query contract");
+        menus.put("合同变更","Changes contract ");
+        menus.put("到期合同","Contract expired ");
         menus.put("报表管理","Report");
         menus.put("报表专家","Report Specialist");
         menus.put("楼栋费用表","Building fee schedule");

java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java

@@ -152,6 +152,7 @@ public class CommonConstant {
 
     public final static String INSTANCE_N = "N";
 
+    public static final String LANG_ZH_CN = "zh-cn";
     public static final String JAVA110_LANG = "java110-lang";
     public static final String APP_ID = "app-id";
     public static final String TRANSACTION_ID = "transaction-id";

service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java

@@ -92,7 +92,7 @@ public class ListCatalogCmd extends AbstractServiceCmdListener {
         }
 
         String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
-        if (!StringUtil.isEmpty(lang)) {
+        if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
             Language language = ApplicationContextFactory.getBean(lang, Language.class);
             if (language != null) {
                 menuCatalogDtos = language.getMenuCatalog(menuCatalogDtos);

service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java

@@ -94,7 +94,7 @@ public class ListCatalogMenusCmd extends AbstractServiceCmdListener {
 
         List<Map> menus = menuCatalogV1InnerServiceSMOImpl.queryMenus(menuCatalogDto);
         String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
-        if (!StringUtil.isEmpty(lang)) {
+        if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
             Language language = ApplicationContextFactory.getBean(lang, Language.class);
             if (language != null) {
                 menus = language.getMenuDto(menus);