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

Merge English and Japanese glossaries into one #88

Merged
merged 3 commits into from
Jul 3, 2019
Merged

Conversation

xfq
Copy link
Member

@xfq xfq commented Jun 20, 2019

Fix #60 using the method in #60 (comment)

Two things I haven't done yet:

  • Translate the word "Transliteration" into Japanese
  • Add JavaScript to sort by the first two columns

IMO the second point can be done after the merge.


Preview | Diff

@xfq xfq added the jlreq-doc:editorial [JLReq-doc] editorial fixes on JLReq note label Jun 20, 2019
@xfq xfq requested a review from a team June 20, 2019 12:16
@xfq
Copy link
Member Author

xfq commented Jun 20, 2019

Since PR Preview failed to build, people who would like to see the preview can go to https://raw.githack.com/w3c/jlreq/xfq/merge-glossary/index.html#appendix_7

@himorin himorin requested a review from kidayasuo June 25, 2019 06:40
@himorin
Copy link
Contributor

himorin commented Jun 25, 2019

@kidayasuo this PR is which I've mentioned in today's F2F.

@xfq
Copy link
Member Author

xfq commented Jun 25, 2019

I think we should translate the word "Transliteration" in the header into Japanese before merging this PR, at least. (Suggestions are welcome.)

@xfq
Copy link
Member Author

xfq commented Jun 25, 2019

Also, if we decide to merge this PR, I can help resolving potential merge conflicts for other glossary-related PRs (such as #59, #75, #87).

Copy link
Contributor

@kidayasuo kidayasuo left a comment

Choose a reason for hiding this comment

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

approving the PR. Thank you for doing the merge!

@himorin
Copy link
Contributor

himorin commented Jul 1, 2019

I think we should translate the word "Transliteration" in the header into Japanese before merging this PR, at least. (Suggestions are welcome.)

I think "よみ" as current separated version is fine.

Also, if we decide to merge this PR, I can help resolving potential merge conflicts for other glossary-related PRs (such as #59, #75, #87).

I'd close #59 and add new PR for that after this merged (I can work). For #75 and #87, yes, we need to deal with after this merged.

@xfq
Copy link
Member Author

xfq commented Jul 1, 2019

I think we should translate the word "Transliteration" in the header into Japanese before merging this PR, at least. (Suggestions are welcome.)

I think "よみ" as current separated version is fine.

Thanks @himorin. I updated the PR.

@r12a
Copy link
Contributor

r12a commented Jul 2, 2019

@xfq what's the outlook for you to build in the other PR changes mentioned above and merge this?

@xfq
Copy link
Member Author

xfq commented Jul 3, 2019

@r12a Sorry, I'm not sure I understand what you mean. Would you please explain?

@r12a
Copy link
Contributor

r12a commented Jul 3, 2019

Sorry about that. Let me try again: How soon will we merge this pull request? And will you add to it the fixes for the other PRs mentioned in #88 (comment) ?

@xfq
Copy link
Member Author

xfq commented Jul 3, 2019

Since I have three r+ now, I'll go ahead and merge this PR, and:

Thanks for the review!

@xfq xfq merged commit 903483c into gh-pages Jul 3, 2019
@xfq xfq deleted the xfq/merge-glossary branch July 3, 2019 05:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jlreq-doc:editorial [JLReq-doc] editorial fixes on JLReq note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re: Merging en & ja jlreq glossary
4 participants