-
Notifications
You must be signed in to change notification settings - Fork 331
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
Replace "forum" by "group" #13183
Conversation
Would be great if you could test it a day or so on one of your systems. |
Of course, I just want some eyeballs on it first, especially for the hosted German documentation pages. |
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 ... |
There was a problem hiding this 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).
doc/de/groupsandpages.md
Outdated
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. |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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".
There was a problem hiding this comment.
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.
4049a62
to
a048406
Compare
- Replace "Forum" by "Gruppe" in German documentation
a048406
to
3f80b7a
Compare
@@ -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, |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 ...
Sorry for the delayed check, I'm currently busy with a lot of stuff. |
It's not a bug, it's a feature!™ |
Closes #13114
This is fresh off the press, I haven't ran this branch on any of my nodes just yet.