bitbake: toaster: change 'delete layer' to 'remove layer'
I have received quite a few complaints about the use of the word 'delete' for layer removal, so change it to 'remove'. That also matches the language we use for packages in image customisation. [YOCTO #9165] (Bitbake rev: 3c5ac2ddfb3f5ecd3f3218de0d6564e5f3842b98) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6e8282063f
commit
e0fd96442a
|
@ -42,7 +42,7 @@ function layerBtnsInit() {
|
|||
});
|
||||
});
|
||||
} else {
|
||||
notification.text("1 layer deleted");
|
||||
notification.text("1 layer removed");
|
||||
/* Deleting a layer we only hanlde the one button */
|
||||
thisBtn.fadeOut(function(){
|
||||
notification.fadeIn().delay(500).fadeOut(function(){
|
||||
|
|
|
@ -243,7 +243,7 @@ function layerDetailsPageInit (ctx) {
|
|||
$(".select-machine-btn").removeAttr("disabled");
|
||||
addRmLayerBtn.addClass("btn-danger");
|
||||
addRmLayerBtn.data('directive', "remove");
|
||||
addRmLayerBtn.text(" Delete the "+ctx.layerVersion.name+" layer from your project");
|
||||
addRmLayerBtn.text(" Remove the "+ctx.layerVersion.name+" layer from your project");
|
||||
addRmLayerBtn.prepend("<span class=\"icon-trash\"></span>");
|
||||
|
||||
} else {
|
||||
|
|
|
@ -316,7 +316,7 @@ var libtoaster = (function (){
|
|||
} else if (layerDepsList.length === 0 && add === true) {
|
||||
alertMsg = $("<span>You have added <strong>1</strong> layer to your project: <a id=\"layer-affected-name\"></a></span></span>");
|
||||
} else if (add === false) {
|
||||
alertMsg = $("<span>You have deleted <strong>1</strong> layer from your project: <a id=\"layer-affected-name\"></a></span>");
|
||||
alertMsg = $("<span>You have removed <strong>1</strong> layer from your project: <a id=\"layer-affected-name\"></a></span>");
|
||||
}
|
||||
|
||||
alertMsg.children("#layer-affected-name").text(layer.name);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
"use strict";
|
||||
|
||||
|
||||
function projectPageInit(ctx) {
|
||||
|
||||
|
@ -145,7 +145,7 @@ function projectPageInit(ctx) {
|
|||
for (var i in layers){
|
||||
var layerObj = layers[i];
|
||||
|
||||
var projectLayer = $("<li><a></a><span class=\"icon-trash\" data-toggle=\"tooltip\" title=\"Delete\"></span></li>");
|
||||
var projectLayer = $("<li><a></a><span class=\"icon-trash\" data-toggle=\"tooltip\" title=\"Remove\"></span></li>");
|
||||
|
||||
projectLayer.data('layer', layerObj);
|
||||
projectLayer.children("span").tooltip();
|
||||
|
@ -393,7 +393,7 @@ function projectPageInit(ctx) {
|
|||
/* Layers removed */
|
||||
if (layersToRm && layersToRm.length > 0){
|
||||
if (layersToRm.length == 1)
|
||||
li = '<li><strong>1</strong> layer deleted: '+layersToRm[0].name+'</li>';
|
||||
li = '<li><strong>1</strong> layer removed: '+layersToRm[0].name+'</li>';
|
||||
else
|
||||
li = '<li><strong>'+layersToRm.length+'</strong> layers deleted: '+layersDelList+'</li>';
|
||||
|
||||
|
|
|
@ -183,8 +183,8 @@ class LayersTable(ToasterTable):
|
|||
static_data_name="dependencies",
|
||||
static_data_template=deps_template)
|
||||
|
||||
self.add_column(title="Add | Delete",
|
||||
help_text="Add or delete layers to / from your project",
|
||||
self.add_column(title="Add | Remove",
|
||||
help_text="Add or remove layers to / from your project",
|
||||
hideable=False,
|
||||
filter_name="in_current_project",
|
||||
static_data_name="add-del-layers",
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
{% endif %}
|
||||
>
|
||||
<i class="icon-trash"></i>
|
||||
Delete layer
|
||||
Remove layer
|
||||
</button>
|
||||
<button class="btn btn-block layer-add-{{data.pk}} layerbtn" data-layer='{ "id": {{data.pk}}, "name": "{{data.layer.name}}", "layerdetailurl": "{%url 'layerdetails' extra.pid data.pk%}"}' data-directive="add"
|
||||
{% if data.pk in extra.current_layers %}
|
||||
|
|
|
@ -106,7 +106,7 @@
|
|||
{% else %}
|
||||
<button id="add-remove-layer-btn" data-directive="remove" class="btn btn-block btn-large btn-danger">
|
||||
<span class="icon-trash"></span>
|
||||
Delete the {{layerversion.layer.name}} layer from your project
|
||||
Remove the {{layerversion.layer.name}} layer from your project
|
||||
</button>
|
||||
{% endif %}
|
||||
</span>
|
||||
|
|
Loading…
Reference in New Issue