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

Replace "forum" by "group" #13183

Merged

Conversation

MrPetovan
Copy link
Collaborator

Closes #13114

This is fresh off the press, I haven't ran this branch on any of my nodes just yet.

@MrPetovan MrPetovan added this to the 2023.09 milestone May 30, 2023
@annando
Copy link
Collaborator

annando commented May 30, 2023

Would be great if you could test it a day or so on one of your systems.

@MrPetovan
Copy link
Collaborator Author

Of course, I just want some eyeballs on it first, especially for the hosted German documentation pages.

@annando
Copy link
Collaborator

annando commented May 30, 2023

I'm not sure if I will have a look at it today. Half of my day at work I did code reviews on pull requests ...

Copy link
Collaborator

@annando annando left a comment

Choose a reason for hiding this comment

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

Since we haven't yet renamed the circles in the German documentation, I guess we shouldn't rename the forums in the German documentation, since otherwise it really gets confusing having "Gruppen" (Formerly known as "Forum") and "Gruppen" (still not renamed).

Auf dieser Seite findest du eine Zusammenstellung von Gruppen, Foren und bekannten Seiten.
Gruppen sind keine realen Personen.
Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet.
Auf dieser Seite findest du eine Zusammenstellung von Gruppen, Gruppen und bekannten Seiten.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess that we haven't yet decided on how name circles in German. Possibly we should name them "Circles" just as a possibility to distinct them from the groups.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This page was also confusing in English, I ended up wrongly replacing a "group" (page) by "circle" in the first PR. I've fixed the mistake in this PR but not on the German translation for obvious reasons.

Which means neither instance of "Gruppen" in this file needs to be replaced by "Circles", it turns out we've been mentioning forums as "groups" for a while here.

Copy link
Collaborator

Choose a reason for hiding this comment

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

We could use the English word "Circle" in the German translation. Then we can use "Gruppen" without a problem.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is what I went for. This page needs a touch-up like the English one did since the original "group" term in either language didn't mean "contact group".

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've edited the German version to be in line with the English version.

@MrPetovan MrPetovan force-pushed the task/13114-rename-forum-to-group branch from a048406 to 3f80b7a Compare June 2, 2023 17:53
@@ -240,7 +240,9 @@ public static function searchContact(string $search, string $mode, int $page = 1
$return = array_map(function ($result) {
static $contactType = [
'People' => Contact::TYPE_PERSON,
// Kept for backward compatibility
'Forum' => Contact::TYPE_COMMUNITY,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This can be removed safely. The variable $contactType is only used at a single location, some lines below.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

What about older directory versions issuing this value in their results?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh, I misread the code ...

@annando
Copy link
Collaborator

annando commented Jun 3, 2023

Sorry for the delayed check, I'm currently busy with a lot of stuff.

@annando annando merged commit 483cc45 into friendica:develop Jun 3, 2023
7 checks passed
@MrPetovan MrPetovan deleted the task/13114-rename-forum-to-group branch June 4, 2023 00:44
@annando
Copy link
Collaborator

annando commented Jun 4, 2023

There are some optical issues now:
grafik

@MrPetovan
Copy link
Collaborator Author

It's not a bug, it's a feature!™

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.

Rename contact groups to circles and user forums to groups
2 participants