diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2016-02-25 14:26:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-26 17:20:38 +0000 |
commit | e0fd96442a20e3fe7953bf38fc02520cd0dd4d6a (patch) | |
tree | 1d505a47e038d11f2a4581c3554e622e1ec0909a /bitbake/lib/toaster/toastergui/static/js | |
parent | 6e8282063f35bc5c8c6e8117c54f055b3b524d01 (diff) | |
download | poky-e0fd96442a20e3fe7953bf38fc02520cd0dd4d6a.tar.gz |
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>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/static/js')
4 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerBtn.js b/bitbake/lib/toaster/toastergui/static/js/layerBtn.js index 7318b3f50e..b2666ab92c 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerBtn.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerBtn.js | |||
@@ -42,7 +42,7 @@ function layerBtnsInit() { | |||
42 | }); | 42 | }); |
43 | }); | 43 | }); |
44 | } else { | 44 | } else { |
45 | notification.text("1 layer deleted"); | 45 | notification.text("1 layer removed"); |
46 | /* Deleting a layer we only hanlde the one button */ | 46 | /* Deleting a layer we only hanlde the one button */ |
47 | thisBtn.fadeOut(function(){ | 47 | thisBtn.fadeOut(function(){ |
48 | notification.fadeIn().delay(500).fadeOut(function(){ | 48 | notification.fadeIn().delay(500).fadeOut(function(){ |
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 663b3c6bf3..d545406262 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js | |||
@@ -243,7 +243,7 @@ function layerDetailsPageInit (ctx) { | |||
243 | $(".select-machine-btn").removeAttr("disabled"); | 243 | $(".select-machine-btn").removeAttr("disabled"); |
244 | addRmLayerBtn.addClass("btn-danger"); | 244 | addRmLayerBtn.addClass("btn-danger"); |
245 | addRmLayerBtn.data('directive', "remove"); | 245 | addRmLayerBtn.data('directive', "remove"); |
246 | addRmLayerBtn.text(" Delete the "+ctx.layerVersion.name+" layer from your project"); | 246 | addRmLayerBtn.text(" Remove the "+ctx.layerVersion.name+" layer from your project"); |
247 | addRmLayerBtn.prepend("<span class=\"icon-trash\"></span>"); | 247 | addRmLayerBtn.prepend("<span class=\"icon-trash\"></span>"); |
248 | 248 | ||
249 | } else { | 249 | } else { |
diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index a3858ec7ef..b6b49b6b4d 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js | |||
@@ -316,7 +316,7 @@ var libtoaster = (function (){ | |||
316 | } else if (layerDepsList.length === 0 && add === true) { | 316 | } else if (layerDepsList.length === 0 && add === true) { |
317 | alertMsg = $("<span>You have added <strong>1</strong> layer to your project: <a id=\"layer-affected-name\"></a></span></span>"); | 317 | alertMsg = $("<span>You have added <strong>1</strong> layer to your project: <a id=\"layer-affected-name\"></a></span></span>"); |
318 | } else if (add === false) { | 318 | } else if (add === false) { |
319 | alertMsg = $("<span>You have deleted <strong>1</strong> layer from your project: <a id=\"layer-affected-name\"></a></span>"); | 319 | alertMsg = $("<span>You have removed <strong>1</strong> layer from your project: <a id=\"layer-affected-name\"></a></span>"); |
320 | } | 320 | } |
321 | 321 | ||
322 | alertMsg.children("#layer-affected-name").text(layer.name); | 322 | alertMsg.children("#layer-affected-name").text(layer.name); |
diff --git a/bitbake/lib/toaster/toastergui/static/js/projectpage.js b/bitbake/lib/toaster/toastergui/static/js/projectpage.js index 0666bde907..292ceb7db0 100644 --- a/bitbake/lib/toaster/toastergui/static/js/projectpage.js +++ b/bitbake/lib/toaster/toastergui/static/js/projectpage.js | |||
@@ -1,4 +1,4 @@ | |||
1 | "use strict"; | 1 | |
2 | 2 | ||
3 | function projectPageInit(ctx) { | 3 | function projectPageInit(ctx) { |
4 | 4 | ||
@@ -145,7 +145,7 @@ function projectPageInit(ctx) { | |||
145 | for (var i in layers){ | 145 | for (var i in layers){ |
146 | var layerObj = layers[i]; | 146 | var layerObj = layers[i]; |
147 | 147 | ||
148 | var projectLayer = $("<li><a></a><span class=\"icon-trash\" data-toggle=\"tooltip\" title=\"Delete\"></span></li>"); | 148 | var projectLayer = $("<li><a></a><span class=\"icon-trash\" data-toggle=\"tooltip\" title=\"Remove\"></span></li>"); |
149 | 149 | ||
150 | projectLayer.data('layer', layerObj); | 150 | projectLayer.data('layer', layerObj); |
151 | projectLayer.children("span").tooltip(); | 151 | projectLayer.children("span").tooltip(); |
@@ -393,7 +393,7 @@ function projectPageInit(ctx) { | |||
393 | /* Layers removed */ | 393 | /* Layers removed */ |
394 | if (layersToRm && layersToRm.length > 0){ | 394 | if (layersToRm && layersToRm.length > 0){ |
395 | if (layersToRm.length == 1) | 395 | if (layersToRm.length == 1) |
396 | li = '<li><strong>1</strong> layer deleted: '+layersToRm[0].name+'</li>'; | 396 | li = '<li><strong>1</strong> layer removed: '+layersToRm[0].name+'</li>'; |
397 | else | 397 | else |
398 | li = '<li><strong>'+layersToRm.length+'</strong> layers deleted: '+layersDelList+'</li>'; | 398 | li = '<li><strong>'+layersToRm.length+'</strong> layers deleted: '+layersDelList+'</li>'; |
399 | 399 | ||