Rename Islamic calendars to Hijri (#6225)

#6214 * ~Can we change the era code to be `hijri` instead of `islamic`?~ * ~it could also be `ah`, given that other calendars use (Latin) abbreviations~ * `calendrical_calculations` also uses "islamic", do we want to change that?
unicode-org · Mar 5, 2025 · dd4a7e5 · dd4a7e5
1 parent 19a1d38
commit dd4a7e5
Show file tree

Hide file tree

Showing 436 changed files with 2,794 additions and 2,836 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - Components
     - General
         - ...
+    - `icu_calendar`
+        - Rename `Islamic` calendars to `Hijri` (unicode-org#6214)
     - `icu_collections`
         - Remove some panics from `CodePointTrie`, which should no longer pull in panic machinery even with arithmetic panics enabled for lookup (unicode-org#6204)
 - Data model and providers

diff --git a/components/calendar/benches/convert.rs b/components/calendar/benches/convert.rs
@@ -72,25 +72,25 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/observational",
-        icu::calendar::cal::IslamicObservational::new_always_calculating(),
+        icu::calendar::cal::HijriObservational::new_always_calculating(),
     );
 
     bench_calendar(
         &mut group,
         "calendar/islamic/civil",
-        icu::calendar::cal::IslamicCivil::new(),
+        icu::calendar::cal::HijriCivil::new(),
     );
 
     bench_calendar(
         &mut group,
         "calendar/islamic/ummalqura",
-        icu::calendar::cal::IslamicUmmAlQura::new_always_calculating(),
+        icu::calendar::cal::HijriUmmAlQura::new_always_calculating(),
     );
 
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
-        icu::calendar::cal::IslamicTabular::new(),
+        icu::calendar::cal::HijriTabular::new(),
     );
 
     group.finish();

diff --git a/components/calendar/benches/date.rs b/components/calendar/benches/date.rs
@@ -197,29 +197,24 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::cal::IslamicCivil::new(),
+        icu::calendar::cal::HijriCivil::new(),
         |y, m, d| {
-            Date::try_new_islamic_civil_with_calendar(
-                y,
-                m,
-                d,
-                icu::calendar::cal::IslamicCivil::new(),
-            )
-            .unwrap()
+            Date::try_new_hijri_civil_with_calendar(y, m, d, icu::calendar::cal::HijriCivil::new())
+                .unwrap()
         },
     );
 
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::cal::IslamicTabular::new(),
+        icu::calendar::cal::HijriTabular::new(),
         |y, m, d| {
-            Date::try_new_islamic_tabular_with_calendar(
+            Date::try_new_hijri_tabular_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::cal::IslamicTabular::new(),
+                icu::calendar::cal::HijriTabular::new(),
             )
             .unwrap()
         },
@@ -229,13 +224,13 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/ummalqura",
         &fxs,
-        icu::calendar::cal::IslamicUmmAlQura::new_always_calculating(),
+        icu::calendar::cal::HijriUmmAlQura::new_always_calculating(),
         |y, m, d| {
             Date::try_new_ummalqura_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::cal::IslamicUmmAlQura::new_always_calculating(),
+                icu::calendar::cal::HijriUmmAlQura::new_always_calculating(),
             )
             .unwrap()
         },
@@ -245,13 +240,13 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/observational",
         &fxs,
-        icu::calendar::cal::IslamicObservational::new_always_calculating(),
+        icu::calendar::cal::HijriObservational::new_always_calculating(),
         |y, m, d| {
-            Date::try_new_observational_islamic_with_calendar(
+            Date::try_new_observational_hijri_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::cal::IslamicObservational::new_always_calculating(),
+                icu::calendar::cal::HijriObservational::new_always_calculating(),
             )
             .unwrap()
         },