Show the picker's own AM/PM marker on time rows - #99170
Open
mukhrr wants to merge 1 commit into
Open
Conversation
The row formatted the meridiem with date-fns' active locale while the picker labels it from common.am/common.pm, so German showed 12:00 vorm. above a picker offering AM/PM. Both now read the same translation key.
mukhrr
force-pushed
the
fix/per-diem-time-meridiem
branch
from
August 21, 2026 10:02
3d5836e to
799a157
Compare
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
mukhrr
marked this pull request as ready for review
August 21, 2026 10:07
melvin-bot
Bot
requested review from
JmillsExpensify and
chuckdries
and removed request for
a team
August 21, 2026 10:07
|
@chuckdries Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Contributor
Author
|
well, created this PR per #98110 (comment). @blimpich can we have a dedicated issue for this?! thanks cc @aimane-chnaif |
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
The time row formatted its AM/PM marker with
date-fnsunder the app language (vorm./nachm.in German), while the picker that edits it labels its buttons fromcommon.am/common.pm(AM/PM). Same value, two different markers.Added
DateUtils.getTime12HourWithTranslatedPeriod, which reads the marker from the key the picker already uses, and used it on the Per Diem time rows and the custom status Time row. Affects de, es and nl. fr, it, pl, pt-BR, ja and zh-hans already matched and are unchanged.extractTime12Houris untouched, becauseTimePickerparses its output back under the same locale and #98110 relies on that to save a German Per Diem.Fixed Issues
$ #98110 (comment)
PROPOSAL:
Tests
12:00 AM/12:00 PM, not12:00 vorm./12:00 nachm.AM/PMbuttons use the same wording as the row, set a time and save03:56 PM, not03:56 nachm., and matches the picker it opensOffline tests
Same as tests. Both rows render from a local draft value, so they behave the same offline.
QA Steps
Same as tests.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari