From 83d1deda2f0893fc507cddfa5d7040964628371c Mon Sep 17 00:00:00 2001 From: bxy007 <315379105@qq.com> Date: Tue, 19 Dec 2017 16:20:54 +0800 Subject: [PATCH] fix Shutdown trans loss --- notebook/i18n/nbjs.pot | 8 + notebook/i18n/nbui.pot | 1 + notebook/i18n/zh_CN/LC_MESSAGES/nbjs.po | 373 +----------------------- notebook/i18n/zh_CN/LC_MESSAGES/nbui.po | 1 + notebook/static/notebook/js/notebook.js | 2 +- notebook/templates/notebook.html | 2 +- 6 files changed, 20 insertions(+), 367 deletions(-) diff --git a/notebook/i18n/nbjs.pot b/notebook/i18n/nbjs.pot index babef41908..6a9842c6c3 100644 --- a/notebook/i18n/nbjs.pot +++ b/notebook/i18n/nbjs.pot @@ -898,6 +898,14 @@ msgstr "" msgid "Do you want to restart the current kernel? All variables will be lost." msgstr "" +#: notebook/static/notebook/js/notebook.js:2320 +msgid "Shutdown kernel?" +msgstr "" + +#: notebook/static/notebook/js/notebook.js:2322 +msgid "Do you want to shutdown the current kernel? All variables will be lost." +msgstr "" + #: notebook/static/notebook/js/notebook.js:2734 msgid "Notebook changed" msgstr "" diff --git a/notebook/i18n/nbui.pot b/notebook/i18n/nbui.pot index 11c30aac64..9b91fd26ab 100644 --- a/notebook/i18n/nbui.pot +++ b/notebook/i18n/nbui.pot @@ -605,6 +605,7 @@ msgstr "" msgid "Shutdown selected notebook(s)" msgstr "" +#: notebook/templates/notebook.html:278 #: notebook/templates/tree.html:39 msgid "Shutdown" msgstr "" diff --git a/notebook/i18n/zh_CN/LC_MESSAGES/nbjs.po b/notebook/i18n/zh_CN/LC_MESSAGES/nbjs.po index 7e4499000b..c4ca325aba 100644 --- a/notebook/i18n/zh_CN/LC_MESSAGES/nbjs.po +++ b/notebook/i18n/zh_CN/LC_MESSAGES/nbjs.po @@ -752,371 +752,6 @@ msgstr "创建代码失败" msgid "The error was: %s" msgstr "错误; %s" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #: notebook/static/notebook/js/maintoolbar.js:54 msgid "Run" msgstr "运行" @@ -1263,6 +898,14 @@ msgstr "重启服务?" msgid "Do you want to restart the current kernel? All variables will be lost." msgstr "如果重启服务, 所有变量都会丢弃." +#: notebook/static/notebook/js/notebook.js:2320 +msgid "Shutdown kernel?" +msgstr "关闭服务" + +#: notebook/static/notebook/js/notebook.js:2322 +msgid "Do you want to shutdown the current kernel? All variables will be lost." +msgstr "如果关闭服务,所有变量都会丢失" + #: notebook/static/notebook/js/notebook.js:2750 msgid "Notebook changed" msgstr "笔记改变了" diff --git a/notebook/i18n/zh_CN/LC_MESSAGES/nbui.po b/notebook/i18n/zh_CN/LC_MESSAGES/nbui.po index 3517d8639d..9bde659fd8 100644 --- a/notebook/i18n/zh_CN/LC_MESSAGES/nbui.po +++ b/notebook/i18n/zh_CN/LC_MESSAGES/nbui.po @@ -605,6 +605,7 @@ msgstr "下载" msgid "Shutdown selected notebook(s)" msgstr "停止运行选择的notebook(s)" +#: notebook/templates/notebook.html:278 #: notebook/templates/tree.html:39 msgid "Shutdown" msgstr "关闭" diff --git a/notebook/static/notebook/js/notebook.js b/notebook/static/notebook/js/notebook.js index 176d5e9e45..adbbaabccd 100644 --- a/notebook/static/notebook/js/notebook.js +++ b/notebook/static/notebook/js/notebook.js @@ -2319,7 +2319,7 @@ define([ shutdown_options.dialog = { title : "Shutdown kernel?", body : $("

").text( - 'Do you want to shutdown the current kernel? All variables will be lost.' + i18n.msg._('Do you want to shutdown the current kernel? All variables will be lost.') ), buttons : { "Shutdown" : { diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html index 9263c122d0..3d93ca15f0 100644 --- a/notebook/templates/notebook.html +++ b/notebook/templates/notebook.html @@ -275,7 +275,7 @@

  • - Shutdown + {% trans %}Shutdown{% endtrans %}