From fcb613c2a0cdcdf24623df3b397fff983218e80e Mon Sep 17 00:00:00 2001 From: Harpreet Kataria Date: Thu, 27 Jun 2019 10:44:23 -0400 Subject: [PATCH] Changed labels to `Price / Month` Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072 --- app/controllers/catalog_controller.rb | 4 ++-- app/views/catalog/_sandt_tree_show.html.haml | 2 +- app/views/catalog/_st_angular_form.html.haml | 2 +- app/views/catalog/_svccat_tree_show.html.haml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index b6218898907..6e1cc84f484 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -1280,7 +1280,7 @@ def get_form_vars end def code_currency_label(currency) - _('Price (in %{currency})') % {:currency => ChargebackRateDetailCurrency.find(currency).code} + _('Price / Month (in %{currency})') % {:currency => ChargebackRateDetailCurrency.find(currency).code} end def checked_tenants @@ -2014,7 +2014,7 @@ def dialog_catalog_check def validate_price if @edit[:new][:currency] && @edit[:new][:price].blank? - add_flash(_("Price is required"), :error) + add_flash(_("Price / Month is required"), :error) end end diff --git a/app/views/catalog/_sandt_tree_show.html.haml b/app/views/catalog/_sandt_tree_show.html.haml index aa867a1af93..d239df26575 100644 --- a/app/views/catalog/_sandt_tree_show.html.haml +++ b/app/views/catalog/_sandt_tree_show.html.haml @@ -50,7 +50,7 @@ - if @record.currency && @record.price .form-group %label.col-md-3.control-label - = _('Price (in %{currency})') % {:currency => @record.currency.code} + = _('Price / Month (in %{currency})') % {:currency => @record.currency.code} .col-md-9 = @record.price - if @record.prov_type diff --git a/app/views/catalog/_st_angular_form.html.haml b/app/views/catalog/_st_angular_form.html.haml index ff36aee75df..26d52137972 100644 --- a/app/views/catalog/_st_angular_form.html.haml +++ b/app/views/catalog/_st_angular_form.html.haml @@ -91,7 +91,7 @@ .form-group{"ng-class" => "{'has-error': vm.priceRequired()}"} %label.col-md-2.control-label{"for" => "price"} - = _("Price (in {{vm.catalogItemModel.currency_name}})") + = _("Price / Month (in {{vm.catalogItemModel.currency_name}})") .col-md-8 %input.form-control{"type" => "text", "id" => "price", diff --git a/app/views/catalog/_svccat_tree_show.html.haml b/app/views/catalog/_svccat_tree_show.html.haml index c2815fcf1c9..db93dc22b34 100644 --- a/app/views/catalog/_svccat_tree_show.html.haml +++ b/app/views/catalog/_svccat_tree_show.html.haml @@ -37,7 +37,7 @@ - if @record.currency && @record.price .form-group %label.col-md-2.control-label - = _('Price (in %{currency})') % {:currency => @record.currency.code} + = _('Price / Month (in %{currency})') % {:currency => @record.currency.code} .col-md-8 %p.form-control-static = @record.price