[Kimchi-devel] [PATCH v2 2/2] Github bug #307: storage pool type list - html and string changes
Daniel Barboza
danielhb at linux.vnet.ibm.com
Fri Feb 28 19:50:45 UTC 2014
From: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
This patch contains changes in ui/pages/storagepool-add.html.tmpl to
reflect the new behavior of the page. A message saying "Loading ..."
with the loading.gif picture is now displayed in the LOGICAL
frame when there are no partition data yet. When partition data
arrives, the view is displayed normally. If no partition data is
available a warning message is displayed instead.
The new strings were added in ui/pages/i18n.html.tmpl and the .po
files were update by using 'make -C po update-po'.
Signed-off-by: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
---
po/en_US.po | 21 ++++++++++++++++++++-
po/kimchi.pot | 20 +++++++++++++++++++-
po/pt_BR.po | 21 ++++++++++++++++++++-
po/zh_CN.po | 21 ++++++++++++++++++++-
ui/pages/i18n.html.tmpl | 5 +++--
ui/pages/storagepool-add.html.tmpl | 7 ++++++-
6 files changed, 88 insertions(+), 7 deletions(-)
diff --git a/po/en_US.po b/po/en_US.po
index aeff16e..0d19ef4 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-28 10:34-0300\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"
@@ -305,6 +305,13 @@ msgstr "Server name can not be blank."
msgid "This is not a valid Server Name or IP. please, modify it."
msgstr "This is not a valid Server Name or IP. please, modify it."
+msgid "Looking for available partitions ..."
+msgstr ""
+
+#, fuzzy
+msgid "No available partitions found."
+msgstr "No templates found."
+
msgid "Help"
msgstr ""
@@ -947,6 +954,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..b4f8bd8 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-28 10:34-0300\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"
@@ -297,6 +297,12 @@ msgstr ""
msgid "This is not a valid Server Name or IP. please, modify it."
msgstr ""
+msgid "Looking for available partitions ..."
+msgstr ""
+
+msgid "No available partitions found."
+msgstr ""
+
msgid "Help"
msgstr ""
@@ -935,6 +941,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..11eb039 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-28 10:34-0300\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"
@@ -323,6 +323,13 @@ msgstr ""
msgid "This is not a valid Server Name or IP. please, modify it."
msgstr ""
+msgid "Looking for available partitions ..."
+msgstr ""
+
+#, fuzzy
+msgid "No available partitions found."
+msgstr "Nenhum modelo encontrado."
+
msgid "Help"
msgstr ""
@@ -962,6 +969,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..bf118e2 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-28 10:34-0300\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"
@@ -313,6 +313,13 @@ msgstr "服务器不能为空"
msgid "This is not a valid Server Name or IP. please, modify it."
msgstr "这不是一个有效的服务器名或IP，请修改"
+msgid "Looking for available partitions ..."
+msgstr ""
+
+#, fuzzy
+msgid "No available partitions found."
+msgstr "没有发现模板"
+
msgid "Help"
msgstr ""
@@ -951,6 +958,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 db6166e..fff7ceb 100644
--- a/ui/pages/i18n.html.tmpl
+++ b/ui/pages/i18n.html.tmpl
@@ -90,7 +90,6 @@ var i18n = {
'KCHDR6011M': "$_("Report name should contain only letters, digits and/or hyphen ('-').")",
'KCHVM6001M': "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")",
- 'KCHVM6002M': "$_("Delete Confirmation")",
'KCHNET6001E': "$_("The VLAN id must be between 1 and 4094.")",
@@ -110,7 +109,9 @@ var i18n = {
'KCHPOOL6006E': "$_("No logical device selected.")",
'KCHPOOL6007E': "$_("The iSCSI target can not be blank.")",
'KCHPOOL6008E': "$_("Server name can not be blank.")",
- 'KCHPOOL6009E': "$_("This is not a valid Server Name or IP. please, modify it.")"
+ 'KCHPOOL6009E': "$_("This is not a valid Server Name or IP. please, modify it.")",
+ 'KCHPOOL6010M': "$_("Looking for available partitions ...")",
+ 'KCHPOOL6011M': "$_("No available partitions found.")"
};
</script>
</body>
diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl
index 0a622db..222788f 100644
--- a/ui/pages/storagepool-add.html.tmpl
+++ b/ui/pages/storagepool-add.html.tmpl
@@ -97,7 +97,12 @@
<div class="logical-section tmpl-html">
<section class="form-section storageType">
<h2>3. $_("Device path")</h2>
- <div class="host-partition"></div>
+ <div class="host-partition">
+ <p class="text-help">
+ $_("Looking for available partitions ...")
+ <img src = "../images/theme-default/loading.gif" />
+ </p>
+ </div>
</section>
</div>
<div class="iscsi-section tmpl-html">
--
1.8.3.1
More information about the Kimchi-devel
mailing list