From 84586f0bc5ea339c1e013e371d9d4ae951595955 Mon Sep 17 00:00:00 2001 From: Jacky Hu Date: Sun, 19 Nov 2017 19:41:34 +0800 Subject: [PATCH] Simplify the text of pool edit button Change the text from "Edit Pool" to "Edit", so all the resource edit buttons looks the same. Change-Id: I4d0c2b61d6310ea0414f7864991154c7e661d922 --- octavia_dashboard/locale/de/LC_MESSAGES/djangojs.po | 3 --- octavia_dashboard/locale/id/LC_MESSAGES/djangojs.po | 3 --- octavia_dashboard/locale/ja/LC_MESSAGES/djangojs.po | 3 --- octavia_dashboard/locale/ru/LC_MESSAGES/djangojs.po | 3 --- octavia_dashboard/locale/zh_CN/LC_MESSAGES/djangojs.po | 3 --- .../project/lbaasv2/pools/actions/row-actions.service.js | 2 +- .../project/lbaasv2/pools/actions/row-actions.service.spec.js | 2 +- 7 files changed, 2 insertions(+), 17 deletions(-) diff --git a/octavia_dashboard/locale/de/LC_MESSAGES/djangojs.po b/octavia_dashboard/locale/de/LC_MESSAGES/djangojs.po index 3e1322f6..e3931f85 100644 --- a/octavia_dashboard/locale/de/LC_MESSAGES/djangojs.po +++ b/octavia_dashboard/locale/de/LC_MESSAGES/djangojs.po @@ -376,9 +376,6 @@ msgstr "" msgid "Edit" msgstr "Bearbeiten" -msgid "Edit Pool" -msgstr "Pool bearbeiten" - msgid "Error" msgstr "Fehler" diff --git a/octavia_dashboard/locale/id/LC_MESSAGES/djangojs.po b/octavia_dashboard/locale/id/LC_MESSAGES/djangojs.po index f1ae38e2..345522fc 100644 --- a/octavia_dashboard/locale/id/LC_MESSAGES/djangojs.po +++ b/octavia_dashboard/locale/id/LC_MESSAGES/djangojs.po @@ -387,9 +387,6 @@ msgstr "" msgid "Edit" msgstr "Edit" -msgid "Edit Pool" -msgstr "Edit Pool (edit kolam)" - msgid "Error" msgstr "Error (kesalahan)" diff --git a/octavia_dashboard/locale/ja/LC_MESSAGES/djangojs.po b/octavia_dashboard/locale/ja/LC_MESSAGES/djangojs.po index b78ad39c..da103d2e 100644 --- a/octavia_dashboard/locale/ja/LC_MESSAGES/djangojs.po +++ b/octavia_dashboard/locale/ja/LC_MESSAGES/djangojs.po @@ -210,9 +210,6 @@ msgstr "ロードバランサー:%sからFloating IP アドレスの割り当て msgid "Edit" msgstr "編集" -msgid "Edit Pool" -msgstr "プールの編集" - msgid "Error" msgstr "エラー" diff --git a/octavia_dashboard/locale/ru/LC_MESSAGES/djangojs.po b/octavia_dashboard/locale/ru/LC_MESSAGES/djangojs.po index 81b7ef8c..29855d51 100644 --- a/octavia_dashboard/locale/ru/LC_MESSAGES/djangojs.po +++ b/octavia_dashboard/locale/ru/LC_MESSAGES/djangojs.po @@ -317,9 +317,6 @@ msgstr "Отвязать Назначаемый IP" msgid "Edit" msgstr "Редактировать" -msgid "Edit Pool" -msgstr "Редактировать пул" - msgid "Error" msgstr "Ошибка" diff --git a/octavia_dashboard/locale/zh_CN/LC_MESSAGES/djangojs.po b/octavia_dashboard/locale/zh_CN/LC_MESSAGES/djangojs.po index bcdc9db5..79fb4b5a 100644 --- a/octavia_dashboard/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/octavia_dashboard/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -352,9 +352,6 @@ msgstr "" msgid "Edit" msgstr "编辑" -msgid "Edit Pool" -msgstr "编辑资源池" - msgid "Error" msgstr "错误" diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js index c823cf1a..a4f345c4 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js @@ -67,7 +67,7 @@ return [{ service: editService.init(loadBalancerIsActionable).edit, template: { - text: gettext('Edit Pool') + text: gettext('Edit') } },{ service: createService.init(loadbalancerId, listenerId, loadBalancerIsActionable).create, diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js index b2b72b40..382cb87b 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js @@ -36,7 +36,7 @@ it('should define correct table row actions', function() { expect(actions.length).toBe(3); - expect(actions[0].template.text).toBe('Edit Pool'); + expect(actions[0].template.text).toBe('Edit'); expect(actions[1].template.text).toBe('Create Health Monitor'); expect(actions[2].template.text).toBe('Delete Pool'); });