diff --git a/hawk/app/assets/javascripts/module/location.js b/hawk/app/assets/javascripts/module/location.js
index 53272e31f..ef4f7ecab 100644
--- a/hawk/app/assets/javascripts/module/location.js
+++ b/hawk/app/assets/javascripts/module/location.js
@@ -45,7 +45,7 @@
'',
'',
'',
- '',
+ '',
'',
'',
'',
diff --git a/hawk/app/controllers/masters_controller.rb b/hawk/app/controllers/masters_controller.rb
index 903475b69..ba9d81815 100644
--- a/hawk/app/controllers/masters_controller.rb
+++ b/hawk/app/controllers/masters_controller.rb
@@ -17,7 +17,7 @@ def index
end
def new
- @title = _("Create Promotable resource")
+ @title = _("Create Unpromoted resource")
@master = Master.new
@master.meta["target-role"] = "Stopped" if @cib.id == "live"
@@ -28,7 +28,7 @@ def new
def create
normalize_params! params[:master].permit!
- @title = _("Create Promotable resource")
+ @title = _("Create Unpromoted resource")
@master = Master.new params[:master].permit!
@@ -37,7 +37,7 @@ def create
respond_to do |format|
format.html do
- flash[:success] = _("Promotable resource created successfully")
+ flash[:success] = _("Unpromoted resource created successfully")
redirect_to edit_cib_master_url(cib_id: @cib.id, id: @master.id)
end
format.json do
@@ -58,7 +58,7 @@ def create
end
def edit
- @title = _("Edit Promotable resource")
+ @title = _("Edit Unpromoted resource")
respond_to do |format|
format.html
@@ -67,7 +67,7 @@ def edit
def update
normalize_params! params[:master].permit!
- @title = _("Edit Promotable resource")
+ @title = _("Edit Unpromoted resource")
if params[:revert]
return redirect_to edit_cib_master_url(cib_id: @cib.id, id: @master.id)
@@ -78,7 +78,7 @@ def update
post_process_for! @master
format.html do
- flash[:success] = _("Promotable resource updated successfully")
+ flash[:success] = _("Unpromoted resource updated successfully")
redirect_to edit_cib_master_url(cib_id: @cib.id, id: @master.id)
end
format.json do
@@ -100,14 +100,14 @@ def destroy
out, err, rc = Invoker.instance.crm("--force", "configure", "delete", @master.id)
if rc == 0
format.html do
- flash[:success] = _("Promotable resource deleted successfully")
+ flash[:success] = _("Unpromoted resource deleted successfully")
flash[:warning] = err unless err.blank?
redirect_to types_cib_resources_path(cib_id: @cib.id)
end
format.json do
render json: {
success: true,
- message: _("Promotable resource deleted successfully")
+ message: _("Unpromoted resource deleted successfully")
}
end
else
@@ -134,7 +134,7 @@ def show
protected
def set_title
- @title = _("Promotable resource")
+ @title = _("Unpromoted resource")
end
def set_cib
@@ -147,7 +147,7 @@ def set_record
unless @master
respond_to do |format|
format.html do
- flash[:alert] = _("The Promotable resource (%s) does not exist") % [params[:id]]
+ flash[:alert] = _("The Unpromoted resource (%s) does not exist") % [params[:id]]
redirect_to types_cib_resources_path(cib_id: @cib.id)
end
end
diff --git a/hawk/app/helpers/colocation_helper.rb b/hawk/app/helpers/colocation_helper.rb
index 8e64aa2d5..d0b27c2b5 100644
--- a/hawk/app/helpers/colocation_helper.rb
+++ b/hawk/app/helpers/colocation_helper.rb
@@ -6,7 +6,7 @@ def available_colocation_roles
{
"Started" => _("Started"),
"Master" => _("Promoted"),
- "Slave" => _("Promotable"),
+ "Slave" => _("Unpromoted"),
"Stopped" => _("Stopped")
}
end