Jelajahi Sumber

fix: 币商多语言文案补充

pengwuliang 11 bulan lalu
induk
melakukan
8041f0269c
20 mengubah file dengan 115 tambahan dan 25 penghapusan
  1. 1 1
      app/src/main/res/layout/layout_merchat_label.xml
  2. 1 0
      app/src/main/res/values-ar/strings.xml
  3. 1 0
      app/src/main/res/values-zh/strings.xml
  4. 1 0
      app/src/main/res/values/strings.xml
  5. 4 0
      module/call/src/main/res/values-ar/strings.xml
  6. 4 0
      module/call/src/main/res/values-zh/strings.xml
  7. 0 1
      module/message/src/main/java/com/adealink/weparty/message/conversation/extension/withdraw/TransferDetailDialog.kt
  8. 4 4
      module/message/src/main/java/com/adealink/weparty/message/conversation/provider/ProxyInviteMessageItemProvider.kt
  9. 1 1
      module/message/src/main/java/com/adealink/weparty/message/conversation/provider/ProxyWithdrawCompleteMessageItemProvider.kt
  10. 1 1
      module/message/src/main/java/com/adealink/weparty/message/conversation/provider/TransferDealMessageItemProvider.kt
  11. 2 2
      module/message/src/main/res/layout/im_item_invite_withdraw.xml
  12. 1 1
      module/message/src/main/res/layout/im_item_transfer_deal.xml
  13. 2 2
      module/message/src/main/res/layout/layout_diamond_withdraw.xml
  14. 4 4
      module/message/src/main/res/layout/layout_sell_diamond.xml
  15. 5 5
      module/message/src/main/res/layout/layout_trasnfer_detail.xml
  16. 1 1
      module/message/src/main/res/layout/layout_withdraw_invited.xml
  17. 2 2
      module/message/src/main/res/layout/layout_withdraw_receive_diamond.xml
  18. 33 0
      module/message/src/main/res/values-ar/strings.xml
  19. 33 0
      module/message/src/main/res/values-zh/strings.xml
  20. 14 0
      module/message/src/main/res/values/strings.xml

+ 1 - 1
app/src/main/res/layout/layout_merchat_label.xml

@@ -76,7 +76,7 @@
             android:layout_height="15dp"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="Agency"
+            android:text="@string/profile_agency"
             android:textColor="@color/white"
             android:textSize="9sp"
             android:paddingHorizontal="4dp"

+ 1 - 0
app/src/main/res/values-ar/strings.xml

@@ -648,4 +648,5 @@
     <string name="common_hardware_camera">آلة تصوير</string>
     <string name="common_hardware_mic">ميكروفون</string>
     <string name="invite_new_reward_desc">لقد حصلت عليه من خلال دعوة</string>
+    <string name="profile_agency">وكالة</string>
 </resources>

+ 1 - 0
app/src/main/res/values-zh/strings.xml

@@ -646,4 +646,5 @@
     <string name="common_hardware_camera">相机</string>
     <string name="common_hardware_mic">麦克风</string>
     <string name="invite_new_reward_desc">您通过邀请获得它</string>
+    <string name="profile_agency">代理</string>
 </resources>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -479,6 +479,7 @@
     <string name="profile_user_online">Online</string>
     <string name="profile_user_offline">Offline</string>
     <string name="profile_merchant">Merchant</string>
+    <string name="profile_agency">Agency</string>
     <string name="profile_short_id">ID:%s</string>
     <string name="profile_fans_num">%s followers</string>
     <string name="profile_change_region_fluency">Fluent</string>

+ 4 - 0
module/call/src/main/res/values-ar/strings.xml

@@ -65,4 +65,8 @@
     <string name="call_kit_error_already_in_call">لا يمكن بدء المكالمة، وهي قيد المكالمة بالفعل</string>
     <string name="call_caller_wait">نداء…</string>
     <string name="call_called_wait">في انتظار الجواب…</string>
+    <string name="call_invite_merchant">بدء مكالمة صوتية</string>
+    <string name="call_merchant_cost">التكلفة 0 عملة</string>
+    <string name="call_merchant_float_cost">مكالمة صوتية، مكالمة مجانية</string>
+    <string name="call_free">حر</string>
 </resources>

+ 4 - 0
module/call/src/main/res/values-zh/strings.xml

@@ -65,4 +65,8 @@
     <string name="call_kit_error_already_in_call">呼叫失败,已经在呼叫中</string>
     <string name="call_caller_wait">呼叫中…</string>
     <string name="call_called_wait">等待接听…</string>
+    <string name="call_invite_merchant">发起语音通话</string>
+    <string name="call_merchant_cost">花费 0 枚金币</string>
+    <string name="call_merchant_float_cost">语音通话,免费通话</string>
+    <string name="call_free">免费的</string>
 </resources>

+ 0 - 1
module/message/src/main/java/com/adealink/weparty/message/conversation/extension/withdraw/TransferDetailDialog.kt

@@ -63,7 +63,6 @@ class TransferDetailDialog : BottomDialogFragment(R.layout.layout_trasnfer_detai
         binding.tvDiamondAmount.text = "$num"
         binding.tvOrderId.text = getCompatString(R.string.message_order_id, orderId ?: "")
         binding.tvCurrency.text = withdrawCurrency
-        binding.tvOfficialTips.text = getCompatString(R.string.message_official_exchange_rate, 5000)
         val time = orderTime?: return
         binding.tvTransferTime.text = getCompatString(R.string.message_transfer_time, DateFormatUtils.long2Str(time, true))
         if(showButton == true) {

+ 4 - 4
module/message/src/main/java/com/adealink/weparty/message/conversation/provider/ProxyInviteMessageItemProvider.kt

@@ -56,7 +56,7 @@ class ProxyInviteMessageItemProvider: BaseMessageItemProvider<ProxyInviteWithdra
     }
 
     override fun getSummarySpannable(messageContent: ProxyInviteWithdrawMessage): Spannable {
-        return SpannableString("Diamond withdrawal transfer")
+        return SpannableString(getCompatString(R.string.message_invite_withdraw_msg))
     }
 
     override fun onItemClick(
@@ -70,7 +70,7 @@ class ProxyInviteMessageItemProvider: BaseMessageItemProvider<ProxyInviteWithdra
         val time = t.endTime ?: return false
         val now = System.currentTimeMillis()
         if(now > time) {
-            showToast("操作失败!本消息已失效!")
+            showToast(R.string.message_operate_fail_for_invalid_msg)
             return false
         }
         val currentActivity = (AppUtil.currentActivity as? FragmentActivity) ?: return false
@@ -183,9 +183,9 @@ class ProxyInviteMessageItemProvider: BaseMessageItemProvider<ProxyInviteWithdra
         if(now > time) {
             holder.getView<View>(R.id.im_layout)?.background =
                 getCompatDrawable(R.drawable.im_withdraw_transfer_invalid_bg)
-            holder.getView<TextView>(R.id.tv_valid_time)?.text = "Became invalid"
+            holder.getView<TextView>(R.id.tv_valid_time)?.text = getCompatString(R.string.message_invite_withdraw_invalid)
         } else {
-            holder.getView<TextView>(R.id.tv_valid_time)?.text = "Valid for $hour hours"
+            holder.getView<TextView>(R.id.tv_valid_time)?.text = getCompatString(R.string.message_invite_withdraw_valid_time, hour)
         }
     }
 

+ 1 - 1
module/message/src/main/java/com/adealink/weparty/message/conversation/provider/ProxyWithdrawCompleteMessageItemProvider.kt

@@ -32,7 +32,7 @@ class ProxyWithdrawCompleteMessageItemProvider: BaseMessageItemProvider<ProxyWit
     }
 
     override fun getSummarySpannable(messageContent: ProxyWithdrawCompleteMessage): Spannable {
-        return SpannableString("Transfer Transaction")
+        return SpannableString(getCompatString(R.string.message_transfer_transaction))
     }
 
     override fun onItemClick(

+ 1 - 1
module/message/src/main/java/com/adealink/weparty/message/conversation/provider/TransferDealMessageItemProvider.kt

@@ -46,7 +46,7 @@ class TransferDealMessageItemProvider: BaseMessageItemProvider<TransferDealMessa
     }
 
     override fun getSummarySpannable(messageContent: TransferDealMessage): Spannable {
-        return SpannableString("Transfer Transaction")
+        return SpannableString(getCompatString(R.string.message_transfer_transaction))
     }
 
     override fun onItemClick(

+ 2 - 2
module/message/src/main/res/layout/im_item_invite_withdraw.xml

@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/white"
         android:textSize="14sp"
-        android:text="Diamond withdrawal transfer"
+        android:text="@string/message_invite_withdraw_msg"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/iv_diamond"
@@ -36,7 +36,7 @@
         android:id="@+id/tv_valid_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="valid for 72 hours"
+        android:text="@string/message_invite_withdraw_valid_time"
         android:textColor="@color/white"
         android:textSize="12sp"
         app:layout_constraintTop_toBottomOf="@id/tv_title"

+ 1 - 1
module/message/src/main/res/layout/im_item_transfer_deal.xml

@@ -36,7 +36,7 @@
         android:id="@+id/tv_arrival_notification"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:text="Diamond arrival notification"
+        tools:text="@string/message_currency_arrival"
         android:textColor="@color/white"
         android:textSize="11sp"
         app:layout_constraintTop_toBottomOf="@id/tv_title"

+ 2 - 2
module/message/src/main/res/layout/layout_diamond_withdraw.xml

@@ -66,7 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="Diamonds recovered"
+        android:text="@string/message_diamonds_recovered"
         android:textColor="@color/color_222222"
         android:textSize="14sp"
         app:layout_constraintStart_toStartOf="@id/iv_avatar"
@@ -81,7 +81,7 @@
         android:background="@drawable/im_diamond_withdraw_bg"
         android:gravity="center_vertical"
         android:paddingHorizontal="12dp"
-        android:text="Peer custom"
+        android:text="@string/message_peer_custom"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

+ 4 - 4
module/message/src/main/res/layout/layout_sell_diamond.xml

@@ -68,7 +68,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/color_222222"
         android:textSize="14sp"
-        android:text="Number of diamonds withdraw"
+        android:text="@string/message_withdraw_number"
         app:layout_constraintTop_toBottomOf="@id/iv_avatar"
         app:layout_constraintStart_toStartOf="@id/iv_avatar"
         android:layout_marginTop="20dp"/>
@@ -88,7 +88,7 @@
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="8dp"
         android:textColorHint="@color/color_CCCCCC"
-        android:hint="Please fill in the numbers from 1 to 9999"/>
+        android:hint="@string/message_withdraw_number_hint"/>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_diamond_balance"
@@ -107,7 +107,7 @@
         android:id="@+id/tv_currency_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Withdrawal currency:"
+        android:text="@string/message_withdraw_currency"
         android:textSize="14sp"
         android:textColor="@color/color_222222"
         app:layout_constraintTop_toBottomOf="@id/tv_diamond_balance"
@@ -147,7 +147,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/color_AAAAAA"
         android:textSize="14sp"
-        android:text="I promise to complete the payment transfer within 24 hours after receiving the diamond transfer"
+        android:text="@string/message_transfer_promise"
         android:layout_marginTop="8dp"
         app:layout_constraintTop_toBottomOf="@id/tv_official_tips"
         app:layout_constraintStart_toStartOf="parent"

+ 5 - 5
module/message/src/main/res/layout/layout_trasnfer_detail.xml

@@ -14,7 +14,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:text="Complete transfer diamond"
+        android:text="@string/message_complete_transfer_title"
         android:textSize="16sp"
         android:textColor="@color/color_222222"
         android:layout_marginTop="13dp"/>
@@ -35,7 +35,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/color_222222"
         android:textSize="14sp"
-        android:text="Number of diamonds withdrawn"
+        android:text="@string/message_withdraw_number"
         app:layout_constraintTop_toBottomOf="@id/tv_title"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="27dp"
@@ -58,7 +58,7 @@
         android:id="@+id/tv_currency_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Withdrawal currency"
+        android:text="@string/message_withdraw_currency"
         android:textSize="14sp"
         android:textColor="@color/color_222222"
         app:layout_constraintTop_toBottomOf="@id/tv_diamond_amount"
@@ -90,7 +90,7 @@
         android:id="@+id/tv_transfer_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="Transfer time: 2025-04-12 19:00"
+        tools:text="@string/message_transfer_time"
         android:textSize="13sp"
         android:textColor="@color/color_AAAAAA"
         app:layout_constraintTop_toBottomOf="@id/divider"
@@ -101,7 +101,7 @@
         android:id="@+id/tv_order_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="Order number: 1000018273620103"
+        tools:text="@string/message_order_id"
         android:textSize="13sp"
         android:textColor="@color/color_AAAAAA"
         app:layout_constraintTop_toBottomOf="@id/tv_transfer_time"

+ 1 - 1
module/message/src/main/res/layout/layout_withdraw_invited.xml

@@ -10,7 +10,7 @@
         android:layout_height="44dp"
         android:gravity="center"
         app:is_strong="true"
-        android:text="Revocation"
+        android:text="@string/message_revocation"
         android:textSize="16sp"
         android:textStyle="bold"
         android:textColor="@color/color_FFFFFF"

+ 2 - 2
module/message/src/main/res/layout/layout_withdraw_receive_diamond.xml

@@ -30,7 +30,7 @@
             android:id="@+id/tv_return"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Return"
+            android:text="@string/message_return"
             android:textSize="16sp"
             android:textColor="@color/color_222222"
             android:layout_marginStart="4dp"
@@ -47,7 +47,7 @@
         android:layout_height="44dp"
         android:gravity="center"
         app:is_strong="true"
-        android:text="Transfer"
+        android:text="@string/message_transfer"
         android:textSize="16sp"
         android:textStyle="bold"
         android:textColor="@color/color_FFFFFF"

+ 33 - 0
module/message/src/main/res/values-ar/strings.xml

@@ -100,4 +100,37 @@
     <string name="message_intimacy_value_upgrade_tip">تمت ترقية مستوى القرب إلى LV.%s</string>
     <string name="message_send_intimacy_invite_message">%1$s أرسل دعوة %2$s وقدم %3$s (%4$s %5$s)</string>
     <string name="message_target_merchant_tips">الطرف الآخر هو وكيل معتمد رسميًا، يمكنك سحب الألماس بثقة. إذا ظهرت تنبيهات أسعار غير منطقية أو مشاكل مشابهة، يُرجى أخذ لقطة شاشة كدليل والنقر على الزاوية العلوية اليمنى للإبلاغ.</string>
+    <string name="message_user_id">المعرف: %s</string>
+    <string name="message_currency_return">إشعار العودة %s</string>
+    <string name="message_order_id">معرف الطلب: %s</string>
+    <string name="message_official_exchange_rate">سعر السحب الرسمي: %d الماس الأزرق /$</string>
+    <string name="message_withdraw_number">عدد الماسات المسحوبة</string>
+    <string name="message_transfer_time">وقت النقل: %s</string>
+    <string name="message_invite_withdraw_title">دعوة الوكيل لسحب النقود</string>
+    <string name="message_return_diamond_tips">(يتم إرجاعها تلقائيًا إلى رصيد الماس الخاص بك)</string>
+    <string name="message_withdraw_currency">عملة السحب:</string>
+    <string name="message_currency_arrival">إشعار وصول %s</string>
+    <string name="message_invite_withdraw_valid_time">صالحة لمدة %d ساعة</string>
+    <string name="message_peer_custom">عرف الأقران</string>
+    <string name="message_withdraw_number_hint">الرجاء إدخال الأرقام من 1 إلى 99999</string>
+    <string name="message_confirm_to_send_currency">تأكيد إرسال %s من الماس إليه</string>
+    <string name="message_diamonds_recovered">الماس المستعاد</string>
+    <string name="message_invite_withdraw_msg">تحويل سحب الماس</string>
+    <string name="message_transfer_transaction">معاملة نقل</string>
+    <string name="message_withdraw_complete_diamond_amount">الماس المسحوب: %d</string>
+    <string name="message_withdraw_complete_title">لقد تم تحويل مبلغ السحب الخاص بك، يرجى التحقق</string>
+    <string name="message_withdraw_complete_screenshots_amount">نقل لقطات الشاشة: x%d</string>
+    <string name="message_operate_fail_for_invalid_msg">فشلت العملية! هذه الرسالة غير صالحة!</string>
+    <string name="message_invite_withdraw_invalid">أصبح غير صالح</string>
+    <string name="message_diamond_not_enough">ليس هناك ما يكفي من الماس</string>
+    <string name="message_complete_transfer_title">نقل الماس الكامل</string>
+    <string name="message_withdraw_return_title">لقد تم إرجاع مبلغ السحب الخاص بك، يرجى التحقق</string>
+    <string name="message_transfer_promise">أعد بإكمال تحويل الدفعة خلال 24 ساعة بعد استلام تحويل الماس</string>
+    <string name="message_transfer_return_title">تأكيد إرجاع الماس وإنهاء المعاملة؟</string>
+    <string name="message_confirm_currency_title">لا يمكن إلغاء العملات المعدنية أو استرجاعها بعد الإرسال!</string>
+    <string name="message_diamond_lower">لا يمكن أن يكون الماس أقل من %d</string>
+    <string name="message_diamond_balance">رصيد الماس: %d</string>
+    <string name="message_revocation">إبطال</string>
+    <string name="message_return">يعود</string>
+    <string name="message_transfer">تحويل</string>
 </resources>

+ 33 - 0
module/message/src/main/res/values-zh/strings.xml

@@ -100,4 +100,37 @@
     <string name="message_intimacy_value_upgrade_tip">亲密等级提升至 LV.%s</string>
     <string name="message_send_intimacy_invite_message">%1$s发送了%2$s邀请,并赠送了%3$s(%4$s %5$s)</string>
     <string name="message_target_merchant_tips">对方为官方认证代理商,请放心进行钻石提现交易。但若出现不合理提醒价格等,可截图相关证据,点右上角进行举报</string>
+    <string name="message_user_id">ID:%s</string>
+    <string name="message_currency_return">%s 回退通知</string>
+    <string name="message_order_id">订单编号:%s</string>
+    <string name="message_official_exchange_rate">官方提现价格:%d蓝钻/$</string>
+    <string name="message_withdraw_number">提取钻石数量</string>
+    <string name="message_transfer_time">传输时间:%s</string>
+    <string name="message_invite_withdraw_title">邀请代理提取现金</string>
+    <string name="message_return_diamond_tips">(自动返回至您的钻石余额)</string>
+    <string name="message_withdraw_currency">提款货币:</string>
+    <string name="message_currency_arrival">%s 到达通知</string>
+    <string name="message_invite_withdraw_valid_time">有效期为 %d 小时</string>
+    <string name="message_peer_custom">同行定制</string>
+    <string name="message_withdraw_number_hint">请填写1至99999之间的数字</string>
+    <string name="message_confirm_to_send_currency">确认向他发送%s钻石</string>
+    <string name="message_diamonds_recovered">回收的钻石</string>
+    <string name="message_invite_withdraw_msg">钻石提现转账</string>
+    <string name="message_transfer_transaction">转账交易</string>
+    <string name="message_withdraw_complete_diamond_amount">已提取钻石:%d</string>
+    <string name="message_withdraw_complete_title">您的提现金额已转账,请查收</string>
+    <string name="message_withdraw_complete_screenshots_amount">传输截图:x%d</string>
+    <string name="message_operate_fail_for_invalid_msg">操作失败!此消息无效!</string>
+    <string name="message_invite_withdraw_invalid">已失效</string>
+    <string name="message_diamond_not_enough">钻石不足</string>
+    <string name="message_complete_transfer_title">完成转移钻石</string>
+    <string name="message_withdraw_return_title">您的提现金额已退回,请查收</string>
+    <string name="message_transfer_promise">我承诺在收到钻石转账后24小时内完成款项转账</string>
+    <string name="message_transfer_return_title">确认退还钻石并终止交易吗?</string>
+    <string name="message_confirm_currency_title">发送后,货币将无法取消或召回!</string>
+    <string name="message_diamond_lower">钻石不能低于%d</string>
+    <string name="message_diamond_balance">钻石余额:%d</string>
+    <string name="message_revocation">撤销</string>
+    <string name="message_return">回退</string>
+    <string name="message_transfer">转账</string>
 </resources>

+ 14 - 0
module/message/src/main/res/values/strings.xml

@@ -119,4 +119,18 @@
     <string name="message_diamond_not_enough">Not enough diamonds</string>
     <string name="message_diamond_lower">Diamonds cannot be lower than %d</string>
     <string name="message_return_diamond_tips">(Automatically returned to your diamond balance)</string>
+    <string name="message_invite_withdraw_msg">Diamond withdrawal transfer</string>
+    <string name="message_invite_withdraw_valid_time">Valid for %d hours</string>
+    <string name="message_invite_withdraw_invalid">Became invalid</string>
+    <string name="message_operate_fail_for_invalid_msg">Operation failed! This message is invalid!</string>
+    <string name="message_transfer_transaction">Transfer Transaction</string>
+    <string name="message_diamonds_recovered">Diamonds recovered</string>
+    <string name="message_peer_custom">Peer custom</string>
+    <string name="message_withdraw_number">Number of diamonds withdraw</string>
+    <string name="message_withdraw_number_hint">Please fill in the numbers from 1 to 99999</string>
+    <string name="message_withdraw_currency">Withdrawal currency:</string>
+    <string name="message_complete_transfer_title">Complete transfer diamond</string>
+    <string name="message_revocation">Revocation</string>
+    <string name="message_return">Return</string>
+    <string name="message_transfer">Transfer</string>
 </resources>