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

ui: Rename streams to channels in user-facing strings #707

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

Khader-1
Copy link
Collaborator

Fixes: #630

@Khader-1 Khader-1 requested a review from rajveermalviya May 28, 2024 09:43
@Khader-1 Khader-1 added the buddy review GSoC buddy review needed. label May 28, 2024
@Khader-1 Khader-1 force-pushed the ui-rename-streams-to-channels branch from f12f305 to b407423 Compare May 29, 2024 23:17
Copy link
Collaborator

@rajveermalviya rajveermalviya left a comment

Choose a reason for hiding this comment

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

Thanks, This looks good to me :)

Updating l10n data labels & template variables can be done later, as mentioned in #630 (comment)

@rajveermalviya rajveermalviya added mentor review GSoC mentor review needed. and removed buddy review GSoC buddy review needed. labels May 30, 2024
@gnprice
Copy link
Member

gnprice commented May 31, 2024

Thanks @rajveermalviya for the first review!

When advancing a review to the next stage, let's be sure to ping on the thread the next reviewer, as well as update the labels, to help make sure everyone's on the same page. So @kenclary over to you 🙂

(And please also take a look in your inbox for the invite I've sent for this repo; that'll let you update labels and reviewers in turn, but as a side effect it'll also make it possible to name you in the GitHub "request review" feature, because it'll make GitHub aware that you're connected to this org/repo.)

Copy link
Collaborator

@kenclary kenclary left a comment

Choose a reason for hiding this comment

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

I love a straightforward PR.

@Khader-1 Khader-1 added maintainer review PR ready for review by Zulip maintainers and removed mentor review GSoC mentor review needed. labels Jun 1, 2024
Copy link
Collaborator

@chrisbobbe chrisbobbe left a comment

Choose a reason for hiding this comment

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

Thanks @Khader-1! Some small comments on the commit sequence:

Here are the commits in this revision:

3437549 intl: Use channel instead of stream
1227390 ui: Rename stream to channel in user-facing strings
b407423 notif: Rename stream to channel in displayed notifications

The first and second commits are both about changing strings that appear in the in-app UI, which at this point means all the UI except notifications. So I think it would be fine to squash them into one commit, with a summary line like:

ui: Rename stream to channel in user-facing strings, except notifications 

(If you don't want to squash them together, then each commit should have some more words about exactly which strings are being treated. Basically the second commit is about the in-app strings that are still TODOs for #277.)

I think it would also be fine to squash the notifications-strings commit into that as well (i.e., squashing your revision's three commits into one), and have the commit message say that all user-facing strings are treated in the commit. That's still in line with our convention that a commit represents one coherent idea.

@Khader-1 Khader-1 force-pushed the ui-rename-streams-to-channels branch from b407423 to 98098ba Compare June 6, 2024 09:18
@Khader-1
Copy link
Collaborator Author

Khader-1 commented Jun 6, 2024

Thanks @chrisbobbe! A new revision with a single commit PTAL.

@Khader-1 Khader-1 requested a review from chrisbobbe June 6, 2024 09:18
@chrisbobbe
Copy link
Collaborator

Great, LGTM! Marking for Greg's review now.

@chrisbobbe chrisbobbe added the integration review Added by maintainers when PR may be ready for integration label Jun 6, 2024
@chrisbobbe chrisbobbe requested a review from gnprice June 6, 2024 15:52
@gnprice
Copy link
Member

gnprice commented Jun 7, 2024

Thanks all! Looks good — merging.

I'll add a second commit on top, to update the Japanese translation. 🙂 (That's a small partial translation, which we have just for the sake of end-to-end testing that our i18n setup within the app works, pending #276 which will let us take translation contributions broadly like we do for other Zulip codebases.)

FTR, the searches I did to confirm the rename was complete were:

$ git grep -i '".*stream'
$ git grep -i \''.*stream'

Most of the results were in test/ or in generated *.g.dart files for deserializing the Zulip server API; I looked through the rest and confirmed they were also either in the API, in a comment, or otherwise not user-facing.

Looking forward to seeing most of those — and matches for git grep -i stream more generally — go away as part of #631! That will be a bigger task: definitely many commits, and probably best as several PRs, to keep each PR down to a convenient size for review.

Khader-1 and others added 2 commits June 6, 2024 17:42
Before launch, in order to manage contributions from many people
for translations into many languages, we'll wire things up to
an appropriate platform: zulip#276.  For now, though, we have just this
one partial translation into Japanese, as an end-to-end demo of the
i18n setup within the app, and we maintain it directly in the repo.
Update that translation to reflect this rename.
@gnprice gnprice force-pushed the ui-rename-streams-to-channels branch from 98098ba to e10ed0f Compare June 7, 2024 00:43
@gnprice gnprice merged commit e10ed0f into zulip:main Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integration review Added by maintainers when PR may be ready for integration maintainer review PR ready for review by Zulip maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename "stream" to "channel" in the UI
5 participants