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

update events #10049

Merged
merged 12 commits into from
Sep 20, 2024
Merged

Conversation

dragonchaser
Copy link
Contributor

@dragonchaser dragonchaser commented Sep 13, 2024

refs #9536

Copy link

update-docs bot commented Sep 13, 2024

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch from 1c177a7 to e25ce90 Compare September 13, 2024 12:39
@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch 7 times, most recently from 1e61696 to cc97749 Compare September 17, 2024 09:47
@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch from e1d276f to ad7aaf5 Compare September 17, 2024 11:44
@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch 5 times, most recently from f560695 to 1af3a85 Compare September 17, 2024 15:07
@saw-jan
Copy link
Member

saw-jan commented Sep 18, 2024

build:https://drone.owncloud.com/owncloud/ocis/38989/58/10
web e2e test is failing because the activity message is not right:

Screenshot from 2024-09-18 09-50-07

@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch from 1af3a85 to b0a3ab5 Compare September 18, 2024 05:18
@mmattel
Copy link
Contributor

mmattel commented Sep 18, 2024

I was asked to take a look on Transifex. Two comments:

  • The screenshot above shows the original language (English) from the source code and not something translated. This means, TX is not involved --> We have to look if there is a processing issue somewhere in the chain. Have a detailed look, the name of the space is called .space (dot space) and the filename is not resolved at all.
  • I have taken a look into the German and also other translations and it looks fine, see screenshot below.

image

@saw-jan
Copy link
Member

saw-jan commented Sep 18, 2024

@mmattel the screenshot that I provided above is for web issue and maybe not related to translation.

The problem with translation is that with this PR the message has changed:
en: {user} added {resource} to {folder}
so I think we need change in other translations as well. e.g.:
de: {user} hat {resource} zu {folder} hinzugefügt

Note: {space} is changed to {folder}.

But I don't know how translation works and how to bring changes without merging the PR

@mmattel
Copy link
Contributor

mmattel commented Sep 18, 2024

@saw-jan when looking into TX, there are no open translations for German for activitylog. So everything is up to date there. Note that the sync happens once a night. If there are string changes/additions here in the repo and they are urgently needed, you need to ask Phil for a manual sync, ping me for a translation and Phil needs to trigger sync afterwards again. Then you have the translation down here in this repo.

@saw-jan
Copy link
Member

saw-jan commented Sep 18, 2024

So that means if we merge this PR then the translation will be changed accordingly the next day or with manual sync?

@mmattel
Copy link
Contributor

mmattel commented Sep 18, 2024

@saw-jan we need to make the tests working if one changes translatable text that is not merged. 🐔 🥚

@dragonchaser Q, for couriosity: Why is the target redefined from space to file and not added so we have messages for space and file?

@dragonchaser
Copy link
Contributor Author

@saw-jan we need to make the tests working if one changes translatable text that is not merged. 🐔 🥚

@dragonchaser Q, for couriosity: Why is the target redefined from space to file and not added so we have messages for space and file?

#10049 (comment) miscommunication :)

@mmattel
Copy link
Contributor

mmattel commented Sep 18, 2024

Attention #10072 is adding MessageResourceUpdated based on {space}... we need to take care 😱

UPDATE: #10072 has been adapted to be inline with this PR, merged.

@dragonchaser dragonchaser changed the title split events update events Sep 18, 2024
kobergj
kobergj previously approved these changes Sep 18, 2024
@kobergj kobergj dismissed their stale review September 19, 2024 08:22

I am afraid

@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch 4 times, most recently from 67f2a52 to 5e72a0f Compare September 19, 2024 12:51
@mmattel mmattel requested a review from fschade September 19, 2024 13:19
@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch from 9d67e88 to 3ce4117 Compare September 19, 2024 14:49
@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch from 3ce4117 to b621b98 Compare September 20, 2024 04:39
dragonchaser and others added 12 commits September 20, 2024 11:26
Signed-off-by: Christian Richter <[email protected]>

# Conflicts:
#	services/activitylog/pkg/service/http.go
#	services/activitylog/pkg/service/response.go

# Conflicts:
#	services/activitylog/pkg/service/response.go
Signed-off-by: Christian Richter <[email protected]>
Signed-off-by: Christian Richter <[email protected]>
Signed-off-by: Christian Richter <[email protected]>

Co-authored-by: Martin Mattel <[email protected]>
Co-authored-by: Florian Schade <[email protected]>
Co-authored-by: Julian Koberg <[email protected]>

# Conflicts:
#	services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po
Signed-off-by: Christian Richter <[email protected]>
Signed-off-by: Christian Richter <[email protected]>

Co-authored-by: Julian Koberg <[email protected]>
Co-authored-by: Victor Scharf <[email protected]>
Signed-off-by: Christian Richter <[email protected]>
@dragonchaser dragonchaser force-pushed the fix-activity-parent-ref branch from b621b98 to 2a54adf Compare September 20, 2024 09:26
Copy link

@dragonchaser dragonchaser merged commit e79eddd into owncloud:master Sep 20, 2024
3 checks passed
@dragonchaser dragonchaser deleted the fix-activity-parent-ref branch September 20, 2024 11:07
ownclouders pushed a commit that referenced this pull request Sep 20, 2024
ownclouders pushed a commit that referenced this pull request Sep 21, 2024
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.

6 participants