From 6a54f2ec58d0ca1ba6d7c44f97d5c384a84c7b5b Mon Sep 17 00:00:00 2001
From: Zhou Shuqi <366469786@qq.com>
Date: Wed, 29 Apr 2020 12:22:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8B=B1=E6=96=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/i18n/en-US.json | 88 +++++++++++++++++++-------------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/assets/i18n/en-US.json b/src/assets/i18n/en-US.json
index c4a5cd3..47fe30e 100644
--- a/src/assets/i18n/en-US.json
+++ b/src/assets/i18n/en-US.json
@@ -1,40 +1,40 @@
{
"APP_TITLE": "PocketCommunityAdmin",
"language": "language",
- "chinese": "chinese",
- "english": "english",
+ "chinese": "Chinese",
+ "english": "English",
"login": {
- "manager_name": "manager name",
- "password": "password"
+ "manager_name": "Manager Name",
+ "password": "Password"
},
"register": {
- "confirm_pwd": "confrim password",
- "mobile": "mobile",
- "email": "email",
- "emailType": "email type"
+ "confirm_pwd": "Confrim Password",
+ "mobile": "Mobile",
+ "email": "Email",
+ "emailType": "Email Type"
},
"reset_pwd": {
- "code": "verification code",
- "new_pwd": "password",
- "confirm_pwd": "confirm password"
+ "code": "Verification Code",
+ "new_pwd": "Password",
+ "confirm_pwd": "Confirm Password"
},
"forum": {
- "name": "forum",
- "notice": "notice",
- "check": "check",
- "sender": "sender",
- "time": "time",
+ "name": "Forum",
+ "notice": "NOTICE",
+ "check": "CHECK",
+ "sender": "Sender",
+ "time": "Time",
"active_date": "Active Date：From {{startDate}} To {{endDate}}",
"active_score": "Active Score：{{score}}",
- "approve": "approve",
- "reject": "reject",
- "complaint": "time：{{time}}",
- "plaintiff": "plaintiff",
- "defendant": "defendant",
- "notice_title": "notice title",
- "notice_content": "notice content",
+ "approve": "Approve",
+ "reject": "Reject",
+ "complaint": "Time：{{time}}",
+ "plaintiff": "Plaintiff",
+ "defendant": "Defendant",
+ "notice_title": "Notice Title",
+ "notice_content": "Notice Content",
"deadline": "Deadline：{{endDate}}",
- "add_more_notice": "添加更多公告"
+ "add_more_notice": "ADD MORE ANNOUNCEMENTS"
},
"visitor": {
"name": "Visitor Appointment Management",
@@ -50,33 +50,33 @@
"status": "Status"
},
"tip": {
- "input": "please input {{value}}",
+ "input": "Please input {{value}}",
"HELLO": "Hello {{value}} welcome to you",
"notnull": "The {{value}} cannot be empty",
"password_diff": "The passwords do not match",
"mobile_error": "The phone number is illegal",
- "select": "please choose an {{value}}"
+ "select": "Please choose an {{value}}"
},
"button": {
- "login": "login",
- "register": "register",
- "forget_pwd": "forget password?",
- "backLogin": "back",
- "send_code": "send verification code",
- "reset_pwd": "reset password",
- "logout": "logout",
- "next": "next",
- "prev": "prev",
+ "login": "Login",
+ "register": "Register",
+ "forget_pwd": "Forget Password?",
+ "backLogin": "Back",
+ "send_code": "Send Verification Code",
+ "reset_pwd": "Reset Password",
+ "logout": "Logout",
+ "next": "Next",
+ "prev": "Prev",
"next_page": "Next",
"prev_page": "Previous",
- "first_page": "first page",
- "last_page": "last page",
- "check_code": "check_code",
- "notice": "submit",
- "back": "back",
- "search": "search",
- "jump": "jump",
- "submit": "submit",
+ "first_page": "First page",
+ "last_page": "Last page",
+ "check_code": "Check_code",
+ "notice": "Submit",
+ "back": "Back",
+ "search": "Search",
+ "jump": "Jump",
+ "submit": "Submit",
"total_page": "Total pages：{{totalPage}},Total records：{{count}}"
},
"score": {
@@ -115,7 +115,7 @@
"mobie": "Phone numbers cannot be empty",
"email": "Email cannot be empty",
"username": "User already exists",
- "ok": "register succeeded"
+ "ok": "Register succeeded"
},
"logout": {
"ok": "Logout successful",
From ccb72e9512c07e07ccf04e41db504459f5873f3b Mon Sep 17 00:00:00 2001
From: ZHD <123456>
Date: Fri, 1 May 2020 19:25:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=B8=96=E5=AD=90?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E5=AE=8C=E6=95=B4=E6=AD=A3?=
=?UTF-8?q?=E6=96=87=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/forum/forum/forum.component.html | 8 ++++----
src/app/forum/forum/forum.component.ts | 6 +++++-
src/app/interface/ForumType.ts | 6 ++++++
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/app/forum/forum/forum.component.html b/src/app/forum/forum/forum.component.html
index 3acc993..3823959 100644
--- a/src/app/forum/forum/forum.component.html
+++ b/src/app/forum/forum/forum.component.html
@@ -136,7 +136,7 @@
{{getForum().title}}
- {{getForum().content}}
+ {{getContent().content}}
@@ -246,7 +246,7 @@
{{getForum().title}}
- {{getForum().content}}
+ {{getContent().content}}
diff --git a/src/app/forum/forum/forum.component.ts b/src/app/forum/forum/forum.component.ts
index 29266bd..a46ceb1 100644
--- a/src/app/forum/forum/forum.component.ts
+++ b/src/app/forum/forum/forum.component.ts
@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
import {Router} from '@angular/router';
import {ForumService} from '../forum.service';
import {Result} from '../../interface/Result';
-import {Active, Complaint, Forum, Score} from '../../interface/ForumType';
+import {Active, Complaint, Forum, ForumContent, Score} from '../../interface/ForumType';
import {Notice} from '../../interface/Notice';
import {MessageInterface, MessageUtil} from '../../message/message.service';
import {NoticeService} from '../notice/notice.service';
@@ -68,6 +68,10 @@ export class ForumComponent implements OnInit, MessageInterface {
return this.posts.forumList.list[this.currentIndex];
}
+ getContent(): ForumContent {
+ return this.getForum().detailContent;
+}
+
getActive(): Active {
return this.getForum().activeDto;
}
diff --git a/src/app/interface/ForumType.ts b/src/app/interface/ForumType.ts
index 16bb1c7..f59dd93 100644
--- a/src/app/interface/ForumType.ts
+++ b/src/app/interface/ForumType.ts
@@ -12,6 +12,10 @@ export enum ForumStatus {
ok = 'ok',
fail = 'fail'
}
+export interface ForumContent {
+ // 正文
+ content: string;
+}
export interface Forum {
// 帖子
@@ -36,6 +40,8 @@ export interface Forum {
score: Score;
// 发帖人详情信息
info: Info;
+ // 1楼信息
+ detailContent: ForumContent;
}