Skip to content

sync: merge upstream/main into feat/pikpak-cloud-offline#9

Merged
NihilDigit merged 2 commits into
feat/pikpak-cloud-offlinefrom
claude/sync-upstream-feat-soyKT
Apr 28, 2026
Merged

sync: merge upstream/main into feat/pikpak-cloud-offline#9
NihilDigit merged 2 commits into
feat/pikpak-cloud-offlinefrom
claude/sync-upstream-feat-soyKT

Conversation

@NihilDigit
Copy link
Copy Markdown
Owner

Summary

Test plan

  • CI 通过
  • 检查 ProfilePopup 相关 i18n 字符串在中英文下显示正常

https://claude.ai/code/session_01CREeCt6g3VuQTKaTbmCFpG


Generated by Claude Code

wellorbetter and others added 2 commits April 29, 2026 00:17
open-ani#2944)

* fix(i18n): replace hardcoded strings in ProfilePopupLayout with i18n resources open-ani#2938

- Add 7 new string keys for the account popup (not_logged_in, edit_profile,
  login_register, logout, logout_confirm, logout_button, cancel)
- Provide translations in en, zh-CN, zh-HK, zh-TW
- Update ProfilePopupLayout.kt and ProfilePopup.kt to use stringResource(Lang.xxx)

* fix(i18n): add missing imports for i18n extension properties in ProfilePopup
@NihilDigit NihilDigit merged commit c9f5ff2 into feat/pikpak-cloud-offline Apr 28, 2026
16 checks passed
@NihilDigit NihilDigit deleted the claude/sync-upstream-feat-soyKT branch May 7, 2026 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants