Skip to content

Commit

Permalink
fix(场景联动): 修复场景联动中设备属性翻译问题 (#561)
Browse files Browse the repository at this point in the history
  • Loading branch information
fighter-wang authored Aug 28, 2024
1 parent 39687d8 commit 99e1569
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,9 @@ message.property_value_type_recent_desc=The last value is used when the current
message.property_value_type_recent_nest_desc=When the current value is empty, the data value in the previous [{0}] is used

message.property_value_type_last=Last value
message.property_value_type_last_time=Last time
message.property_value_type_last_time_desc=Last reported data time
message.property_value_type_last_desc=Last reported data value
message.property_value_type_last_nest_desc=Data value in last [{0}]

message.scene_term_column_full_name={1} of {0}
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ error.device_selector_configuration_cannot_be_null=\u8BBE\u5907\u9009\u62E9\u566
error.message_type_cannot_be_null=\u6D88\u606F\u7C7B\u578B\u4E0D\u80FD\u4E3Anull
error.model_id_cannot_be_null=\u7269\u6A21\u578B\u6807\u8BC6\u4E0D\u80FD\u4E3Anull
error.scene_id_cannot_be_empty=\u573A\u666FID\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_id_cannot_be_blank=id\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_name_cannot_be_blank=\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_cannot_be_null=\u89e6\u53d1\u65b9\u5f0f\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_cannot_be_null=\u8bbe\u5907\u89e6\u53d1\u914d\u7f6e\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_timer_cannot_be_null=\u5b9a\u65f6\u89e6\u53d1\u914d\u7f6e\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_product_cannot_be_null=\u4ea7\u54c1\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_operation_cannot_be_null=\u89e6\u53d1\u7c7b\u578b\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_operation_event_id_cannot_be_null=\u8bbe\u5907\u4e8b\u4ef6\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_operation_read_property_cannot_be_empty=\u5c5e\u6027\u8bfb\u53d6\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_operation_write_property_cannot_be_empty=\u4fee\u6539\u5c5e\u6027\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_operation_function_id_cannot_be_null=\u529f\u80fdid\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_trigger_device_operation_function_parameter_cannot_be_empty=\u529f\u80fd\u53c2\u6570\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_actions_notify_type_cannot_be_empty=\u901a\u77e5\u7c7b\u578b\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_actions_notify_id_cannot_be_empty=\u901a\u77e5\u7c7b\u578b\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_actions_notify_template_cannot_be_blank=\u901a\u77e5\u6a21\u677f\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_actions_notify_variables_cannot_be_blank=\u901a\u77e5\u53d8\u91cf\u4e0d\u80fd\u4e3a\u7a7a
error.scene_rule_id_cannot_be_blank=id\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_name_cannot_be_blank=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_cannot_be_null=\u89E6\u53D1\u65B9\u5F0F\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_cannot_be_null=\u8BBE\u5907\u89E6\u53D1\u914D\u7F6E\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_timer_cannot_be_null=\u5B9A\u65F6\u89E6\u53D1\u914D\u7F6E\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_product_cannot_be_null=\u4EA7\u54C1\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_operation_cannot_be_null=\u89E6\u53D1\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_operation_event_id_cannot_be_null=\u8BBE\u5907\u4E8B\u4EF6\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_operation_read_property_cannot_be_empty=\u5C5E\u6027\u8BFB\u53D6\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_operation_write_property_cannot_be_empty=\u4FEE\u6539\u5C5E\u6027\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_operation_function_id_cannot_be_null=\u529F\u80FDid\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_trigger_device_operation_function_parameter_cannot_be_empty=\u529F\u80FD\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_actions_notify_type_cannot_be_empty=\u901A\u77E5\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_actions_notify_id_cannot_be_empty=\u901A\u77E5\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_actions_notify_template_cannot_be_blank=\u901A\u77E5\u6A21\u677F\u4E0D\u80FD\u4E3A\u7A7A
error.scene_rule_actions_notify_variables_cannot_be_blank=\u901A\u77E5\u53D8\u91CF\u4E0D\u80FD\u4E3A\u7A7A

#entity-package
error.not_set_alarm_rule=\u672A\u8BBE\u7F6E\u544A\u8B66\u89C4\u5219
Expand All @@ -54,7 +54,7 @@ error.duplicate_rule_model_id=\u6A21\u578BID\u91CD\u590D
error.rule_nodes_cannot_be_used=\u4E0D\u80FD\u4F7F\u7528\u89C4\u5219\u8282\u70B9:{0}

#alarm
error.cannot_delete_alarm_config_with_warnning_record=\u5f53\u524d\u544a\u8b66\u6709\u544a\u8b66\u4e2d\u7684\u6570\u636e\uff0c\u4e0d\u53ef\u5220\u9664
error.cannot_delete_alarm_config_with_warnning_record=\u5F53\u524D\u544A\u8B66\u6709\u544A\u8B66\u4E2D\u7684\u6570\u636E\uFF0C\u4E0D\u53EF\u5220\u9664

#enums
org.jetlinks.community.rule.engine.enums.AlarmState.running=\u8FD0\u884C\u4E2D
Expand All @@ -80,14 +80,15 @@ org.jetlinks.community.rule.engine.tenant.RuleEngineAssetType.ruleInstance=\u89C

error.can_not_delete_stated_scene=\u573A\u666F\u5DF2\u542F\u52A8,\u65E0\u6CD5\u5220\u9664

message.scene_term_column_now=\u7cfb\u7edf\u65f6\u95f4
message.scene_term_column_now_desc=\u670d\u52a1\u5668\u65f6\u95f4
message.scene_term_column_timestamp=\u4e0a\u62a5\u65f6\u95f4
message.scene_term_column_timestamp_desc=\u6570\u636e\u4e0a\u62a5\u65f6\u6307\u5b9a\u7684\u65f6\u95f4
message.scene_term_column_now=\u7CFB\u7EDF\u65F6\u95F4
message.scene_term_column_now_desc=\u670D\u52A1\u5668\u65F6\u95F4
message.scene_term_column_timestamp=\u4E0A\u62A5\u65F6\u95F4
message.scene_term_column_timestamp_desc=\u6570\u636E\u4E0A\u62A5\u65F6\u6307\u5B9A\u7684\u65F6\u95F4



message.property_value_type_current=\u5F53\u524D\u503C
message.property_value_type_current_param=\u5C5E\u6027/\u5C5E\u6027\u5BF9\u8C61/\u7B2C\u4E00\u4E2A\u503C/ \u5F53\u524D\u503C
message.property_value_type_current_desc=\u672C\u6B21\u8BBE\u5907\u4E0A\u62A5\u7684\u6570\u636E\u503C
message.property_value_type_current_nest_desc=\u672C\u6B21\u4E0A\u62A5\u3010{0}\u3011\u4E2D\u7684\u6570\u636E\u503C

Expand All @@ -96,5 +97,9 @@ message.property_value_type_recent_desc=\u5F53\u524D\u503C\u4E3A\u7A7A\u65F6\u4F
message.property_value_type_recent_nest_desc=\u5F53\u524D\u503C\u4E3A\u7A7A\u65F6\u4F7F\u7528\u4E0A\u4E00\u6B21\u3010{0}\u3011\u4E2D\u7684\u6570\u636E\u503C

message.property_value_type_last=\u4E0A\u4E00\u503C
message.property_value_type_last_time=\u4E0A\u4E00\u6B21\u4E0A\u62A5\u65F6\u95F4
message.property_value_type_last_time_desc=\u4E0A\u4E00\u6B21\u4E0A\u62A5\u6570\u636E\u7684\u65F6\u95F4
message.property_value_type_last_desc=\u4E0A\u4E00\u6B21\u4E0A\u62A5\u7684\u6570\u636E\u503C
message.property_value_type_last_nest_desc=\u4E0A\u4E00\u6B21\u3010{0}\u3011\u4E2D\u7684\u6570\u636E\u503C

message.scene_term_column_full_name={0}/{1}

0 comments on commit 99e1569

Please sign in to comment.