From 9266f77f9223821e59c43b9c6b4c4a8ba12ac839 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Thu, 17 Oct 2024 10:10:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- .../src/main/python/ohos/global/i18n/generate_dat.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py b/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py index 8e6334f..f8e31ee 100644 --- a/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py +++ b/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py @@ -23,19 +23,19 @@ import stat def collect_value_in_dict(val): res = [] - if type(val) is dict: + if isinstance(val, dict): for item_val in val.values(): res += collect_value_in_dict(item_val) - elif type(val) is list: + elif isinstance(val, list): res += val - elif type(val) is str: + elif isinstance(val, str): res.append(val) return res def add_string_to_pool(all_metas, string_pool, locale_id, resource_id, val): locale_metas = all_metas.get(locale_id) - if locale_metas is None or type(locale_metas) is not dict: + if locale_metas is None or not isinstance(locale_metas, dict): return all_metas, string_pool locale_metas[resource_id] = collect_value_in_dict(val) -- Gitee From 60aa5df8219d86c03c2870f8f4835c9e02088030 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Thu, 17 Oct 2024 10:20:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- .../src/main/python/ohos/global/i18n/generate_dat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py b/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py index f8e31ee..92fc1cf 100644 --- a/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py +++ b/tools/i18n-dat-tool/src/main/python/ohos/global/i18n/generate_dat.py @@ -35,7 +35,7 @@ def collect_value_in_dict(val): def add_string_to_pool(all_metas, string_pool, locale_id, resource_id, val): locale_metas = all_metas.get(locale_id) - if locale_metas is None or not isinstance(locale_metas, dict): + if locale_metas is None or (not isinstance(locale_metas, dict)): return all_metas, string_pool locale_metas[resource_id] = collect_value_in_dict(val) -- Gitee