Add "delivery done" label

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 6e2483c6a0c42e368c09dc06a2e0a641c3afb8da..ba05a168d2cae3c0a73a8917d5aa9567e21f071c 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -432,6 +432,7 @@ class Post extends BaseObject
                                'delivery_pending'  => L10n::t('Delivery to remote servers is pending'),
                                'delivery_underway' => L10n::t('Delivery to remote servers is underway'),
                                'delivery_almost'   => L10n::t('Delivery to remote servers is mostly done'),
+                               'delivery_done'     => L10n::t('Delivery to remote servers is done'),
                        ],
                ];
 

diff --git a/view/templates/sub/delivery_count.tpl b/view/templates/sub/delivery_count.tpl
index 6ee4be0fe2e880b8ce1a5cd9964b6478158292af..997a0e7d6bcd0a8f459f5ad5d566d57ab6c71a54 100644 (file)
--- a/view/templates/sub/delivery_count.tpl
+++ b/view/templates/sub/delivery_count.tpl
@@ -11,8 +11,10 @@
                {{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
        {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
                {{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
-       {{else}}\r
+       {{elseif $delivery.queue_done < $delivery.queue_count}}\r
                {{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{else}}\r
+               {{$delivery.delivery_done}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
        {{/if}}\r
 </span>\r
 {{/if}}\r

diff --git a/view/theme/frio/templates/sub/delivery_count.tpl b/view/theme/frio/templates/sub/delivery_count.tpl
index 983b49caacdcb2842063c5e226001018b5c5d07b..94a0a78802be17731923f1c385aaeb0fc8a31e28 100644 (file)
--- a/view/theme/frio/templates/sub/delivery_count.tpl
+++ b/view/theme/frio/templates/sub/delivery_count.tpl
@@ -10,9 +10,12 @@
        {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
                <i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
                <span class="sr-only">{{$delivery.delivery_underway}}</span>\r
-       {{else}}\r
+       {{elseif $delivery.queue_done < $delivery.queue_count}}\r
                <i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
                <span class="sr-only">{{$delivery.delivery_almost}}</span>\r
+       {{else}}\r
+               <i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_done}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_done}}</span>\r
        {{/if}}\r
 </span>\r
 {{/if}}\r