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

Preliminary i18n implementation as outlined in Jep16 #2140

Merged
merged 27 commits into from Jul 11, 2017

Conversation

Projects
None yet
5 participants
@JCEmmons
Contributor

JCEmmons commented Feb 6, 2017

I wanted to get a preliminary PR out here for you all to take a look at so you can see the current progress and also so I can get some help on some of the issues. Please read the i18n README on this branch for instructions on how to get started.

This is still a work in progress, and I am not a professional translator, so I don't claim everything to be perfect just yet. Take a look and let me know what you think.

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Feb 6, 2017

Member

Thanks for working on this!

I'm aiming to release 5.0 soon (hopefully this week), so I think this will probably miss that release, but I'd like to try to get it in for 5.1.

Member

takluyver commented Feb 6, 2017

Thanks for working on this!

I'm aiming to release 5.0 soon (hopefully this week), so I think this will probably miss that release, but I'd like to try to get it in for 5.1.

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Feb 6, 2017

Contributor
Contributor

JCEmmons commented Feb 6, 2017

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Feb 6, 2017

Member

We don't really have a schedule for releases, I'm afraid. If the changes in 5.0 cause some problems we need to fix, there might be a 5.1 in a couple of weeks, but in that case most of the new features planned for 5.1 would be targeted to 5.2 instead.

If you want some target dates, I'd hope to have the JEP and this infrastructure merged by the end of the month.

Member

takluyver commented Feb 6, 2017

We don't really have a schedule for releases, I'm afraid. If the changes in 5.0 cause some problems we need to fix, there might be a 5.1 in a couple of weeks, but in that case most of the new features planned for 5.1 would be targeted to 5.2 instead.

If you want some target dates, I'd hope to have the JEP and this infrastructure merged by the end of the month.

@minrk minrk added this to the 5.1 milestone Feb 7, 2017

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Mar 27, 2017

Contributor

How do we go about making this so it can be merged? I've still got a few small things that can be worked on here, but the vast majority of the work here is complete. Please advise.

Contributor

JCEmmons commented Mar 27, 2017

How do we go about making this so it can be merged? I've still got a few small things that can be worked on here, but the vast majority of the work here is complete. Please advise.

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Apr 3, 2017

Contributor

Still waiting.... @takluyver can you comment pls?

Contributor

JCEmmons commented Apr 3, 2017

Still waiting.... @takluyver can you comment pls?

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Apr 3, 2017

Member
  • We're still getting notebook 5.0 out, so this has been waiting for that to happen.
  • There are merge conflicts now - can you rebase the branch on master? If you're not familiar with rebasing, I can provide a brief outline of how I usually do it.
Member

takluyver commented Apr 3, 2017

  • We're still getting notebook 5.0 out, so this has been waiting for that to happen.
  • There are merge conflicts now - can you rebase the branch on master? If you're not familiar with rebasing, I can provide a brief outline of how I usually do it.
@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Apr 3, 2017

Contributor
Contributor

JCEmmons commented Apr 3, 2017

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Apr 4, 2017

Member

To rebase and resolve merge conflicts, I usually:

  • Ensure master is up to date - git checkout master and git pull (from jupyter/notebook, rather than your fork on Github)
  • Check out this branch again - git checkout jep16
  • Run git rebase master
  • Each time it reaches a conflict, it will stop and tell you about it. Run git status to see which files have conflicts. Fix them in a text editor (look for markers like >>>>> and <<<<<). Then git add the files you've fixed, and run git rebase --continue.
  • Once it has got through all the commits, it will stop without a message about conflicts.
  • Then you need to force push the rebased branch - git push -f <my_remote> jep16 (replace <my_remote> with the name it has for your Github fork of the repo.
Member

takluyver commented Apr 4, 2017

To rebase and resolve merge conflicts, I usually:

  • Ensure master is up to date - git checkout master and git pull (from jupyter/notebook, rather than your fork on Github)
  • Check out this branch again - git checkout jep16
  • Run git rebase master
  • Each time it reaches a conflict, it will stop and tell you about it. Run git status to see which files have conflicts. Fix them in a text editor (look for markers like >>>>> and <<<<<). Then git add the files you've fixed, and run git rebase --continue.
  • Once it has got through all the commits, it will stop without a message about conflicts.
  • Then you need to force push the rebased branch - git push -f <my_remote> jep16 (replace <my_remote> with the name it has for your Github fork of the repo.
@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Apr 14, 2017

Contributor

I'll work on the travis-ci failures next week.

Contributor

JCEmmons commented Apr 14, 2017

I'll work on the travis-ci failures next week.

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Apr 19, 2017

Contributor

I'm looking at the logs from the js tests in Travis CI, and I have no idea how to go about debugging here. Can someone shed some light on what might be going on?

Contributor

JCEmmons commented Apr 19, 2017

I'm looking at the logs from the js tests in Travis CI, and I have no idea how to go about debugging here. Can someone shed some light on what might be going on?

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Apr 19, 2017

Member

😕 the errors look like this - anyone got any ideas?

Test file: /home/travis/build/jupyter/notebook/notebook/tests/services/session.js
Timeout for http://localhost:8888/a@b/
Is the notebook server running?
FAIL "#kernel-python2 a, #kernel-python3 a" still did not exist in 10000ms
#    type: uncaughtError
#    file: /home/travis/build/jupyter/notebook/notebook/tests/services/session.js
#    error: "#kernel-python2 a, #kernel-python3 a" still did not exist in 10000ms

#    stack: not provided
Member

takluyver commented Apr 19, 2017

😕 the errors look like this - anyone got any ideas?

Test file: /home/travis/build/jupyter/notebook/notebook/tests/services/session.js
Timeout for http://localhost:8888/a@b/
Is the notebook server running?
FAIL "#kernel-python2 a, #kernel-python3 a" still did not exist in 10000ms
#    type: uncaughtError
#    file: /home/travis/build/jupyter/notebook/notebook/tests/services/session.js
#    error: "#kernel-python2 a, #kernel-python3 a" still did not exist in 10000ms

#    stack: not provided
@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Apr 24, 2017

Member

Aha, I've found the issue. You've got utils.i18n in a few places where it should be just i18n.

Member

takluyver commented Apr 24, 2017

Aha, I've found the issue. You've got utils.i18n in a few places where it should be just i18n.

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Apr 24, 2017

Contributor

Thanks @takluyver for your help! That's what happens when you try to refactor things.....

Contributor

JCEmmons commented Apr 24, 2017

Thanks @takluyver for your help! That's what happens when you try to refactor things.....

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Apr 24, 2017

Member

The tests are now producing a whole lot of ReferenceError: Can't find variable: utils [object Arguments]

Member

takluyver commented Apr 24, 2017

The tests are now producing a whole lot of ReferenceError: Can't find variable: utils [object Arguments]

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Apr 25, 2017

Contributor
Contributor

JCEmmons commented Apr 25, 2017

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Apr 25, 2017

Member

Even without running the tests, you may be able to trigger some of these errors by running the notebook in a browser with the Javascript console open.

Member

takluyver commented Apr 25, 2017

Even without running the tests, you may be able to trigger some of these errors by running the notebook in a browser with the Javascript console open.

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons May 15, 2017

Contributor

It would be really nice if we could go ahead and get this merged, as I'm getting tired of resolving merge conflicts.

Contributor

JCEmmons commented May 15, 2017

It would be really nice if we could go ahead and get this merged, as I'm getting tired of resolving merge conflicts.

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver May 15, 2017

Member

Sorry for the delay @JCEmmons . It's the end of the day over here now, but I'll try to have a look at this tomorrow.

Member

takluyver commented May 15, 2017

Sorry for the delay @JCEmmons . It's the end of the day over here now, but I'll try to have a look at this tomorrow.

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver May 16, 2017

Member

Sorry, most of today got taken up working on Windows packaging of some magnetic simulation code. I haven't forgotten about this, though.

Member

takluyver commented May 16, 2017

Sorry, most of today got taken up working on Windows packaging of some magnetic simulation code. I haven't forgotten about this, though.

@minrk

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Jul 11, 2017

Member

@JCEmmons thanks for addressing the review! I think this is in good shape to merge, with one exception I just noticed while testing this out locally: Some of the changes here have mixed in some tab indentation instead of spaces, and added Windows CRLF line endings in a few places. This is part of why the diff on a few files looks so large. You can tell git to handle CRLF automatically with:

git config --global core.autocrlf true

to avoid this sort of problem in the future. If you check the "Allow edits from maintainers" box on the right:

screen shot 2017-07-11 at 10 43 25

I can do the last conflict resolution and fix these little things and get this merged. Or you can pull from my branch, if you prefer.

Member

minrk commented Jul 11, 2017

@JCEmmons thanks for addressing the review! I think this is in good shape to merge, with one exception I just noticed while testing this out locally: Some of the changes here have mixed in some tab indentation instead of spaces, and added Windows CRLF line endings in a few places. This is part of why the diff on a few files looks so large. You can tell git to handle CRLF automatically with:

git config --global core.autocrlf true

to avoid this sort of problem in the future. If you check the "Allow edits from maintainers" box on the right:

screen shot 2017-07-11 at 10 43 25

I can do the last conflict resolution and fix these little things and get this merged. Or you can pull from my branch, if you prefer.

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Jul 11, 2017

Contributor

Hi @minrk and thanks.... Allow edits from maintainers is already enabled, so if you can handle the last merge conflict and do the merge I would appreciate it greatly!!! Thanks......

Contributor

JCEmmons commented Jul 11, 2017

Hi @minrk and thanks.... Allow edits from maintainers is already enabled, so if you can handle the last merge conflict and do the merge I would appreciate it greatly!!! Thanks......

minrk added some commits Jul 11, 2017

Fix a couple of message errors
wrong call signature in a few cases
@minrk

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Jul 11, 2017

Member

We can continue to iterate on this in master as things come up. Thanks for your work and patience!

Member

minrk commented Jul 11, 2017

We can continue to iterate on this in master as things come up. Thanks for your work and patience!

@minrk minrk merged commit f81fb46 into jupyter:master Jul 11, 2017

4 checks passed

codecov/patch 50% of diff hit (target 0%)
Details
codecov/project 79.93% (+<.01%) compared to 8fa0926
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@minrk

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Jul 11, 2017

Member

Due to the issues with line endings and whitespace changes, I chose to squash this PR rather than deal with a complicated rebase. Hopefully we can catch similar issues earlier in subsequent PRs.

Member

minrk commented Jul 11, 2017

Due to the issues with line endings and whitespace changes, I chose to squash this PR rather than deal with a complicated rebase. Hopefully we can catch similar issues earlier in subsequent PRs.

@gnestor gnestor referenced this pull request Aug 3, 2017

Merged

Add 5.1.0 to changelog #2723

@gnestor

This comment has been minimized.

Show comment
Hide comment
@gnestor

gnestor Aug 7, 2017

Contributor

Hi @JCEmmons! I'm about to publish a release candidate for notebook 5.1 and I noticed the following error when opening a new terminal (in the Jupyter Notebook):

image

Does this make sense to you?

Contributor

gnestor commented Aug 7, 2017

Hi @JCEmmons! I'm about to publish a release candidate for notebook 5.1 and I noticed the following error when opening a new terminal (in the Jupyter Notebook):

image

Does this make sense to you?

@JCEmmons

This comment has been minimized.

Show comment
Hide comment
@JCEmmons

JCEmmons Aug 7, 2017

Contributor
Contributor

JCEmmons commented Aug 7, 2017

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Aug 8, 2017

Member

I installed RC1 and I can't reproduce this - @gnestor did you get it worked out?

It does look like jed is listed in bower.json - maybe it was a matter of clearing out some cache?

Member

takluyver commented Aug 8, 2017

I installed RC1 and I can't reproduce this - @gnestor did you get it worked out?

It does look like jed is listed in bower.json - maybe it was a matter of clearing out some cache?

@gnestor

This comment has been minimized.

Show comment
Hide comment
@gnestor

gnestor Aug 8, 2017

Contributor

I'm even seeing this in master 🤔 I don't see this when opening notebooks, just terminals.

Contributor

gnestor commented Aug 8, 2017

I'm even seeing this in master 🤔 I don't see this when opening notebooks, just terminals.

@jcb91

This comment has been minimized.

Show comment
Hide comment
@jcb91

jcb91 Sep 30, 2017

Contributor

I'm seeing the same missing jed error breaking the jupyter_nbextensions_configurator standalone page at Jupyter-contrib/jupyter_nbextensions_configurator#43, using a pip-installed notebook 5.1.0 😢

Contributor

jcb91 commented Sep 30, 2017

I'm seeing the same missing jed error breaking the jupyter_nbextensions_configurator standalone page at Jupyter-contrib/jupyter_nbextensions_configurator#43, using a pip-installed notebook 5.1.0 😢

jcb91 added a commit to jcb91/jupyter_nbextensions_configurator that referenced this pull request Oct 1, 2017

@gnestor gnestor referenced this pull request Dec 2, 2017

Open

[meta] Accessibility #180

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment