Skip to content

Commit 4166c6f

Browse files
thicanthican
committed
Keeps private links number … private.
Modification on traduction files are flawed. Signed-off-by: Thibaud CANALE <[email protected]>
1 parent 5f54448 commit 4166c6f

File tree

8 files changed

+70
-32
lines changed

8 files changed

+70
-32
lines changed

‎application/front/controller/visitor/ShaarliVisitorController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ protected function render(string $template): string
6161
$this->assignView('template', $template);
6262

6363
$this->assignView('linkcount', $this->container->bookmarkService->count(BookmarkFilter::$ALL));
64+
$this->assignView('publicLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PUBLIC));
6465
$this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE));
6566

6667
$this->executeDefaultHooks($template);

‎inc/languages/de/LC_MESSAGES/shaarli.po‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,18 +1483,25 @@ msgstr "Server-Anforderungen"
14831483

14841484
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
14851485
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:79
1486-
msgid "shaare"
1487-
msgid_plural "shaares"
1488-
msgstr[0] "Shaare"
1489-
msgstr[1] "Shaares"
1486+
msgid "total shaare"
1487+
msgid_plural "total shaares"
1488+
msgstr[0] "Shaare insgesamt"
1489+
msgstr[1] "Shaares insgesamt"
14901490

1491-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18
1492-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83
1491+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
1492+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81
14931493
msgid "private link"
14941494
msgid_plural "private links"
14951495
msgstr[0] "Privater Link"
14961496
msgstr[1] "Private Links"
14971497

1498+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:20
1499+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:85
1500+
msgid "shaare"
1501+
msgid_plural "shaares"
1502+
msgstr[0] "Shaare"
1503+
msgstr[1] "Shaares"
1504+
14981505
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30
14991506
#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:123
15001507
#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:123

‎inc/languages/fr/LC_MESSAGES/shaarli.po‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,18 +1409,25 @@ msgstr "Pré-requis serveur"
14091409

14101410
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
14111411
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:79
1412-
msgid "shaare"
1413-
msgid_plural "shaares"
1414-
msgstr[0] "shaare"
1415-
msgstr[1] "shaares"
1412+
msgid "total shaare"
1413+
msgid_plural "total shaares"
1414+
msgstr[0] "shaare au total"
1415+
msgstr[1] "shaares au total"
14161416

1417-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18
1418-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83
1417+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
1418+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81
14191419
msgid "private link"
14201420
msgid_plural "private links"
14211421
msgstr[0] "lien privé"
14221422
msgstr[1] "liens privés"
14231423

1424+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:20
1425+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:85
1426+
msgid "shaare"
1427+
msgid_plural "shaares"
1428+
msgstr[0] "shaare"
1429+
msgstr[1] "shaares"
1430+
14241431
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30
14251432
#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:123
14261433
#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:123

‎inc/languages/jp/LC_MESSAGES/shaarli.po‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,8 +1181,8 @@ msgstr[1] "検索"
11811181
#~ msgid "Install"
11821182
#~ msgstr "インストール"
11831183

1184-
#~ msgid "shaare"
1185-
#~ msgid_plural "shaares"
1184+
#~ msgid "total shaare"
1185+
#~ msgid_plural "total shaares"
11861186
#~ msgstr[0] "共有"
11871187
#~ msgstr[1] "共有"
11881188

@@ -1191,6 +1191,11 @@ msgstr[1] "検索"
11911191
#~ msgstr[0] "プライベートリンク"
11921192
#~ msgstr[1] "プライベートリンク"
11931193

1194+
#~ msgid "shaare"
1195+
#~ msgid_plural "shaares"
1196+
#~ msgstr[0] "共有"
1197+
#~ msgstr[1] "共有"
1198+
11941199
#~ msgid "Search text"
11951200
#~ msgstr "文字列で検索"
11961201

‎inc/languages/ru/LC_MESSAGES/shaarli.po‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,20 +1391,28 @@ msgstr "Системные требования"
13911391

13921392
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
13931393
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:79
1394-
msgid "shaare"
1395-
msgid_plural "shaares"
1394+
msgid "total shaare"
1395+
msgid_plural "total shaares"
13961396
msgstr[0] "закладка"
13971397
msgstr[1] "закладки"
13981398
msgstr[2] "закладок"
13991399

1400-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18
1401-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83
1400+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
1401+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81
14021402
msgid "private link"
14031403
msgid_plural "private links"
14041404
msgstr[0] "личная ссылка"
14051405
msgstr[1] "личные ссылки"
14061406
msgstr[2] "личных ссылок"
14071407

1408+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:20
1409+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:85
1410+
msgid "shaare"
1411+
msgid_plural "shaares"
1412+
msgstr[0] "закладка"
1413+
msgstr[1] "закладки"
1414+
msgstr[2] "закладок"
1415+
14081416
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30
14091417
#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:123
14101418
#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:123

‎inc/languages/zh_CN/LC_MESSAGES/shaarli.po‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,16 +1214,22 @@ msgstr "添加默认标签"
12141214

12151215
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
12161216
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:79
1217-
msgid "shaare"
1218-
msgid_plural "shaares"
1217+
msgid "total shaare"
1218+
msgid_plural "total shaares"
12191219
msgstr[0] "条记录"
12201220

1221-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18
1222-
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83
1221+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
1222+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81
12231223
msgid "private link"
12241224
msgid_plural "private links"
12251225
msgstr[0] "私有链接"
12261226

1227+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:20
1228+
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:85
1229+
msgid "shaare"
1230+
msgid_plural "shaares"
1231+
msgstr[0] "条记录"
1232+
12271233
#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30
12281234
#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:123
12291235
msgid "Search text"

‎tpl/default/linklist.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
{include="page.header"}
88

99
<div class="linkcount pure-u-0 pure-u-lg-visible">
10-
{if="!empty($linkcount)"}
11-
<span class="strong">{$linkcount}</span> {function="t('shaare', 'shaares', $linkcount)"}
12-
{if="$privateLinkcount>0"}
10+
{if="$is_logged_in"}
11+
<span class="strong">{$linkcount}</span> {function="t('total shaare', 'total shaares', $linkcount)"}
1312
<br><span class="strong">{$privateLinkcount}</span> {function="t('private link', 'private links', $privateLinkcount)"}
14-
{/if}
13+
{else}
14+
<span class="strong">{$publicLinkcount}</span> {function="t('shaare', 'shaares', $publicLinkcount)"}
1515
{/if}
1616
</div>
1717

@@ -56,11 +56,11 @@
5656
<div class="pure-u-lg-2-24 pure-u-1-24"></div>
5757
<div id="link-count-content" class="pure-u-lg-20-24 pure-u-22-24">
5858
<div class="linkcount pure-u-lg-0 center">
59-
{if="!empty($linkcount)"}
60-
<span class="strong">{$linkcount}</span> {function="t('shaare', 'shaares', $linkcount)"}
61-
{if="$privateLinkcount>0"}
59+
{if="$is_logged_in"}
60+
<span class="strong">{$linkcount}</span> total {function="t('shaare', 'shaares', $linkcount)"}
6261
&middot; <span class="strong">{$privateLinkcount}</span> {function="t('private link', 'private links', $privateLinkcount)"}
63-
{/if}
62+
{else}
63+
<span class="strong">{$publicLinkcount}</span> {function="t('shaare', 'shaares', $publicLinkcount)"}
6464
{/if}
6565
</div>
6666

‎tpl/vintage/page.header.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
<div id="logo" title="Share your links !" onclick="document.location='{$titleLink}';"></div>
33

44
<div id="linkcount" class="nomobile">
5-
{if="!empty($linkcount)"}{$linkcount} links{/if}<br>
6-
{if="!empty($privateLinkcount)"}{$privateLinkcount} private links{/if}
5+
{if="$is_logged_in"}
6+
{$linkcount} total links<br>
7+
{$privateLinkcount} private links
8+
{else}
9+
{$publicLinkcount} links
10+
{/if}
711
</div>
812

913
<div id="menu">

0 commit comments

Comments
 (0)