Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[automation] Update texts for rule-based actions #3733

Merged
merged 1 commit into from
Jul 30, 2023
Merged

[automation] Update texts for rule-based actions #3733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ private ModuleType getScriptActionType(@Nullable Locale locale) {
List<Output> outputs = new ArrayList<>();
Output result = new Output("result", "java.lang.Object", "result", "the script result", null, null, null);
outputs.add(result);
return new ActionType(ScriptActionHandler.TYPE_ID, getConfigDescriptions(locale), "execute a given script",
return new ActionType(ScriptActionHandler.TYPE_ID, getConfigDescriptions(locale), "execute an inline script",
"Allows the execution of a user-defined script.", null, Visibility.VISIBLE, null, outputs);
}

private ModuleType getScriptConditionType(@Nullable Locale locale) {
return new ConditionType(ScriptConditionHandler.TYPE_ID, getConfigDescriptions(locale),
"a given script evaluates to true", "Allows the definition of a condition through a script.", null,
"an inline script evaluates to true", "Allows the definition of a condition through a script.", null,
Visibility.VISIBLE, null);
}

Expand Down
12 changes: 6 additions & 6 deletions ...ore.automation/src/main/resources/OH-INF/automation/moduletypes/RuleEnablementAction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"actions": [
{
"uid": "core.RuleEnablementAction",
"label": "enables or disables rules",
"description": "Enables or disables a rule or a group of rules specified by their UIDs.",
"label": "enable or disable scenes, scripts & rules",
"description": "Enables or disables a single one or a group of those specified by their UIDs.",
"configDescriptions": [
{
"name": "enable",
"type": "BOOLEAN",
"label": "Enable rules",
"description": "'true' enables all specified rules, 'false' disables them.",
"label": "Enable/Disable",
"description": "'true' enables all specified ones, 'false' disables them.",
"required": true,
"options": [
{
Expand All @@ -25,8 +25,8 @@
{
"name": "ruleUIDs",
"type": "TEXT",
"label": "Rules",
"description": "Specifies the rules that should be enabled or disabled.",
"label": "Scenes, scripts & rules",
"description": "Specifies those that should be enabled or disabled.",
"required": true,
"multiple": true,
"context":"rule"
Expand Down
8 changes: 4 additions & 4 deletions ...enhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/RunRuleAction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"actions": [
{
"uid": "core.RunRuleAction",
"label": "run rules",
"description": "runs/executes a rule or a group of rules specified by their UIDs.",
"label": "run scenes, scripts & rules",
"description": "Runs/Executes a single one or a group of those specified by their UIDs.",
"configDescriptions": [
{
"name": "ruleUIDs",
"type": "TEXT",
"label": "Rules",
"description": "Specifies the target rule(s) that should be executed.",
"label": "Scenes, scripts & rules",
"description": "Specifies the target scene(s), script(s) & rule(s) that should be executed.",
"required": true,
"multiple": true,
"context": "rule"
Expand Down
20 changes: 10 additions & 10 deletions bundles/org.openhab.core.automation/src/main/resources/OH-INF/i18n/automation.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,21 +255,21 @@ module-type.core.ItemStateUpdateTrigger.output.event.description = The event whi

# core.RuleEnablementAction

module-type.core.RuleEnablementAction.label = enables or disables rules
module-type.core.RuleEnablementAction.description = Enables or disables a rule or a group of rules specified by their UIDs.
module-type.core.RuleEnablementAction.config.enable.label = Enable rules
module-type.core.RuleEnablementAction.config.enable.description = 'true' enables all specified rules, 'false' disables them.
module-type.core.RuleEnablementAction.label = enable or disable scenes, scripts & rules
module-type.core.RuleEnablementAction.description = Enables or disables a single one or a group of those specified by their UIDs.
module-type.core.RuleEnablementAction.config.enable.label = Enable/Disable
module-type.core.RuleEnablementAction.config.enable.description = 'true' enables all specified ones, 'false' disables them.
module-type.core.RuleEnablementAction.config.enable.option.true = Enable
module-type.core.RuleEnablementAction.config.enable.option.false = Disable
module-type.core.RuleEnablementAction.config.ruleUIDs.label = Rules
module-type.core.RuleEnablementAction.config.ruleUIDs.description = Specifies the rules that should be enabled or disabled.
module-type.core.RuleEnablementAction.config.ruleUIDs.label = Scenes, scripts & rules
module-type.core.RuleEnablementAction.config.ruleUIDs.description = Specifies those that should be enabled or disabled.

# core.RunRuleAction

module-type.core.RunRuleAction.label = run rules
module-type.core.RunRuleAction.description = runs/executes a rule or a group of rules specified by their UIDs.
module-type.core.RunRuleAction.config.ruleUIDs.label = Rules
module-type.core.RunRuleAction.config.ruleUIDs.description = Specifies the target rule(s) that should be executed.
module-type.core.RunRuleAction.label = run scenes, scripts & rules
module-type.core.RunRuleAction.description = Runs/Executes a single one or a group of those specified by their UIDs.
module-type.core.RunRuleAction.config.ruleUIDs.label = Scenes, scripts & rules
module-type.core.RunRuleAction.config.ruleUIDs.description = Specifies the target scene(s), script(s) & rule(s) that should be executed.
module-type.core.RunRuleAction.config.considerConditions.label = Consider Conditions
module-type.core.RunRuleAction.config.considerConditions.description = Specifies whether the conditions of the target rule(s) to be executed should be considered or not.
module-type.core.RunRuleAction.config.considerConditions.option.true = Yes
Expand Down