mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-20 17:15:41 +00:00
Number formats: honour the B1/B2 calendar prefixes (Hijri dates for B2) (#1918)
* M12.AR6: honour the B1/B2 calendar prefixes in number formats (Hijri for B2) * M12.AR6: match Excel's B1/B2 behaviour measured in review Changes from a reviewer's Excel run (TEXT and Range.NumberFormat): - A [$-...] locale tag before B2 keeps the date Gregorian (prefix still hidden); B2[$-401] stays Hijri. - Any other unquoted B and digit (B3dd, dd/mm/yyyyB2, dd B2 mm), and B2 before a number format (B20.00), make the code invalid: TEXT gives #VALUE!, a cell shows General, as for a code over 255 characters. - Under B2, ddd and dddd show the Arabic weekday name (full name for both). - Serial 60 has no Hijri date: TEXT gives #VALUE!, a cell shows ####. - Serial 0 shows as serial 1 (29/08/1317). Also fixes a break from merging main: days_from_civil now returns 0 for day 0 and 29 February 1900, which sent serials 0 and 60 to 1970 (23/10/1389) under B2. The Hijri day count no longer passes those dates. Docs: localization-parity states the behaviour, including the one measured case not matched (mmmm next to dddd prints the weekday in Excel). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M12.AR6: Hijri leap year in cycle year 15, not 16, as Excel shows A reviewer compared Excel's B2yyyy-mm-dd on 43,512 serials with this formula: it disagreed by one day on 1,372, all in cycle years 15 and 16, and moving the leap year from 16 to 15 left no disagreement. The leap years are now 2, 5, 7, 10, 13, 15, 18, 21, 24, 26 and 29 (still 10,631 days a cycle). The count of leap years before a year becomes (4 + 11y) div 30; it differs from the old (3 + 11y) div 30 only when y = 16 (mod 30), which is exactly the move from 16 to 15. The inverse's year estimate can now be one year off at a boundary and is corrected by one step. Tests: Excel values for 2 March 2005 (1426-01-21) and 29 January 2006 (1426-12-29) plus the 1425/1426 year boundaries they imply, the reviewer's other anchors, and exhaustive checks: year, month and 30-year cycle lengths for Hijri years 1 to 10,000; day -> Hijri -> day round trip and day-by-day succession for every day from 1 Muharram 1 AH to one cycle past 31 December 9999; every 1900-system serial 1 to 2,958,465 (except 60). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M12.AR6: match B1/B2 details checked in Excel 16.0 build 20527 Compared GridCraft with Excel 16.0 (build 20527, en-US) through COM: TEXT with B2dd/mm/yyyy on every serial from 1 to 2,958,465 (no difference), and about 1,750 format/value pairs through both a cell's NumberFormat and TEXT. Fixed what differed and is in scope: - Two-word Hijri month names use a no-break space (U+00A0), as Excel does. - B1 before a number format is rejected like B2 (B10.00, B1#,##0). - Prefix runs: a repeated prefix is accepted (B2B2, B2b2, [Red]B2B2, B1B1); a mixed one (B1B2, B2B1), more digits (B12, B21, B02), a prefix after a tag or space (B2[Red]B2, B2 B2) and an escaped \B2 are rejected. - Serial 60 under B2 is #VALUE! for any date or clock part (hh:mm, ss, AM/PM), not only date parts; [h] and literal-only sections still show. Regression tests use the Excel values (all 12 month and 7 weekday names, the accepted and rejected codes, serial 60). Not changed, listed in the docs: Excel's weekday/month-name mix-ups when ddd(d) and mmm(m) share a B2 section, weekday-only B2 sections (real weekday for serials 0-59, #VALUE! for the last days of 9999), and Buddhist-year b/bb/bbbb tokens. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com> Co-authored-by: FredApps <FredApps@users.noreply.github.com>
This commit is contained in:
6 files changed
+563
-21
No files matched your search
@@ -1,6 +1,6 @@
|
||||
# Localization parity
|
||||
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-27 · **Change:** minor (AutoFit estimates Arabic text width from measured glyph widths); previously minor (missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4
|
||||
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-27 · **Change:** minor (number formats honour the `B1`/`B2` calendar prefixes, checked against Excel; earlier: missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks); previously minor (AutoFit estimates Arabic text width from measured glyph widths); previously minor (missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4
|
||||
|
||||
Per-language status against Excel, which ships its UI in dozens of languages (Windows language
|
||||
packs cover 100+), with localized function names, argument separators, number and date formats,
|
||||
@@ -40,7 +40,21 @@ right-to-left sheets and full complex-script support. Part of
|
||||
- **en-US only formulas and formats.** Function names, `,` argument separator, `.` decimal
|
||||
separator, en-US number and date formats (`crates/numfmt` says "en-US only"). Users ask for
|
||||
localized function names and `;` separators (#45). German with localized numbers and formulas
|
||||
is in PR #163 (open).
|
||||
is in PR #163 (open). The `B1` (Gregorian) and `B2` (Hijri) calendar prefixes that Arabic
|
||||
Excel writes at the start of a format section are hidden; under `B2` the year, month number,
|
||||
day, month names and weekday names (Arabic; `mmm` and `ddd` show the full name) count in the
|
||||
tabular Hijri calendar (leap years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26 and 29 of each 30-year
|
||||
cycle). Checked against Excel 16.0 (build 20527, en-US) on every serial from 1 to 2,958,465
|
||||
and about 1,700 format/value pairs: a `[$...]` locale or currency tag before `B2` keeps the
|
||||
date Gregorian; a repeated prefix (`B2B2`) is accepted; any other `B` and digit (`B3`,
|
||||
`B12`, `B1B2`, `dd B2`, `\B2`), or a prefix before a number format (`B10.00`), is
|
||||
rejected (`TEXT` gives `#VALUE!`, a cell shows General); serial 60 shows `#VALUE!` under `B2`
|
||||
for any date or clock part; two-word month names use a no-break space. Differs from Excel:
|
||||
in a `B2` section with a weekday and a month name, Excel prints the weekday for
|
||||
`mmmm`/`mmmmm` after `ddd`/`dddd`, and the weekday numbered by the month (Saturday from
|
||||
month 7) for `ddd`/`dddd` after `mmm`/`mmmm`; a `B2` section showing only the weekday uses
|
||||
the real weekday for serials 0–59 and gives `#VALUE!` for the last days of 9999. Excel's
|
||||
Buddhist-year `b`/`bb`/`bbbb` tokens are not supported.
|
||||
- **Script support.** System-font fallback for CJK, Thai and Hebrew landed in #38 (closes #32;
|
||||
#142 is still open pending confirmation). Native CJK fallback also probes Flatpak's read-only
|
||||
`/run/host/fonts`, `/run/host/local-fonts` and `/run/host/user-fonts` layouts, so installed
|
||||
@@ -110,6 +124,7 @@ language (none so far) and of localized function names.
|
||||
|
||||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-27 | minor | Number formats honour the `B1`/`B2` calendar prefixes: never shown; `B2` renders year, month, day and Arabic month and weekday names in the tabular Hijri calendar (1 Jan 2001 = 6 Shawwal 1421; leap years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26 and 29 of the 30-year cycle, which is what Excel shows). Checked against Excel 16.0 (build 20527, en-US) on every serial and about 1,700 format/value pairs: a locale or currency tag before `B2` keeps the date Gregorian, a misplaced `B` and digit or a prefix before a number format is rejected, serial 60 has no Hijri date, serial 0 shows as serial 1, two-word month names use a no-break space. Not matched: Excel's weekday/month-name mix-ups in one `B2` section and its weekday-only quirks |
|
||||
| 2026-10-27 | minor | AutoFit column width, wrapped-row height and PivotTable column fit estimate Arabic letters at ~0.48 em (measured 0.36–0.53 em shaped, Noto Sans/Naskh Arabic and DejaVu Sans) instead of 1 em, Arabic-Indic digits as wide as ASCII digits, and give vowel marks and direction marks no width; vowelled Arabic no longer fits ~3.5× too wide |
|
||||
| 2026-10-23 | minor | Missing translations are reported, never a failure: `cargo xtask i18n-report` prints, per language, the strings other catalogs translate and it lacks (plus Spanish function help rows keyed by English the function catalog no longer has) and always passes; `cargo xtask ci` runs it first. Coverage and per-language parity tests and tests of one language's exact wording are gone; UI tests take the expected text from the catalog. Duplicate-key, placeholder, context-prefix and line-shape checks stay |
|
||||
| 2026-10-21 | minor | Romanian interface (`ro`, Română): 970 labels covering every key of the other catalogs (`crates/ui-egui/src/i18n/ro.rs`), `ro-*` system locales, the View-tab switcher and `app.language.set`; context keys show no prefix (File › Options test). English formulas and formats; AI-assisted draft pending native-speaker review |
|
||||
|
||||
Reference in new issue
Block a user