[oe-commits] [bitbake] 20/20: toaster: change 'delete layer' to 'remove layer'
git at git.openembedded.org
git at git.openembedded.org
Thu Feb 25 17:59:37 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit 4c0cfbcf0166cc6673534d6c495db8707d5d088b
Author: Belen Barros Pena <belen.barros.pena at intel.com>
AuthorDate: Thu Feb 25 14:26:54 2016 +0000
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]
Signed-off-by: Belen Barros Pena <belen.barros.pena at intel.com>
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/toaster/toastergui/static/js/layerBtn.js | 2 +-
lib/toaster/toastergui/static/js/layerdetails.js | 2 +-
lib/toaster/toastergui/static/js/libtoaster.js | 2 +-
lib/toaster/toastergui/static/js/projectpage.js | 6 +++---
lib/toaster/toastergui/tables.py | 4 ++--
lib/toaster/toastergui/templates/layer_btn.html | 2 +-
lib/toaster/toastergui/templates/layerdetails.html | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/toaster/toastergui/static/js/layerBtn.js b/lib/toaster/toastergui/static/js/layerBtn.js
index 7318b3f..b2666ab 100644
--- a/lib/toaster/toastergui/static/js/layerBtn.js
+++ b/lib/toaster/toastergui/static/js/layerBtn.js
@@ -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(){
diff --git a/lib/toaster/toastergui/static/js/layerdetails.js b/lib/toaster/toastergui/static/js/layerdetails.js
index 663b3c6..d545406 100644
--- a/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/lib/toaster/toastergui/static/js/layerdetails.js
@@ -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 {
diff --git a/lib/toaster/toastergui/static/js/libtoaster.js b/lib/toaster/toastergui/static/js/libtoaster.js
index a3858ec..b6b49b6 100644
--- a/lib/toaster/toastergui/static/js/libtoaster.js
+++ b/lib/toaster/toastergui/static/js/libtoaster.js
@@ -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);
diff --git a/lib/toaster/toastergui/static/js/projectpage.js b/lib/toaster/toastergui/static/js/projectpage.js
index 0666bde..292ceb7 100644
--- a/lib/toaster/toastergui/static/js/projectpage.js
+++ b/lib/toaster/toastergui/static/js/projectpage.js
@@ -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>';
diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py
index 9115309..71892e2 100644
--- a/lib/toaster/toastergui/tables.py
+++ b/lib/toaster/toastergui/tables.py
@@ -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",
diff --git a/lib/toaster/toastergui/templates/layer_btn.html b/lib/toaster/toastergui/templates/layer_btn.html
index 314eec7..10de37d 100644
--- a/lib/toaster/toastergui/templates/layer_btn.html
+++ b/lib/toaster/toastergui/templates/layer_btn.html
@@ -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 %}
diff --git a/lib/toaster/toastergui/templates/layerdetails.html b/lib/toaster/toastergui/templates/layerdetails.html
index 61ae52c..f960061 100644
--- a/lib/toaster/toastergui/templates/layerdetails.html
+++ b/lib/toaster/toastergui/templates/layerdetails.html
@@ -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>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list