diff --git a/src/Object/Post.php b/src/Object/Post.php
index 4c377e946..e7a178ef1 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -248,9 +248,6 @@ class Post
$pinned = DI::l10n()->t('Pinned item');
}
- // Showing the one or the other text, depending upon if we can only hide it or really delete it.
- $delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally');
-
$drop = false;
$block = false;
$ignore = false;
@@ -261,24 +258,24 @@ class Post
'dropping' => $dropping,
'pagedrop' => $item['pagedrop'],
'select' => DI::l10n()->t('Select'),
- 'delete' => $delete,
+ 'label' => $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally'),
];
}
if (!$item['self'] && DI::userSession()->getLocalUserId()) {
$block = [
'blocking' => true,
- 'block' => DI::l10n()->t('Block %s', $item['author-name']),
+ 'label' => DI::l10n()->t('Block %s', $item['author-name']),
'author_id' => $item['author-id'],
];
$ignore = [
'ignoring' => true,
- 'ignore' => DI::l10n()->t('Ignore %s', $item['author-name']),
+ 'label' => DI::l10n()->t('Ignore %s', $item['author-name']),
'author_id' => $item['author-id'],
];
$collapse = [
'collapsing' => true,
- 'collapse' => DI::l10n()->t('Collapse %s', $item['author-name']),
+ 'label' => DI::l10n()->t('Collapse %s', $item['author-name']),
'author_id' => $item['author-id'],
];
$report = [
diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl
index fc322be95..4320ec6cf 100644
--- a/view/templates/search_item.tpl
+++ b/view/templates/search_item.tpl
@@ -7,8 +7,8 @@
-
@@ -19,17 +19,17 @@
-
+
{{if $item.lock}}
- {{else}}
{{/if}}
+ {{else}}
{{/if}}
{{$item.location_html nofilter}}
+
{{$item.ago}} {{$item.pinned}}
+
{{$item.title}}
@@ -46,7 +46,7 @@
@@ -44,7 +44,7 @@
{{/if}}
{{if $item.drop && $item.drop.dropping}}
- {{$item.drop.delete}}
+ {{$item.drop.label}}
{{/if}}
diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 1683f10d0..197ce776f 100644
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -149,7 +149,7 @@
{{/if}}
{{if $item.drop && $item.drop.dropping}}
- {{$item.drop.delete}}
+ {{$item.drop.label}}
{{/if}}
{{if $item.edpost}}
diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
index 94d713267..89d51701a 100644
--- a/view/theme/smoothly/templates/search_item.tpl
+++ b/view/theme/smoothly/templates/search_item.tpl
@@ -5,8 +5,8 @@
{{$item.uriid}}
-
@@ -17,16 +17,16 @@
-
+
{{if $item.location_html}} {{$item.location_html nofilter}} {{/if}}
{{if $item.lock}}
- {{else}}
{{/if}}
+ {{else}}
{{/if}}
+
diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
index 53602cc8f..594799f6b 100644
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -136,7 +136,7 @@
{{if $item.drop && $item.drop.dropping}}
-
+
{{/if}}
diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
index e556335a5..51de297d3 100644
--- a/view/theme/vier/templates/search_item.tpl
+++ b/view/theme/vier/templates/search_item.tpl
@@ -80,7 +80,7 @@
{{/if}}
{{if $item.drop && $item.drop.dropping}}
- {{$item.drop.delete}}
+ {{$item.drop.label}}
{{/if}}
{{if $item.edpost}}
diff --git a/view/theme/vier/templates/wall_item_tag.tpl b/view/theme/vier/templates/wall_item_tag.tpl
index c12cb7085..92cfaf914 100644
--- a/view/theme/vier/templates/wall_item_tag.tpl
+++ b/view/theme/vier/templates/wall_item_tag.tpl
@@ -3,12 +3,12 @@
{{else}}
{{if $item.comment_firstcollapsed}}
{{$item.location_html nofilter}}
@@ -44,7 +44,7 @@
{{/if}}
{{if $item.drop && $item.drop.dropping}}
- {{$item.drop.delete}}
+ {{$item.drop.label}}
{{/if}}
{{$item.item_photo_menu_html nofilter}}
- +