Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Properly space Day One name #19977

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Conversation

dcalhoun
Copy link
Member

@dcalhoun dcalhoun commented Jan 18, 2024

The Day One brand name includes a space between the two words.

Screenshots
Before After
day-one-before day-one-after

To Test:

  1. Check out the branch and apply the following testing diff:

    Testing Diff
    diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptAttribution.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptAttribution.kt
    index 178c7da39b..d5947570ba 100644
    --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptAttribution.kt
    +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptAttribution.kt
    @@ -36,11 +36,11 @@ enum class BloggingPromptAttribution(
              * for the BLOGANUARY campaign at this point, but might be in the future.
              */
             fun fromPrompt(
    -            prompt: BloggingPromptModel
    -        ): BloggingPromptAttribution = if (!prompt.bloganuaryId.isNullOrBlank()) {
    +            @Suppress("UNUSED_PARAMETER") prompt: BloggingPromptModel
    +        ): BloggingPromptAttribution = if (false) {
                 BLOGANUARY
             } else {
    -            fromString(prompt.attribution)
    +            fromString("dayone")
             }
         }
     }
    
  2. Build and launch the app.

  3. Load the My Site tab and verify the "Day One" name in the Blogging Prompt attribution includes a space.

Regression Notes

  1. Potential unintended areas of impact
    Blogging Prompts, translations.
  2. What I did to test those areas of impact (or what existing automated tests I relied on)
    Interacted with Blogging Prompts, test different device languages.
  3. What automated tests I added (or what prevented me from doing so)
    Automated tests felt unnecessary for a typo.

PR Submission Checklist:

  • I have completed the Regression Notes.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

UI Changes Testing Checklist:

  • Portrait and landscape orientations.
  • Light and dark modes.
  • Fonts: Larger, smaller and bold text.
  • High contrast.
  • Talkback.
  • Languages with large words or with letters/accents not frequently used in English.
  • Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
  • Large and small screen sizes. (Tablet and smaller phones)
  • Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)

The Day One brand name includes a space between the two words.
@dcalhoun dcalhoun added this to the 24.1 milestone Jan 18, 2024
@dcalhoun dcalhoun marked this pull request as ready for review January 18, 2024 14:36
@dcalhoun dcalhoun assigned dcalhoun and unassigned dcalhoun Jan 18, 2024
@dcalhoun dcalhoun requested a review from thomashorta January 18, 2024 14:36
@dangermattic
Copy link
Collaborator

1 Warning
⚠️ This PR is assigned to the milestone 24.1. This milestone is due in less than 4 days.
Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jan 18, 2024

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr19977-7013a72
Commit7013a72
Direct Downloadjetpack-prototype-build-pr19977-7013a72.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jan 18, 2024

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr19977-7013a72
Commit7013a72
Direct Downloadwordpress-prototype-build-pr19977-7013a72.apk
Note: Google Login is not supported on these builds.

@peril-wordpress-mobile
Copy link

Warnings
⚠️ This PR is assigned to a milestone which is closing in less than 4 days Please, make sure to get it merged by then or assign it to a later expiring milestone

Generated by 🚫 dangerJS

Treat translation strings as immutable to avoid discrepancies between
releases and the `trunk` branch.
Copy link

codecov bot commented Jan 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (916c1cc) 40.45% compared to head (7013a72) 40.45%.
Report is 21 commits behind head on trunk.

Additional details and impacted files
@@           Coverage Diff           @@
##            trunk   #19977   +/-   ##
=======================================
  Coverage   40.45%   40.45%           
=======================================
  Files        1440     1440           
  Lines       66513    66513           
  Branches    10957    10957           
=======================================
  Hits        26905    26905           
  Misses      37121    37121           
  Partials     2487     2487           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@thomashorta thomashorta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes LGTM, thanks @dcalhoun !

@thomashorta thomashorta merged commit 6911d7f into trunk Jan 19, 2024
20 checks passed
@thomashorta thomashorta deleted the fix/properly-space-day-one-name branch January 19, 2024 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants