Skip to content

Conversation

@walshbr
Copy link
Contributor

@walshbr walshbr commented Jul 10, 2020

Closes #1795. Note that this will be a draft pull request for feedback from the technical team and MEs. It will not be finalized until after the Portuguese team has finalized their work, as this pull request affects files that they are currently translating.

Checklist

If you are having difficulty fixing Travis errors, first consult https://github.com/programminghistorian/jekyll/wiki/Making-Technical-Contributions carefully, especially "Common Travis Errors". Then contact the technical team if you need further help.

@walshbr
Copy link
Contributor Author

walshbr commented Jul 10, 2020

@programminghistorian/technical-team - can one of you take a look at the instructions here to make sure that I've updated correctly based on our new policy to have authors email in their submissions for the editors to then upload the materials to ph-submissions.

@svmelton - since we just tried this out with the English team, could you read the diff as well to make sure it makes sense? https://github.com/programminghistorian/jekyll/pull/1844/files.

Note again that this is meant to remain drafted until after the Portuguese team is done translating their materials. So won't ask for review and translation until that time. @acrymble - I assume that leaving edits in draft form like this still respects their need to have the documents frozen so they remain in synch while also allowing us to keep working. But let me know if that's not the case.

@walshbr walshbr changed the title Update Guidelines Update Guidelines for Submitting Lessons to ph-submissions Jul 10, 2020
@acrymble
Copy link

@walshbr if you're making changes the portuguese team might like the option of just doing it right the first time? Maybe send them a message and find out. Reducing overall effort is a good thing.

@DanielAlvesLABDH
Copy link
Contributor

We will open and edit one file at a time, from the list mentioned in #1818, so if you want we can leave this file to last and then incorporate the changes made

@walshbr
Copy link
Contributor Author

walshbr commented Jul 11, 2020

Yeah I agree @acrymble - I was thinking the same thing. the more I think about it, though, @DanielAlvesLABDH - I'm inclined to just hold this pull request for now until we get the Portuguese team entirely merged. It feels a little hairy to try to coordinate multiple versions and keep track of what files are in what working state. Even just trying to make sense of the plan in the abstract I am finding a little difficult. So I'll keep this drafted for now and we can touch base when PT is merged?

@DanielAlvesLABDH
Copy link
Contributor

Fine

@svmelton
Copy link
Contributor

Thanks, @walshbr—the diff looks good to me, whenever we're ready to move forward.

@walshbr
Copy link
Contributor Author

walshbr commented Dec 4, 2020

@programminghistorian/technical-team is going to review the language here before asking for translations.

@walshbr walshbr requested a review from a team December 9, 2020 16:52
Copy link
Contributor

@jenniferisasi jenniferisasi left a comment

Choose a reason for hiding this comment

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

Maybe on author-guidelines on step 1 you don't need to say that the account gives permission to upload; I think that might be confusing since they are not supposed to upload anything themselves. Maybe just "grant access to use our repository during he peer-review process". What do you think?

@walshbr
Copy link
Contributor Author

walshbr commented Dec 9, 2020

@jenniferisasi I think under this system we would just be having the editors do the initial upload of new materials so they can do initial revisions to the metadata and syntax. But ultimately we want them to then start working from and revising that file, right? (we don't want the editor to have to continually get a new version and re-upload it for the authors). So maybe…

A clarifying note in step one as you say, clarifying that this first upload will be done by the editor. and then in step four or five noting that future revisions to the lesson should be done to the file on the ph submissions lesson itself.

Does that seem to make sense to you as a process?

@jenniferisasi
Copy link
Contributor

@jenniferisasi I think under this system we would just be having the editors do the initial upload of new materials so they can do initial revisions to the metadata and syntax. But ultimately we want them to then start working from and revising that file, right? (we don't want the editor to have to continually get a new version and re-upload it for the authors). So maybe…

A clarifying note in step one as you say, clarifying that this first upload will be done by the editor. and then in step four or five noting that future revisions to the lesson should be done to the file on the ph submissions lesson itself.

Does that seem to make sense to you as a process?

It does! Send file to editor, editor uploads, then edits happen through GitHub. As it reads right now, the user could think: "oh, so I need to upload it and the editor has to find the file name in the repo".

@walshbr
Copy link
Contributor Author

walshbr commented Dec 9, 2020

@jenniferisasi I made changes to reflect your suggestions if you want to modify/dismiss your review.

@DanielAlvesLABDH
Copy link
Contributor

Just to let you know that I updated the Portuguese files

Copy link
Contributor

@DanielAlvesLABDH DanielAlvesLABDH left a comment

Choose a reason for hiding this comment

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

Made the changes to the PT files

Copy link
Contributor

@mariechristineb mariechristineb left a comment

Choose a reason for hiding this comment

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

@spapastamkou I added comments to 24e7594

@rivaquiroga
Copy link
Member

@jenniferisasi, el único cambio que faltaba en la guía para autores y la guía para traductores era el punto 5 de estas indicaciones. Lo demás ya lo habíamos traducido con Maria José (este PR estuvo un tiempo como draft, así que aprovechamos mientras tanto de incorporar estos cambios en #1771).
Ya incorporé en #1771 ese punto (y una frase extra que agregaron en el número 1), así que lo único que por parte del equipo de español faltaría en este PR es agregar esta nueva información a la Guía del Editor.

@spapastamkou
Copy link
Contributor

In integrated @mariechristineb comments in the FR guidelines and updated the branch.

@spapastamkou spapastamkou removed the request for review from fdlaramee December 20, 2020 09:24
@walshbr
Copy link
Contributor Author

walshbr commented Jan 5, 2021

@jenniferisasi @DanielAlvesLABDH @spapastamkou - just a note that if the translations from your team are finished you should go ahead and give an approving review on the pull request so that I can merge. Thank you!

Copy link
Contributor

@DanielAlvesLABDH DanielAlvesLABDH left a comment

Choose a reason for hiding this comment

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

PT translations are ok

@spapastamkou spapastamkou self-requested a review January 5, 2021 15:24
spapastamkou
spapastamkou previously approved these changes Jan 5, 2021
@jenniferisasi
Copy link
Contributor

@walshbr I probably have the silliest question ever: If I work directly on the branch for this PR, it doesn't show me the latest file that Riva pushed today (guía para autores) onto which I want to make the changes asked for in this PR ... if we update this branch somehow, will the right file show?

@walshbr
Copy link
Contributor Author

walshbr commented Jan 12, 2021

It's not a silly question @jenniferisasi - you have to re-merge the main branch into older branches when the main one changes. And there's no clear way to do that in the github interface that I've ever seen (@ZoeLeBlanc might know otherwise). I just did so, though, so you should see the latest files now.

with the latest change from Brandon in #1844
with the latest addition per #1844
@jenniferisasi
Copy link
Contributor

Ok, I think with my uploads this issue is ready to be closed (once we re-approve).

fix a link issue
@walshbr
Copy link
Contributor Author

walshbr commented Jan 12, 2021

I think if you just approve @jenniferisasi I should be good to merge. Nothing has changed on the Fr or Pt sides that would require them to re-review.

Copy link
Contributor

@jenniferisasi jenniferisasi left a comment

Choose a reason for hiding this comment

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

approved!

@walshbr walshbr merged commit 9a85c61 into gh-pages Jan 12, 2021
@acrymble acrymble deleted the ph-submissions-workflow-update branch July 15, 2021 07:16
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.

Preventing Build Errors on ph-submissions

9 participants