1.修改多国语言脚本

2.显示方式“瀑布流”多国语言ID修改

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h
index 58639fb..e318efa 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h
@@ -1,15 +1,15 @@
-/*\r
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
-* Description: language\r
-* Author: Graphic develop team\r
-* Create: 2021-07-06\r
-*/\r
-\r
-#ifndef UI_RESOURCE_STRING_H\r
-#define UI_RESOURCE_STRING_H\r
-#include <cstdint>\r
-namespace OHOS {\r
-enum UIResourceTextId : uint16_t {\r
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include <cstdint>
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
     STR_EXERCISE_OUTDOORWALKING = 0,\r
     STR_EXERCISE_OUTDOORRUNNING = 1,\r
     STR_EXERCISE_OUTDOORBIKING = 2,\r
@@ -653,10 +653,11 @@ enum UIResourceTextId : uint16_t {
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
     STR_AIMODES_LINGXI = 642,\r
-    STR_MAX_ID = 643,\r
+    STR_WATERFALL_DISPLAY = 643,\r
+    STR_MAX_ID = 644,\r
 }; // UIResourceTextId\r
-\r
-enum FontLanguageId : uint8_t {\r
+
+enum FontLanguageId : uint8_t {
     LANGUAGE_ID_AR,\r
     LANGUAGE_ID_AZ,\r
     LANGUAGE_ID_CS,\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
index ab18c6f..c99ad8c 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
@@ -181,7 +181,7 @@ namespace OHOS
         scrollView->Add(titleText);
         /* -------------------------------------------------------------------------- */
         // int16_t textId[] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY,STR_DIAL_PLATE};
-        int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_CELLULAR_DISPLAY,STR_DIAL_PLATE,STR_DIAL_PLATE};
+        int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_CELLULAR_DISPLAY,STR_DIAL_PLATE,STR_WATERFALL_DISPLAY};
         LabelConfig labelConfig = {
             .left = 143,
             .top = 153,

diff --git a/code/sdk/files/fd230/fs/user/res/font/en.lang b/code/sdk/files/fd230/fs/user/res/font/en.lang
index e737dab..123fa43 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/font/en.lang and b/code/sdk/files/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
index 64565ce..e318efa 100644 (file)
--- a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h
@@ -653,7 +653,8 @@ enum UIResourceTextId : uint16_t {
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
     STR_AIMODES_LINGXI = 642,\r
-    STR_MAX_ID = 643,\r
+    STR_WATERFALL_DISPLAY = 643,\r
+    STR_MAX_ID = 644,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/files/fd230/fs/user/res/font/zh.lang b/code/sdk/files/fd230/fs/user/res/font/zh.lang
index 2fd356c..f9138db 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/font/zh.lang and b/code/sdk/files/fd230/fs/user/res/font/zh.lang differ

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index ffafb47..c01835a 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -642,4 +642,5 @@ STR_FRE_CONTACT$Frequent contact
 STR_RECORD_MAX$The recording space is full\r
 STR_CLEAR_ALL_RECORDS$Clear all records\r
 STR_DEEPSEEK$DeepSeek\r
-STR_AIMODES_LINGXI$jiutian 
\ No newline at end of file
+STR_AIMODES_LINGXI$jiutian \r
+STR_WATERFALL_DISPLAY$Waterfall flow
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index a0be7d7..3139111 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -642,4 +642,5 @@ STR_FRE_CONTACT$常用联系人
 STR_RECORD_MAX$录音空间已满\r
 STR_CLEAR_ALL_RECORDS$清除全部记录\r
 STR_DEEPSEEK$DeepSeek\r
-STR_AIMODES_LINGXI$九天大模型
\ No newline at end of file
+STR_AIMODES_LINGXI$九天大模型\r
+STR_WATERFALL_DISPLAY$瀑布流
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx
index 214b009..2667bdb 100644 (file)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index ca5ed51..6252a36 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -644,4 +644,5 @@
        <lanstr id="STR_CLEAR_ALL_RECORDS" value="Clear all records"/>
        <lanstr id="STR_DEEPSEEK" value="DeepSeek"/>
        <lanstr id="STR_AIMODES_LINGXI" value="jiutian"/>
+       <lanstr id="STR_WATERFALL_DISPLAY" value="Waterfall flow"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index ecc5343..b0f7134 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -644,4 +644,5 @@
        <lanstr id="STR_CLEAR_ALL_RECORDS" value="清除全部记录"/>
        <lanstr id="STR_DEEPSEEK" value="DeepSeek"/>
        <lanstr id="STR_AIMODES_LINGXI" value="九天大模型"/>
+       <lanstr id="STR_WATERFALL_DISPLAY" value="瀑布流"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index e737dab..123fa43 100644 (file)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ

diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index 64565ce..e318efa 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -653,7 +653,8 @@ enum UIResourceTextId : uint16_t {
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
     STR_AIMODES_LINGXI = 642,\r
-    STR_MAX_ID = 643,\r
+    STR_WATERFALL_DISPLAY = 643,\r
+    STR_MAX_ID = 644,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 2fd356c..f9138db 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ

diff --git a/tools/language_tool/make_language.sh b/tools/language_tool/make_language.sh
index 08b3cab..7be7697 100644 (file)
--- a/tools/language_tool/make_language.sh
+++ b/tools/language_tool/make_language.sh
@@ -32,10 +32,10 @@ python language_trans.py ../Language_xml/ ../font/ ../font/
 echo "脚本生成文件执行完成。"  
 
 #复制头文件  
-cp ../font/ui_resource_string.h  ../../../code/sdk/application/wearable/fd230app/nativelauncher/include/
+cp ../font/ui_resource_string.h  ../../../code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/
 
 #复制资源文件  
-cp -r ./font  ../../code/sdk/files/fd230/fs/user/res/
+cp -r ../font  ../../../code/sdk/files/fd230/fs/user/res/
 
 #打印完成信息  
 echo "脚本复制文件执行完成。"