Make sure États-Unis displays correctly

nigelhorne · Aug 26, 2023 · 5b2c61d · 5b2c61d
1 parent c4427d2
commit 5b2c61d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ged2site b/ged2site
@@ -10389,9 +10389,9 @@ sub place {
 	if($place eq 'USA') {
 		if($language eq 'French') {
 			if($params{'nopreposition'}) {
-				return ' États-Unis';
+				return " \N{U+00C9}tats-Unis";
 			}
-			return ' aux États-Unis';
+			return " aux \N{U+00C9}tats-Unis";
 		}
 		if($params{'nopreposition'}) {
 			return ' USA';
@@ -10513,7 +10513,9 @@ sub place {
 				$c = $lcm->code2country($code, $lang);
 				if($c ne 'United States') {
 					# utf8::decode($c);
-					$rc->set({ lang => $lang, string => "$1, $c" });
+					my $place = $1;
+					$c =~ s/É/\N{U+00C9}/g;
+					$rc->set({ lang => $lang, string => "$place, $c" });
 				}
 			}
 		} elsif($place !~ /,/ && ($language ne 'English')) {