[Kimchi-devel] [PATCH 1/4] Create new error message to be displayed when we get an unexpeted ajax error
Adam King
rak at linux.vnet.ibm.com
Thu Feb 27 00:47:38 UTC 2014
While recreating and testing issue 294, I discovered that we were not
handling and reporting ajax failures that did not include a JSON response.
This happens when the server is unreachable due to network connectivity
or the server being down. This patch added a message to be displayed in this
case.
Signed-off-by: Adam King <rak at linux.vnet.ibm.com>
---
po/en_US.po | 19 ++++++++++++++++++-
po/kimchi.pot | 19 ++++++++++++++++++-
po/pt_BR.po | 23 ++++++++++++++++++++++-
po/zh_CN.po | 19 ++++++++++++++++++-
ui/pages/i18n.html.tmpl | 1 +
5 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/po/en_US.po b/po/en_US.po
index aeff16e..6ea4181 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:23-0300\n"
+"POT-Creation-Date: 2014-02-26 19:06-0500\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac at linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -151,6 +151,11 @@ msgstr ""
msgid "options needed."
msgstr ""
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+
msgid "Delete Confirmation"
msgstr "Delete Confirmation"
@@ -947,6 +952,18 @@ msgstr ""
#, python-format
msgid ""
+"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
"Unable to deactivate pool %(name)s as it is associated with some templates"
msgstr ""
diff --git a/po/kimchi.pot b/po/kimchi.pot
index abb7219..5ab87a8 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:23-0300\n"
+"POT-Creation-Date: 2014-02-26 19:06-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -151,6 +151,11 @@ msgstr ""
msgid "options needed."
msgstr ""
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+
msgid "Delete Confirmation"
msgstr ""
@@ -935,6 +940,18 @@ msgstr ""
#, python-format
msgid ""
+"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
"Unable to deactivate pool %(name)s as it is associated with some templates"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index db7c579..21f781b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:23-0300\n"
+"POT-Creation-Date: 2014-02-26 19:06-0500\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: Crístian Viana <vianac at linux.vnet.ibm.com>\n"
"Language-Team: Aline Manera <alinefm at br.ibm.com>\n"
@@ -169,6 +169,11 @@ msgstr ""
msgid "options needed."
msgstr ""
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+
msgid "Delete Confirmation"
msgstr "Confirmação de remoção"
@@ -344,10 +349,14 @@ msgstr "Gerar um novo relatório de depuração"
msgid "Report Name"
msgstr "Nome do Relatório"
+#, fuzzy
msgid ""
"The name used to identify the report. If omitted, a name will be chosen "
"based on current time. Name can contain: letters, digits and hyphen (\"-\")."
msgstr ""
+"O nome usado para identificar o relatório. Se omitido, o nome será escolhido "
+"baseado no horário. O nome pode conter: letras, números, \"-\", \"_\", ou \"."
+"\"."
msgid "Define a New Storage Pool"
msgstr "Definir novo Storage Pool"
@@ -962,6 +971,18 @@ msgstr ""
#, python-format
msgid ""
+"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
"Unable to deactivate pool %(name)s as it is associated with some templates"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0439b04..622f435 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:23-0300\n"
+"POT-Creation-Date: 2014-02-26 19:06-0500\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
"Language-Team: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
@@ -167,6 +167,11 @@ msgstr ""
msgid "options needed."
msgstr ""
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+
msgid "Delete Confirmation"
msgstr "删除确认"
@@ -951,6 +956,18 @@ msgstr ""
#, python-format
msgid ""
+"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
"Unable to deactivate pool %(name)s as it is associated with some templates"
msgstr ""
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
index b17bd7a..d713687 100644
--- a/ui/pages/i18n.html.tmpl
+++ b/ui/pages/i18n.html.tmpl
@@ -50,6 +50,7 @@ var i18n = {
'KCHAPI6004E': "$_("This is not a valid URL.")",
'KCHAPI6005E': "$_("No such data exsit.")",
'KCHAPI6006E': "$_("options needed.")",
+ 'KCHAPI6007E': "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")",
'KCHAPI6001M': "$_("Delete Confirmation")",
'KCHAPI6002M': "$_("OK")",
--
1.8.1.4
More information about the Kimchi-devel
mailing list