Переглянути джерело

中文的一些国际化修改 -2

liukai 4 днів тому
батько
коміт
4447bad880

+ 6 - 2
packages/cpt_main/lib/modules/home/home_page.dart

@@ -126,7 +126,8 @@ class HomePage extends HookConsumerWidget {
                             visible: notificationCount != null && notificationCount != "0",
                             child: Transform.translate(
                               offset: const Offset(-10, -5),
-                              child: MyTextView(notificationCount ?? "0",
+                              child: MyTextView(
+                                notificationCount ?? "0",
                                 boxWidth: 20.0,
                                 textColor: Colors.white,
                                 fontSize: 10,
@@ -524,7 +525,10 @@ class HomePage extends HookConsumerWidget {
       clipBehavior: Clip.none,
       child: Row(
         children: propertyNews.map((news) {
-          return PropertyNews(news: news); // 假设 PropertyNews 需要传入一个 news 参数
+          return PropertyNews(news: news).onTap(() {
+            //路由跳转到Property模块的新闻详情页面
+            ComponentServiceManager().propertyService.startPropertyNewsDetailPage(int.parse(news.id ?? "0"));
+          }); // 假设 PropertyNews 需要传入一个 news 参数
         }).toList(),
       ).marginOnly(left: 15, right: 15),
     );

+ 1 - 1
packages/cpt_notice_board/lib/modules/announcement_detail/page/announcement_detail_page.dart

@@ -173,7 +173,7 @@ class AnnouncementDetailPage extends HookConsumerWidget {
     return Scaffold(
       appBar: MyAppBar.appBar(
         context,
-        "Lift Padding",
+        "Announcement",
         backgroundColor: context.appColors.backgroundWhite,
       ),
       body: LoadStateLayout(

+ 1 - 1
packages/cpt_notice_board/lib/modules/event_detail/page/event_detail_page.dart

@@ -130,7 +130,7 @@ class EventDetailPage extends HookConsumerWidget {
     return Scaffold(
       appBar: MyAppBar.appBar(
         context,
-        "Lift Padding",
+        "Announcement",
         backgroundColor: context.appColors.backgroundWhite,
       ),
       body: LoadStateLayout(

+ 5 - 2
packages/cpt_profile/lib/modules/my_estate/item_estate.dart

@@ -90,7 +90,6 @@ class EstateItem extends StatelessWidget {
                     textColor: context.appColors.textPrimary,
                   ).expanded(),
                 ],
-
               )
             ],
           ),
@@ -104,7 +103,11 @@ class EstateItem extends StatelessWidget {
           ),
         ).marginOnly(top: childIndex == 0 ? 0 : 10).alignRight(),
         MyTextView(
-          S.current.approved,
+          item.status == '2'
+              ? S.current.approved
+              : item.status == '3'
+                  ? S.current.rejected
+                  : S.current.pending,
           fontSize: 16,
           isFontMedium: true,
           textColor: context.appColors.textGreen,

+ 1 - 0
packages/cs_resources/lib/generated/intl/messages_en.dart

@@ -581,6 +581,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "payment_successful": MessageLookupByLibrary.simpleMessage(
       "Payment Successful",
     ),
+    "pending": MessageLookupByLibrary.simpleMessage("Pending"),
     "per_month": MessageLookupByLibrary.simpleMessage("per month"),
     "person_in_charge": MessageLookupByLibrary.simpleMessage(
       "PERSON IN CHARGE",

+ 1 - 0
packages/cs_resources/lib/generated/intl/messages_zh_CN.dart

@@ -404,6 +404,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "payment": MessageLookupByLibrary.simpleMessage("支付"),
     "payment_details": MessageLookupByLibrary.simpleMessage("支付详情"),
     "payment_successful": MessageLookupByLibrary.simpleMessage("付款成功"),
+    "pending": MessageLookupByLibrary.simpleMessage("等待处理"),
     "per_month": MessageLookupByLibrary.simpleMessage("每月"),
     "person_in_charge": MessageLookupByLibrary.simpleMessage("负责人"),
     "pet_pavilion": MessageLookupByLibrary.simpleMessage("宠物亭"),

+ 1 - 0
packages/cs_resources/lib/generated/intl/messages_zh_HK.dart

@@ -395,6 +395,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "payment": MessageLookupByLibrary.simpleMessage("支付"),
     "payment_details": MessageLookupByLibrary.simpleMessage("支付详情"),
     "payment_successful": MessageLookupByLibrary.simpleMessage("付款成功"),
+    "pending": MessageLookupByLibrary.simpleMessage("等待处理"),
     "per_month": MessageLookupByLibrary.simpleMessage("每月"),
     "person_in_charge": MessageLookupByLibrary.simpleMessage("负责人"),
     "pet_pavilion": MessageLookupByLibrary.simpleMessage("宠物亭"),

+ 5 - 0
packages/cs_resources/lib/generated/l10n.dart

@@ -3780,6 +3780,11 @@ class S {
     return Intl.message('Album', name: 'album', desc: '', args: []);
   }
 
+  /// `Pending`
+  String get pending {
+    return Intl.message('Pending', name: 'pending', desc: '', args: []);
+  }
+
   /// `Other`
   String get other {
     return Intl.message('Other', name: 'other', desc: '', args: []);

+ 1 - 0
packages/cs_resources/lib/l10n/intl_en.arb

@@ -464,5 +464,6 @@
   "choose_image": "Choose Image",
   "camera": "Camera",
   "album": "Album",
+  "pending": "Pending",
   "other": "Other"
 }

+ 1 - 0
packages/cs_resources/lib/l10n/intl_zh_CN.arb

@@ -463,5 +463,6 @@
   "choose_image": "选择图片",
   "camera": "相机",
   "album": "相册",
+  "pending": "等待处理",
   "other": "其他"
 }

+ 1 - 0
packages/cs_resources/lib/l10n/intl_zh_HK.arb

@@ -449,5 +449,6 @@
   "choose_image": "选择图片",
   "camera": "相机",
   "album": "相册",
+  "pending": "等待处理",
   "other": "其他"
 }