[PR #5773] [MERGED] [PM-25133] Plural forms #47643

Closed
opened 2026-04-26 15:13:24 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5773
Author: @mKoonrad
Created: 8/22/2025
Status: Merged
Merged: 9/4/2025
Merged by: @SaintPatrck

Base: mainHead: plural


📝 Commits (10+)

  • 412dc19 minimum_characters plural
  • be4bfd9 master_password_length_val_message_x plural
  • 8f3bab1 password_exposed plural
  • 3b1c6a5 New typealias for plurals
  • e95eda5 Extension for the Text class to support plurals
  • a509f7b Plurals format fix
  • 869a391 Plurals format fix
  • 75d3105 Added import BitwardenPlurals
  • 08f69e8 Merge branch 'main' into plural
  • 42e8794 Use pluralStringResource

📊 Changes

13 files changed (+91 additions, -20 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModel.kt (+7 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/PasswordStrengthIndicator.kt (+7 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordViewModel.kt (+7 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordViewModel.kt (+7 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+7 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt (+6 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt (+6 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/resetPassword/ResetPasswordViewModelTest.kt (+6 -2)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordViewModelTest.kt (+6 -2)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt (+6 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt (+6 -1)
📝 ui/src/main/kotlin/com/bitwarden/ui/util/Text.kt (+8 -0)
📝 ui/src/main/res/values/strings.xml (+12 -3)

📄 Description

🎟️ Tracking

Missing plural forms #5458

📔 Objective

I added plural for 3 strings. Please review my code. I hope I haven't made any mistakes.

📸 Screenshots

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5773 **Author:** [@mKoonrad](https://github.com/mKoonrad) **Created:** 8/22/2025 **Status:** ✅ Merged **Merged:** 9/4/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `plural` --- ### 📝 Commits (10+) - [`412dc19`](https://github.com/bitwarden/android/commit/412dc19ac17c5bf94808ffbf24f55cbb96d50116) minimum_characters plural - [`be4bfd9`](https://github.com/bitwarden/android/commit/be4bfd9d42b07e6d1316fc296860ce064e0ad8e6) master_password_length_val_message_x plural - [`8f3bab1`](https://github.com/bitwarden/android/commit/8f3bab169c3aab1e972ec9d84f91ba494edbd6dd) password_exposed plural - [`3b1c6a5`](https://github.com/bitwarden/android/commit/3b1c6a5c90ce22037ce2987ccfcfd3abf9d01034) New typealias for plurals - [`e95eda5`](https://github.com/bitwarden/android/commit/e95eda564c71d7f2a274ccbbfe193260997748e6) Extension for the Text class to support plurals - [`a509f7b`](https://github.com/bitwarden/android/commit/a509f7bf70e6becb7dfc06ad019845f9021bc6d4) Plurals format fix - [`869a391`](https://github.com/bitwarden/android/commit/869a39167904dd53b79a0796066fbe5d77323b19) Plurals format fix - [`75d3105`](https://github.com/bitwarden/android/commit/75d3105d16a32518e7fe4d6b199081e3acfecc4b) Added import BitwardenPlurals - [`08f69e8`](https://github.com/bitwarden/android/commit/08f69e8e1ea48505f0e0fe219fe9b36923c38880) Merge branch 'main' into plural - [`42e8794`](https://github.com/bitwarden/android/commit/42e8794eb0dccc5c2052d15b3170b8ba321b4fc6) Use `pluralStringResource` ### 📊 Changes **13 files changed** (+91 additions, -20 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModel.kt` (+7 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/PasswordStrengthIndicator.kt` (+7 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordViewModel.kt` (+7 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordViewModel.kt` (+7 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+7 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt` (+6 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt` (+6 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/resetPassword/ResetPasswordViewModelTest.kt` (+6 -2) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordViewModelTest.kt` (+6 -2) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt` (+6 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt` (+6 -1) 📝 `ui/src/main/kotlin/com/bitwarden/ui/util/Text.kt` (+8 -0) 📝 `ui/src/main/res/values/strings.xml` (+12 -3) </details> ### 📄 Description ## 🎟️ Tracking Missing plural forms #5458 ## 📔 Objective I added plural for 3 strings. Please review my code. I hope I haven't made any mistakes. ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-26 15:13:24 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#47643