From d3eaceefe18d4830920e44dad7d2bd96fc7088ca Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 1 May 2020 19:12:58 +1000 Subject: [PATCH] Convert boolean to is --- assets/javascripts/discourse/lib/wizard-mapper.js.es6 | 2 +- config/locales/client.en.yml | 2 +- lib/custom_wizard/mapper.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js.es6 index 2d7e9e87..1b54572c 100644 --- a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-mapper.js.es6 @@ -32,7 +32,7 @@ const connectors = { 'greater_or_equal', 'less_or_equal', 'regex', - 'boolean' + 'is' ], output: [ 'then', diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index ca6b2e05..0a79915d 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -176,7 +176,7 @@ en: less_or_equal: '<=' regex: '=~' association: '→' - boolean: 'is' + is: 'is' action: header: "Actions" diff --git a/lib/custom_wizard/mapper.rb b/lib/custom_wizard/mapper.rb index 3931bd11..19b40e6b 100644 --- a/lib/custom_wizard/mapper.rb +++ b/lib/custom_wizard/mapper.rb @@ -15,7 +15,7 @@ class CustomWizard::Mapper greater_or_equal: '>=', less_or_equal: '<=', regex: '=~', - boolean: { + is: { present: "present?", true: "==", false: "=="