From 384b3adf9e0d00c68635d0a141b2a76e98243aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 4 Jun 2017 16:22:47 +0200 Subject: fset: use English short type name for ${type} in filter, remove ${type_en} --- src/plugins/fset/fset-command.c | 8 ++++---- src/plugins/fset/fset-option.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/plugins/fset/fset-command.c b/src/plugins/fset/fset-command.c index 016bc2bba..be36dbd95 100644 --- a/src/plugins/fset/fset-command.c +++ b/src/plugins/fset/fset-command.c @@ -515,9 +515,9 @@ fset_command_init () " ==xxx show only options with exact value \"xxx\"\n" " c:xxx show only options matching the evaluated " "condition \"xxx\", using following variables: name, parent_name, " - "type, type_en, default_value, default_value_undef, value, " - "value_undef, value_changed, parent_value, min, max, description, " - "description_en, string_values\n" + "type (bool/int/str/col), default_value, default_value_undef, " + "value, value_undef, value_changed, parent_value, min, max, " + "description, description_en, string_values\n" " s:x,y sort options by fields x,y " "(see /help fset.look.sort)\n" " s: reset sort to its default value " @@ -586,7 +586,7 @@ fset_command_init () " show all values which contain \"red\":\n" " /fset =red\n" " show all integer options in irc plugin:\n" - " /fset c:${name} =~ ^irc.* && ${type_en} == integer"), + " /fset c:${name} =~ ^irc.* && ${type} == int"), "-bar" " || -toggle_bar" " || -refresh" diff --git a/src/plugins/fset/fset-option.c b/src/plugins/fset/fset-option.c index 778a3a16e..e28640695 100644 --- a/src/plugins/fset/fset-option.c +++ b/src/plugins/fset/fset-option.c @@ -248,9 +248,7 @@ fset_option_match_filters (const char *config_name, const char *section_name, weechat_hashtable_set (fset_option_filter_hashtable_extra_vars, "parent_name", fset_option->parent_name); weechat_hashtable_set (fset_option_filter_hashtable_extra_vars, - "type", _(fset_option_type_string[fset_option->type])); - weechat_hashtable_set (fset_option_filter_hashtable_extra_vars, - "type_en", fset_option_type_string[fset_option->type]); + "type", fset_option_type_string_short[fset_option->type]); weechat_hashtable_set (fset_option_filter_hashtable_extra_vars, "default_value", fset_option->default_value); weechat_hashtable_set (fset_option_filter_hashtable_extra_vars, -- cgit v1.2.3