##// END OF EJS Templates
Merge pull request #6851 from v923z/master...
Matthias Bussonnier -
r18687:ebfabbeb merge
parent child Browse files
Show More
@@ -2195,18 +2195,18 b' define(['
2195 var orig_nbformat_minor = nbmodel.metadata.orig_nbformat_minor;
2195 var orig_nbformat_minor = nbmodel.metadata.orig_nbformat_minor;
2196 if (orig_nbformat !== undefined && nbmodel.nbformat !== orig_nbformat) {
2196 if (orig_nbformat !== undefined && nbmodel.nbformat !== orig_nbformat) {
2197 var src;
2197 var src;
2198 if (nb.nbformat > nb.orig_nbformat) {
2198 if (nbmodel.nbformat > orig_nbformat) {
2199 src = " an older notebook format ";
2199 src = " an older notebook format ";
2200 } else {
2200 } else {
2201 src = " a newer notebook format ";
2201 src = " a newer notebook format ";
2202 }
2202 }
2203
2203
2204 var msg = "This notebook has been converted from" + src +
2204 var msg = "This notebook has been converted from" + src +
2205 "(v"+nb.orig_nbformat+") to the current notebook " +
2205 "(v"+orig_nbformat+") to the current notebook " +
2206 "format (v"+nb.nbformat+"). The next time you save this notebook, the " +
2206 "format (v"+nbmodel.nbformat+"). The next time you save this notebook, the " +
2207 "current notebook format will be used.";
2207 "current notebook format will be used.";
2208
2208
2209 if (nb.nbformat > nb.orig_nbformat) {
2209 if (nbmodel.nbformat > orig_nbformat) {
2210 msg += " Older versions of IPython may not be able to read the new format.";
2210 msg += " Older versions of IPython may not be able to read the new format.";
2211 } else {
2211 } else {
2212 msg += " Some features of the original notebook may not be available.";
2212 msg += " Some features of the original notebook may not be available.";
General Comments 0
You need to be logged in to leave comments. Login now