Disroot/Website
14
18
Fork 16
Code Pull requests 4 Releases Activity

TOS translation date #484

Merged
meaz merged 6 commits from tos_french_date into main 2024-06-09 15:44:31 +02:00
Conversation 9 Commits 6 Files changed 7 +7 -7
meaz commented 2024-05-02 07:29:26 +02:00
Owner
Copy link

To be merged only once Fede's PR on TOS is merged

To be merged only once Fede's PR on TOS is merged
antilopa was assigned by meaz 2024-05-02 07:29:26 +02:00
avg_joe was assigned by meaz 2024-05-02 07:29:26 +02:00
fede was assigned by meaz 2024-05-02 07:29:26 +02:00
muppeth was assigned by meaz 2024-05-02 07:29:26 +02:00
meaz added 1 commit 2024-05-02 07:29:27 +02:00
avg_joe commented 2024-05-03 17:14:42 +02:00
Owner
Copy link
  1. don't think we did consent round on that.
  2. DE and IT translations are missing
  • Agree on text
  • FR
  • SP
  • DE
  • IT
1) don't think we did consent round on that. 2) DE and IT translations are missing - [ ] Agree on text - [x] FR - [x] SP - [x] DE - [x] IT
avg_joe commented 2024-05-03 17:46:09 +02:00
Owner
Copy link

i agree btw.

besides i noticed we use: terms of service and terms of use. i think we should use only one term.

i agree btw. besides i noticed we use: terms of service and terms of use. i think we should use only one term.
meaz added 1 commit 2024-05-05 09:50:53 +02:00
meaz commented 2024-05-05 09:52:50 +02:00
Author
Owner
Copy link

@avg_joe indeed, normally @fede should have waited for three approvals, the repo is set so that a PR can normally be merged only when it gets three approvals, but owners can override this...

That being said, this PR I created is just to update the translation date, not the TOS itself.

@avg_joe indeed, normally @fede should have waited for three approvals, the repo is set so that a PR can normally be merged only when it gets three approvals, but owners can override this... That being said, this PR I created is just to update the translation date, not the TOS itself.
avg_joe commented 2024-05-05 10:13:40 +02:00
Owner
Copy link

@meaz ah because Tos is seperate repo right? i just wanted to write it down somewhere so it doesn't get lost.

@meaz ah because Tos is seperate repo right? i just wanted to write it down somewhere so it doesn't get lost.
fede commented 2024-05-05 15:32:23 +02:00
Owner
Copy link

As mention in the PR for the TOS, not only I kind of treated as normal howto or translation but it was also not conditioned to the rule of three approvals as usual. @meaz approval was enough. Apologies.

As mention in the PR for the TOS, not only I kind of treated as normal howto or translation but it was also not conditioned to the rule of three approvals as usual. @meaz approval was enough. Apologies.
muppeth commented 2024-05-06 09:43:09 +02:00
Owner
Copy link

Was that PR reverted then?

Was that PR reverted then?
avg_joe commented 2024-05-12 22:56:14 +02:00
Owner
Copy link

DE and IT pushed.
if any changes for the community guidelines are wanted, they can be done in the new PR:
Disroot/Disroot-ToS#13

DE and IT pushed. if any changes for the community guidelines are wanted, they can be done in the new PR: https://git.disroot.org/Disroot/Disroot-ToS/pulls/13
avg_joe closed this pull request 2024-05-12 22:56:14 +02:00
avg_joe reopened this pull request 2024-05-12 22:56:25 +02:00
avg_joe added 1 commit 2024-05-12 23:15:14 +02:00
meaz changed title from WIP: TOS translation date to TOS translation date 2024-05-13 15:32:03 +02:00
meaz added 1 commit 2024-05-13 15:32:11 +02:00
meaz commented 2024-05-13 15:32:39 +02:00
Author
Owner
Copy link

if we one of you can approve this...

if we one of you can approve this...
avg_joe commented 2024-05-13 16:42:07 +02:00
Owner
Copy link

as it changes translation date of DE and IT only makes sense to merge after merge in ToS repo

as it changes translation date of DE and IT only makes sense to merge after merge in ToS repo
👍 1
meaz added 1 commit 2024-06-08 22:29:08 +02:00
avg_joe added 1 commit 2024-06-09 15:27:59 +02:00
avg_joe approved these changes 2024-06-09 15:29:28 +02:00
meaz merged commit c4d06c4921 into main 2024-06-09 15:44:31 +02:00
meaz referenced this pull request from a commit 2024-06-09 15:44:31 +02:00
TOS translation date (#484)
meaz deleted branch tos_french_date 2024-06-09 15:44:31 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
avg_joe
Labels
Clear labels   
ABOUT

About page related

  
BLOG

Blogpost / Blog page related

  
COMMUNITY

Community page related

  
CONTACT

Contact page related

  
DONATIONS

Donations page related

  
FAQ

FAQ related

  
FIX

   
FORM

Form related

  
REVISION

   
SERVICES

Services page related

  
TRANSLATION

Files/Text translation

  
TYPO

Text errors

  
UPDATE
No labels
ABOUT
BLOG
COMMUNITY
CONTACT
DONATIONS
FAQ
FIX
FORM
REVISION
SERVICES
TRANSLATION
TYPO
UPDATE
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
antilopa
avg_joe
fede
muppeth
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Disroot/Website#484
No description provided.
Delete branch "tos_french_date"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?