revise language tag handling to be easier to use (T617)

Summary:
T617 makes some good points about the language tags; this is my
suggestion for an improvement. It requires a bit of cleverness
in unregister_prefix_tags(), but the upshot is that you don't
need to know to set any special tags when creating needles, a
needle with no language-related tags will be considered as valid
for all languages. You have to explicitly add LANGUAGE- tag(s)
to a needle for the language filtering to 'kick in' in any way.
If a needle has at least one LANGUAGE- tag, it will be filtered
unless it has the appropriate tag for the job's specified
language (default is still 'english').

With this approach, only needles which we specifically want to
*only* match their tagged language(s) need the tags, so we can
drop all those -ALL tags.

We're using LANGUAGE- instead of ENV-LANGUAGE- now because the
ENV- tag names denote tags that are treated slightly specially
by openQA, and this is not one. We cannot cleanly use
ENV-INSTLANG because openQA has a hardwired default of 'en_US'
for that.

Test Plan:
Check both English and French tests still work as
intended.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D589

README.md

@@ -143,10 +143,14 @@ Tests can run in different languages. To set the language which will be used for
 variable for the test suite. The results of this will be:
 
 1. The value set will be typed into the language search box in anaconda.
-2. Only needles with the tags `ENV-LANGUAGE-ALL` and `ENV-LANGUAGE-(LANGUAGE)` will be used for the test (where `(LANGUAGE)` is the value set, forced to upper-case).
+2. Any needle with at least one tag that starts with `LANGUAGE` will be unregistered unless it has the tag `LANGUAGE-(LANGUAGE)` (where `(LANGUAGE)` is the value set, forced to upper-case).
 3. As a consequence, the chosen language will be selected at the anaconda Welcome screen.
 
 It is very important, therefore, that needles have the correct tags. Any needle which is expected to match for
-tests run in *any* language must have the `ENV-LANGUAGE-ALL` tag. Other needles must have the appropriate tag(s)
+tests run in *any* language must have no `LANGUAGE` tags. Other needles must have the appropriate tag(s)
-for the languages they are expected to match. The safest option if you are unsure is to set `ENV-LANGUAGE-ALL`.
+for the languages they are expected to match. The safest option if you are unsure is to set no `LANGUAGE` tag(s).
 The only danger of this is that missing translations may not be caught.
+
+Note that tags of the form `ENV-INSTLANG-(anything)` are useless artefacts and should be removed. Due to
+unfortunate design in openQA, any needle created in the web UI needle editor will have a `ENV-INSTLANG-en_US`
+tag by default; this should be removed before submission.

main.pm

@@ -31,16 +31,37 @@ sub unregister_needle_tags($) {
     for my $n (@a) { $n->unregister(); }
 }
 
-# Un-register all needles *except* those with specified tags (arg is a
+# The purpose of this function is to un-register all needles which have
-# list of tags)
+# at least one tag that starts with a given string (the 'prefix'), if
-sub unregister_except_tags {
+# it does not have any tag that matches the pattern 'prefix-value', for
+# any of the values given in an array. The first argument passed must
+# be the prefix; the second must be a reference to the array of values.
+# For instance, if the 'prefix' is LANGUAGE and the 'values' are
+# ENGLISH and FRENCH, this function would un-reference a needle which
+# had only the tag 'LANGUAGE-DUTCH', but it would keep a needle which
+# had the tag 'LANGUAGE-ENGLISH', or a needle with no tag starting in
+# 'LANGUAGE-' at all.
+sub unregister_prefix_tags {
+    my ($prefix, $valueref) = @_;
     NEEDLE: for my $needle ( needle::all() ) {
-        for my $tag (@_) {
+        my $unregister = 0;
-            # If the needle has any of the tags, we skip to the next needle
+        for my $tag ( @{$needle->{'tags'}} ) {
-            next NEEDLE if ($needle->has_tag($tag));
+            if ($tag =~ /^\Q$prefix/) {
+                # We have at least one tag matching the prefix, so we
+                # *MAY* want to un-register the needle
+                $unregister = 1;
+                for my $value ( @{$valueref} ) {
+                    # At any point if we hit a prefix-value match, we
+                    # know we need to keep this needle and can skip
+                    # to the next
+                    next NEEDLE if ($tag eq "$prefix-$value");
+                }
+            }
         }
-        # We only get here for a needle if we didn't match any of the tags
+        # We get here if we hit no prefix-value match, but we only want
-        $needle->unregister();
+        # to unregister the needle if we hit any prefix match, i.e. if
+        # 'unregister' is 1.
+        $needle->unregister() if ($unregister);
     }
 }
 
@@ -56,11 +77,11 @@ sub cleanup_needles() {
         unregister_needle_tags("INSTALLER-smallhub");
     }
 
-    # Unregister non-language-appropriate needles. Needles which are expected
+    # Unregister non-language-appropriate needles. See unregister_except_
-    # to match all languages have ENV-LANGUAGE-ALL tag.
+    # tags for details; basically all needles with at least one LANGUAGE-
-    my $lang = uc(get_var('LANGUAGE')) || 'ENGLISH';
+    # tag will be unregistered unless they match the current langauge.
-    $lang = 'ENV-LANGUAGE-'.$lang;
+    my $langref = [ get_var('LANGUAGE') || 'english' ];
-    unregister_except_tags($lang, 'ENV-LANGUAGE-ALL');
+    unregister_prefix_tags('LANGUAGE', $langref);
 }
 $needle::cleanuphandler = \&cleanup_needles;
 

needles/anaconda_error.json

@@ -18,7 +18,6 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server",
-    "ENV-LANGUAGE-ALL",
     "anaconda_error"
   ],
   "properties": []

needles/anaconda_install_destination_delete_all_btn.json

@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_install_destination_delete_all_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_install_destination_encrypt_data.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_encrypt_data",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_destination_encrypt_data_french.json

@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_install_destination_encrypt_data",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_destination_pony.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_destination_pony",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_destination_pony_selected.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_destination_pony",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-develop"
   ],
   "area": [

needles/anaconda_install_destination_reclaim_space_btn.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_destination_reclaim_space_delete_btn.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_delete_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_destination_reclaim_space_first_partition.json

@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_first_partition",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_install_destination_reclaim_space_first_partition_ntfs.json

@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_first_partition",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-universal"
   ],
   "properties": []

needles/anaconda_install_destination_reclaim_space_second_partition.json

@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_second_partition",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_install_destination_reclaim_space_shrink_btn.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_shrink_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-develop"
   ],
   "area": [

needles/anaconda_install_destination_reclaim_space_shrink_slider.json

@@ -2,7 +2,6 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-develop",
-    "ENV-LANGUAGE-ALL",
     "anaconda_install_destination_reclaim_space_shrink_slider"
   ],
   "area": [

needles/anaconda_install_destination_save_passphrase.json

@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_install_destination_save_passphrase",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_install_destination_save_passphrase_french.json

@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_install_destination_save_passphrase",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_destination_select_disk_1.json

@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_install_destination_select_disk_1",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_destination_select_disk_2.json

@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_install_destination_select_disk_2",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_done.json

@@ -19,6 +19,6 @@
         "anaconda_install_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }

needles/anaconda_install_done_french.json

@@ -19,6 +19,6 @@
         "anaconda_install_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }

needles/anaconda_install_root_password.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_install_root_password",
         "ENV-DESKTOP-default",
-        "ENV-DISTRI-fedora",
+        "ENV-DISTRI-fedora"
-        "ENV-LANGUAGE-ALL"
     ]
 }

needles/anaconda_install_root_password_screen.json

@@ -18,7 +18,7 @@
   "tags": [
     "anaconda_install_root_password_screen",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "properties": []

needles/anaconda_install_root_password_screen_french.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_install_root_password_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_root_password_screen_olddpi.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_install_root_password_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_source_check_repo_added.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_source_check_repo_added",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_source_check_repo_added_eurlatgr.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_source_check_repo_added",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_source_check_repo_added_inst_repo.json

@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_source_check_repo_added",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_install_source_http_selected.json

@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_install_source_http_selected",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_source_https_selected.json

@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_install_source_http_selected",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_source_on_the_network.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_source_on_the_network",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_source_repo_select_mirrorlist.json

@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_install_source_repo_select_mirrorlist",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_install_user_created_french.json

@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 18,
+            "type": "match",
+            "width": 48,
+            "xpos": 787,
+            "ypos": 190
+        }
+    ],
+    "tags": [
+        "anaconda_install_user_created",
+        "LANGUAGE-french"
+    ]
+}

needles/anaconda_install_user_creation.json

@@ -11,7 +11,6 @@
     "tags": [
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "anaconda_install_user_creation"
     ]
 }

needles/anaconda_install_user_creation_make_admin.json

@@ -11,7 +11,7 @@
     "tags": [
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "anaconda_install_user_creation_make_admin"
     ]
 }

needles/anaconda_install_user_creation_make_admin_french.json

@@ -11,7 +11,7 @@
     "tags": [
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "anaconda_install_user_creation_make_admin"
     ]
 }

needles/anaconda_install_user_creation_screen.json

@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_install_user_creation_screen",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_install_user_creation_screen_french.json

@@ -19,7 +19,7 @@
     "tags": [
         "anaconda_install_user_creation_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_install_user_creation_screen_olddpi.json

@@ -19,7 +19,7 @@
     "tags": [
         "anaconda_install_user_creation_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_main_hub_begin_installation.json

@@ -12,6 +12,6 @@
         "anaconda_main_hub_begin_installation",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }

needles/anaconda_main_hub_begin_installation_french.json

@@ -12,6 +12,6 @@
         "anaconda_main_hub_begin_installation",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }

needles/anaconda_main_hub_install_destination.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_main_hub_install_destination",
         "ENV-DESKTOP-default",
-        "ENV-DISTRI-fedora",
+        "ENV-DISTRI-fedora"
-        "ENV-LANGUAGE-ALL"
     ]
 }

needles/anaconda_main_hub_install_destination_already_done.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_main_hub_install_destination",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_main_hub_installation_source.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_main_hub_installation_source",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_main_hub_live.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_main_hub",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "INSTALLER-smallhub"
   ],
   "area": [

needles/anaconda_main_hub_nonlive.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_main_hub",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_main_hub_select_packages.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_main_hub_select_packages",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_manual_partitioning.json

@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_manual_partitioning",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_minimal_highlighted.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_highlighted",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_minimal_highlighted_french.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_highlighted",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_minimal_selected.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_selected",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_minimal_selected_french.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_selected",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_accept_changes.json

@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_part_accept_changes",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_part_add_mountpoint.json

@@ -12,7 +12,7 @@
   "tags": [
     "anaconda_part_add_mountpoint",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_part_automatic.json

@@ -11,7 +11,7 @@
     "tags": [
     "anaconda_part_automatic",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_delete.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_delete",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-generic_boot"
     ]
 }

needles/anaconda_part_desired_capacity.json

@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_part_desired_capacity",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "properties": []

needles/anaconda_part_device_type.json

@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_part_device_type",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_part_device_type_raid.json

@@ -12,7 +12,6 @@
   "tags": [
     "anaconda_part_device_type_raid",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }

needles/anaconda_part_fs_ext3.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_fs_ext3",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_fs_ext4_preselected.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_fs",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_fs_xfs_preselected.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_fs",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_list_box_boot.json

@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_part_list_box_boot",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_part_list_box_button.json

@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_part_list_box_button",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_part_list_box_root.json

@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_part_list_box_root",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/anaconda_part_list_box_swap.json

@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_part_list_box_swap",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_plus_button.json

@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_part_plus_button",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_scheme.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_scheme",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_scheme_btrfs.json

@@ -11,7 +11,6 @@
     "tags": [
     "anaconda_part_scheme_btrfs",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_scheme_lvm.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_scheme_lvm",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_scheme_lvmthin.json

@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_part_scheme_lvmthin",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_scheme_standard.json

@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_part_scheme_standard",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_select_root.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_select_root",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_select_root_already_selected.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_select_root",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_part_select_swap.json

@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_part_select_swap",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-generic_boot"
     ]
 }

needles/anaconda_part_update_settings.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_part_update_settings",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_rawhide_accept_fate.json

@@ -2,7 +2,7 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "anaconda_rawhide_accept_fate"
   ],
   "area": [

needles/anaconda_rawhide_accept_fate_french.json

@@ -11,7 +11,7 @@
     "tags": [
         "ENV-DISTRI-fedora",
         "ENV-FLAVOR-server",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "anaconda_rawhide_accept_fate"
     ]
 }

needles/anaconda_report_btn.json

@@ -11,7 +11,6 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server",
-    "ENV-LANGUAGE-ALL",
     "anaconda_report_btn"
   ],
   "properties": []

needles/anaconda_select_install_lang.json

@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_select_install_lang",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_select_install_lang_continue.json

@@ -12,6 +12,6 @@
         "anaconda_select_install_lang_continue",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }

needles/anaconda_select_install_lang_continue_french.json

@@ -12,6 +12,6 @@
         "anaconda_select_install_lang_continue",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }

needles/anaconda_select_install_lang_english_filtered.json

@@ -19,6 +19,6 @@
         "anaconda_select_install_lang_filtered",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
-}
+}

needles/anaconda_select_install_lang_english_selected.json

@@ -12,7 +12,7 @@
         "anaconda_select_install_lang_selected",
         "anaconda_select_install_lang_filtered",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_select_install_lang_french_filtered.json

@@ -19,6 +19,6 @@
     "anaconda_select_install_lang_filtered",
     "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-FRENCH"
+    "LANGUAGE-french"
   ]
 }

needles/anaconda_select_install_lang_french_selected.json

@@ -12,7 +12,7 @@
         "anaconda_select_install_lang_selected",
         "anaconda_select_install_lang_filtered",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_select_install_lang_input.json

@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_select_install_lang_input",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }

needles/anaconda_spoke_done.json

@@ -12,6 +12,6 @@
         "anaconda_spoke_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }

needles/anaconda_spoke_done_french.json

@@ -12,6 +12,6 @@
         "anaconda_spoke_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }

needles/anaconda_spoke_done_olddpi.json

@@ -12,6 +12,6 @@
         "anaconda_spoke_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }

needles/anaconda_user_creation_password_input.json

@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_user_creation_password_input",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "properties": [],

needles/anaconda_user_creation_password_input_french.json

@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_user_creation_password_input",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }

needles/boot_enter_passphrase.json

@@ -2,7 +2,6 @@
   "tags": [
     "boot_enter_passphrase",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/boot_enter_passphrase2.json

@@ -2,7 +2,6 @@
   "tags": [
     "boot_enter_passphrase",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/bootloader_bios_live.json

@@ -11,7 +11,6 @@
   "tags": [
     "bootloader",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }

needles/bootloader_bios_offline.json

@@ -11,7 +11,6 @@
   "tags": [
     "bootloader",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }

needles/bootloader_uefi.json

@@ -4,7 +4,6 @@
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server_boot",
     "ENV-FLAVOR-workstation_live",
-    "ENV-LANGUAGE-ALL",
     "ENV-UEFI-1",
     "bootloader_uefi"
   ],

needles/console_command_success.json

@@ -2,7 +2,6 @@
   "tags": [
     "console_command_success",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [

needles/console_command_success2.json

@@ -2,7 +2,6 @@
   "tags": [
     "console_command_success",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [