Merge pull request #2268 from drgrice1/userlist-filter-on-translated

Fix filtering the user list by permission level or status for other languages.
openwebwork · Dec 16, 2023 · 2b193de · 2b193de
2 parents 6762d2c + 82f1840
commit 2b193de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -287,10 +287,12 @@ sub filter_handler ($c) {
 		for my $userID (@{ $c->{allUserIDs} }) {
 			if ($field eq 'permission') {
 				push @matchingUserIDs, $userID
-					if ($permissionLabels{ $allUsers{$userID}{permission} } =~ /^$regex/i);
+					if $permissionLabels{ $allUsers{$userID}{permission} } =~ /^$regex/i
+					|| $c->maketext($permissionLabels{ $allUsers{$userID}{permission} }) =~ /^$regex/i;
 			} elsif ($field eq 'status') {
 				push @matchingUserIDs, $userID
-					if ($ce->status_abbrev_to_name($allUsers{$userID}{status}) =~ /^$regex/i);
+					if $ce->status_abbrev_to_name($allUsers{$userID}{status}) =~ /^$regex/i
+					|| $c->maketext($ce->status_abbrev_to_name($allUsers{$userID}{status})) =~ /^$regex/i;
 			} else {
 				push @matchingUserIDs, $userID if $allUsers{$userID}{$field} =~ /^$regex/i;
 			}

diff --git a/lib/WeBWorK/Localize.pm b/lib/WeBWorK/Localize.pm
@@ -68,7 +68,7 @@ our %Lexicon = (
 		x('ta'),    x('professor'), x('admin'),         x('nobody')
 	],
 
-	'_STATUS' => [ x('Enrolled'), x('Audit'), x('Drop'), x('Proctor') ],
+	'_STATUS' => [ x('Enrolled'), x('Audit'), x('Drop'), x('Proctor'), x('Observer') ],
 );
 
 1;