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

CollaboraOnline#6546 enable automatic color in default paragraph style #3103

Merged
merged 1 commit into from
Aug 9, 2023

Conversation

timar
Copy link
Member

@timar timar commented Aug 9, 2023

use the xml token "use-window-font-color" to toggle auto color on.

CollaboraOnline/online#6546

Summary

PR #3000 introduced a regression, the template.odt was no longer locale-agnostic, it was Turkish. We used minimal ODF files, created manually, and when these files were opened by COOL, the language dependent settings were set according to the current locale of the user (document language, paper size, currency etc.).
@caolanm gave a good solution with 80e85b3 but the wrong, unused (?) file was patched, the document.ott.
So I will use @caolan's solution for template.odt, too.

Checklist

  • [ x] Code is properly formatted
  • [ x] Sign-off message is added to all commits
  • [ x] Documentation (manuals or wiki) has been updated or is not required

use the xml token "use-window-font-color" to toggle auto color on.

CollaboraOnline/online#6546
Signed-off-by: Andras Timar <[email protected]>
@timar timar requested a review from juliusknorr August 9, 2023 17:40
@juliusknorr
Copy link
Member

@timar Are you aware of any good tool to review such document changes? Is there any cli tool that could be used to diff the two?

@cypress
Copy link

cypress bot commented Aug 9, 2023

Passing run #505 ↗︎

0 25 0 0 Flakiness 0

Details:

CollaboraOnline#6546 enable automatic color in default paragraph style
Project: Richdocuments Commit: 5defa099b0
Status: Passed Duration: 03:05 💡
Started: Aug 9, 2023 5:44 PM Ended: Aug 9, 2023 5:47 PM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@timar
Copy link
Member Author

timar commented Aug 9, 2023

@timar Are you aware of any good tool to review such document changes? Is there any cli tool that could be used to diff the two?

@juliushaertl I usually unzip the ODF files and use a GUI tool (Beyond Compare). Actually I detected this issue when I wanted to solve the automatic paragraph color in Android app and searche our bug tracker to check if it was reported somewhere else.
Basically here I reverted PR #3000 and added the styles.xml from 80e85b3
Nothing new.

@juliusknorr
Copy link
Member

All right, thanks for the hint.

@juliusknorr juliusknorr merged commit 7a9afb7 into main Aug 9, 2023
35 checks passed
@juliusknorr juliusknorr deleted the private/timar/fix_minimal_odt_template branch August 9, 2023 18:21
@juliusknorr
Copy link
Member

/backport to stable27

@juliusknorr
Copy link
Member

/backport to stable26

@juliusknorr
Copy link
Member

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@thebearon
Copy link
Collaborator

Manual backports:
#3147
#3148
#3149

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