[Kimchi-devel] [PATCH V2] Bug Fix: Correct select menu to handle empty input

Yu Xin Huo huoyuxin at linux.vnet.ibm.com
Mon Sep 29 09:14:54 UTC 2014 

Reviewed and Tested By Yu Xin Huo.

On 9/29/2014 11:25 AM, Wen Wang wrote:
> From: Yu Xin Huo <huoyuxin at linux.vnet.ibm.com>
>
> V1 -> V2:
> Have the message item "Options needed." deleted from
> "ui/pages/i18n.json.tmpl" and make the proper change with each po file.
>
> Signed-off-by: Yu Xin Huo <huoyuxin at linux.vnet.ibm.com>
> Signed-off-by: Wen Wang <wenwang at linux.vnet.ibm.com>
> ---
>   po/de_DE.po                  |    3 ---
>   po/en_US.po                  |    3 ---
>   po/es_ES.po                  |    3 ---
>   po/fr_FR.po                  |    3 ---
>   po/it_IT.po                  |    3 ---
>   po/ja_JP.po                  |    3 ---
>   po/kimchi.pot                |    3 ---
>   po/ko_KR.po                  |    3 ---
>   po/pt_BR.po                  |    3 ---
>   po/ru_RU.po                  |    3 ---
>   po/zh_CN.po                  |    3 ---
>   po/zh_TW.po                  |    3 ---
>   ui/js/widgets/select-menu.js |    6 +++---
>   ui/pages/i18n.json.tmpl      |    1 -
>   14 files changed, 3 insertions(+), 40 deletions(-)
>
> diff --git a/po/de_DE.po b/po/de_DE.po
> index 9d25e20..98bde90 100644
> --- a/po/de_DE.po
> +++ b/po/de_DE.po
> @@ -1256,9 +1256,6 @@ msgstr "Dies ist kein gültiger URL."
>   msgid "No such data available."
>   msgstr "Keine solchen Daten verfügbar."
>
> -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. "
> diff --git a/po/en_US.po b/po/en_US.po
> index e36c88d..eb571ca 100644
> --- a/po/en_US.po
> +++ b/po/en_US.po
> @@ -1128,9 +1128,6 @@ msgstr ""
>   msgid "No such data available."
>   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. "
> diff --git a/po/es_ES.po b/po/es_ES.po
> index 1279969..5a3fa46 100644
> --- a/po/es_ES.po
> +++ b/po/es_ES.po
> @@ -1274,9 +1274,6 @@ msgstr "No es un URL válido."
>   msgid "No such data available."
>   msgstr "No hay datos de ese tipo disponibles."
>
> -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. "
> diff --git a/po/fr_FR.po b/po/fr_FR.po
> index a13ef9f..414dd4a 100644
> --- a/po/fr_FR.po
> +++ b/po/fr_FR.po
> @@ -1263,9 +1263,6 @@ msgstr "Ce n'est pas une URL valide."
>   msgid "No such data available."
>   msgstr "De telles données ne sont pas disponibles."
>
> -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. "
> diff --git a/po/it_IT.po b/po/it_IT.po
> index d710a66..4a6c919 100644
> --- a/po/it_IT.po
> +++ b/po/it_IT.po
> @@ -1243,9 +1243,6 @@ msgstr "Non è un URL valido."
>   msgid "No such data available."
>   msgstr "Dati indicati non disponibili."
>
> -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. "
> diff --git a/po/ja_JP.po b/po/ja_JP.po
> index d8d20f7..af00487 100644
> --- a/po/ja_JP.po
> +++ b/po/ja_JP.po
> @@ -1253,9 +1253,6 @@ msgstr "有効な URL ではありません。"
>   msgid "No such data available."
>   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. "
> diff --git a/po/kimchi.pot b/po/kimchi.pot
> index e72ddcd..685802e 100755
> --- a/po/kimchi.pot
> +++ b/po/kimchi.pot
> @@ -1128,9 +1128,6 @@ msgstr ""
>   msgid "No such data available."
>   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. "
> diff --git a/po/ko_KR.po b/po/ko_KR.po
> index 7946cb2..a9f82e4 100644
> --- a/po/ko_KR.po
> +++ b/po/ko_KR.po
> @@ -1185,9 +1185,6 @@ msgstr "올바른 URL이 아닙니다."
>   msgid "No such data available."
>   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. "
> diff --git a/po/pt_BR.po b/po/pt_BR.po
> index a86567d..f2fba64 100644
> --- a/po/pt_BR.po
> +++ b/po/pt_BR.po
> @@ -1265,9 +1265,6 @@ msgstr "Essa não é uma URL válida."
>   msgid "No such data available."
>   msgstr "Não há dados disponíveis."
>
> -msgid "Options needed."
> -msgstr "Opções necessárias."
> -
>   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. "
> diff --git a/po/ru_RU.po b/po/ru_RU.po
> index f17f9bc..059b999 100644
> --- a/po/ru_RU.po
> +++ b/po/ru_RU.po
> @@ -1184,9 +1184,6 @@ msgstr "Это недопустимый URL."
>   msgid "No such data available."
>   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. "
> diff --git a/po/zh_CN.po b/po/zh_CN.po
> index 5bf59ca..f77e405 100644
> --- a/po/zh_CN.po
> +++ b/po/zh_CN.po
> @@ -1151,9 +1151,6 @@ msgstr "这不是一个有效的URL"
>   msgid "No such data available."
>   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. "
> diff --git a/po/zh_TW.po b/po/zh_TW.po
> index 9db4edf..4040b2a 100644
> --- a/po/zh_TW.po
> +++ b/po/zh_TW.po
> @@ -1131,9 +1131,6 @@ msgstr "這是無效的 URL。"
>   msgid "No such data available."
>   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. "
> diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js
> index ad53200..c4b0209 100644
> --- a/ui/js/widgets/select-menu.js
> +++ b/ui/js/widgets/select-menu.js
> @@ -36,8 +36,10 @@
>               var selectedClass = 'active';
>               var itemTag = 'li';
>               var item;
> +            that.listControl.find('li').remove();
> +            that.label.text("");
> +            that.target.val("");
>               if (options.length > 0) {
> -                that.listControl.find('li').remove();
>                   $.each(options, function(index, option) {
>                       item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>');
>                       item.data('value', option.value);
> @@ -58,8 +60,6 @@
>                           that.target.change();
>                       }
>                   });
> -            } else {
> -                kimchi.message.error.code('KCHAPI6006E');
>               }
>           },
>
> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
> index c52b175..75f1e43 100644
> --- a/ui/pages/i18n.json.tmpl
> +++ b/ui/pages/i18n.json.tmpl
> @@ -39,7 +39,6 @@
>       "KCHAPI6003E": "$_("This is not a valid Linux path")",
>       "KCHAPI6004E": "$_("This is not a valid URL.")",
>       "KCHAPI6005E": "$_("No such data available.")",
> -    "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")",

More information about the Kimchi-devel mailing list