Correctly produce ethioaa from calendar_algorithm (#7321)

Manishearth · web-flow · commit c82aec21b073 · 2025-12-15T14:11:32.000-08:00
intl402/Temporal/PlainDate/prototype/withCalendar/calendar-time-string

intl402/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string

intl402/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string
diff --git a/components/calendar/src/cal/ethiopian.rs b/components/calendar/src/cal/ethiopian.rs
@@ -250,7 +250,10 @@ impl Calendar for Ethiopian {
     }
 
     fn calendar_algorithm(&self) -> Option<crate::preferences::CalendarAlgorithm> {
-        Some(crate::preferences::CalendarAlgorithm::Ethiopic)
+        match self.0 {
+            EthiopianEraStyle::AmeteMihret => Some(crate::preferences::CalendarAlgorithm::Ethiopic),
+            EthiopianEraStyle::AmeteAlem => Some(crate::preferences::CalendarAlgorithm::Ethioaa),
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,10 @@ impl Calendar for Ethiopian {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`fn calendar_algorithm(&self) -> Option<crate::preferences::CalendarAlgorithm> {`
`253`		`- Some(crate::preferences::CalendarAlgorithm::Ethiopic)`
	`253`	`+ match self.0 {`
	`254`	`+ EthiopianEraStyle::AmeteMihret => Some(crate::preferences::CalendarAlgorithm::Ethiopic),`
	`255`	`+ EthiopianEraStyle::AmeteAlem => Some(crate::preferences::CalendarAlgorithm::Ethioaa),`
	`256`	`+ }`
`254`	`257`	`}`
`255`	`258`	`}`
`256`	`259`