From 06d293a84e73dfbd871c9fa6325cd352e016466c Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Wed, 9 Dec 2015 14:36:39 +1100 Subject: Only show comparison link for >2 commits #1110 We can look at the PushCommits object to see how many commits were included in a commit, and add some template logic to only show the comparison link when there are at least 2 commits in a push. We also correct the link to display the number of commits. --- conf/locale/locale_bg-BG.ini | 2 +- conf/locale/locale_de-DE.ini | 2 +- conf/locale/locale_en-US.ini | 2 +- conf/locale/locale_es-ES.ini | 2 +- conf/locale/locale_fr-FR.ini | 2 +- conf/locale/locale_it-IT.ini | 2 +- conf/locale/locale_ja-JP.ini | 2 +- conf/locale/locale_lv-LV.ini | 2 +- conf/locale/locale_nl-NL.ini | 2 +- conf/locale/locale_pl-PL.ini | 2 +- conf/locale/locale_pt-BR.ini | 2 +- conf/locale/locale_ru-RU.ini | 2 +- conf/locale/locale_zh-CN.ini | 2 +- conf/locale/locale_zh-HK.ini | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'conf') diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini index 084def8536..b609786a71 100755 --- a/conf/locale/locale_bg-BG.ini +++ b/conf/locale/locale_bg-BG.ini @@ -1018,7 +1018,7 @@ comment_issue=`коментира проблем %s#%[2]s merge_pull_request=`обедини заявка за сливане %s#%[2]s` transfer_repo=прехвърли хранилище %s към %s push_tag=предаде маркер %[2]s към [3]s -compare_2_commits=Сравнение между тези 2 ревизии +compare_commits=Сравнение между тези %d ревизии [tool] ago=преди diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini index bd2224f1bc..eef5393d3c 100755 --- a/conf/locale/locale_de-DE.ini +++ b/conf/locale/locale_de-DE.ini @@ -1018,7 +1018,7 @@ comment_issue=`hat Issue %s#%[2]s kommentiert` merge_pull_request=`Pull-Request %s#%[2]s zuammengeführt` transfer_repo=hat Repository %s transferiert an %s push_tag=hat nach %[2]s in %[3]s gepusht -compare_2_commits=Zeige Vergleich dieser 2 Commits +compare_commits=Zeige Vergleich dieser %d Commits [tool] ago=vor diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 70f611662f..f1b3740562 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -1021,7 +1021,7 @@ comment_issue = `commented on issue %s#%[2]s` merge_pull_request = `merged pull request %s#%[2]s` transfer_repo = transfered repository %s to %s push_tag = pushed tag %[2]s to %[3]s -compare_2_commits = View comparison for these 2 commits +compare_commits = View comparison for these %d commits [tool] ago = ago diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini index 321b970f14..4cbf62d9a4 100755 --- a/conf/locale/locale_es-ES.ini +++ b/conf/locale/locale_es-ES.ini @@ -1018,7 +1018,7 @@ comment_issue=`comentó en la incidencia %s#%[2]s` merge_pull_request=`fusionado pull request %s#%[2]s` transfer_repo=transfirió el repositorio %s a %s push_tag=hizo push del tag %[2]s a %[3]s -compare_2_commits=Ver la comparación de estos 2 commits +compare_commits=Ver la comparación de estos %d commits [tool] ago=hace diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini index 01275bccaf..3422955df8 100755 --- a/conf/locale/locale_fr-FR.ini +++ b/conf/locale/locale_fr-FR.ini @@ -1018,7 +1018,7 @@ comment_issue=`a commenté le problème %s#%[2]s` merge_pull_request=`pull request fusionné le %s#%[2]s` transfer_repo=a transféré le dépôt %s à %s push_tag=a soumis le tag %[2]s à %[3]s -compare_2_commits=Comparer ces 2 commits +compare_commits=Comparer ces %d commits [tool] ago=auparavant diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini index f3a70902a5..024716e0c6 100755 --- a/conf/locale/locale_it-IT.ini +++ b/conf/locale/locale_it-IT.ini @@ -1018,7 +1018,7 @@ comment_issue=`ha commentato il problema %s#%[2]s` merge_pull_request=`merged pull request %s#%[2]s` transfer_repo=ha trasferito il repository %s a %s push_tag=ha pushato il tag %[2]s a %[3]s -compare_2_commits=Vedi confronto per questi 2 commit +compare_commits=Vedi confronto per questi %d commit [tool] ago=fa diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini index 16b963aba0..f12a97de07 100755 --- a/conf/locale/locale_ja-JP.ini +++ b/conf/locale/locale_ja-JP.ini @@ -1018,7 +1018,7 @@ comment_issue=`問題 %s#%[2]s のコメント` merge_pull_request=`プルリクエスト %s[2]sをマージしました` transfer_repo=リポジトリ %s を %s へ転送しました push_tag=%[3]s に タグ %[2]s をプッシュしました -compare_2_commits=これら 2 のコミットの比較を閲覧する +compare_commits=これら %d のコミットの比較を閲覧する [tool] ago=前 diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini index 5771f0f794..107ce83092 100755 --- a/conf/locale/locale_lv-LV.ini +++ b/conf/locale/locale_lv-LV.ini @@ -1018,7 +1018,7 @@ comment_issue=`pievienoja komentāru problēmai %s#%[2]s< merge_pull_request=`sapludināja izmaiņu pieprasījumu %s#%[2]s` transfer_repo=mainīja repozitorija %s īpašnieku uz %s push_tag=pievienoja tagu %[2]s repozitorijam %[3]s -compare_2_commits=Veikt salīdzināšanu starp šīm 2 revīzijām +compare_commits=Veikt salīdzināšanu starp šīm %d revīzijām [tool] ago=atpakaļ diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini index 1301d3ff63..995bf00c6d 100755 --- a/conf/locale/locale_nl-NL.ini +++ b/conf/locale/locale_nl-NL.ini @@ -1018,7 +1018,7 @@ comment_issue=`reactie op issue %s#%[2]s` merge_pull_request=`merged pull request %s#%[2]s` transfer_repo=repositorie verplaatst naar %s naar %s push_tag=geduwd label %[2]s naar %[3]s -compare_2_commits=Weergave vergelijking voor deze 2 commits +compare_commits=Weergave vergelijking voor deze %d commits [tool] ago=geleden diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini index 6d1fc8848f..35e9f83b28 100755 --- a/conf/locale/locale_pl-PL.ini +++ b/conf/locale/locale_pl-PL.ini @@ -1018,7 +1018,7 @@ comment_issue=`skomentował problem #%[2]s %[3]s` merge_pull_request=scalił pull request %s #%[2]s" transfer_repo=przeniósł repozytorium %s do %s push_tag=opublikował tag %[2]s w %[3]s -compare_2_commits=Zobacz porównanie tych 2 commitów +compare_commits=Zobacz porównanie tych %d commitów [tool] ago=temu diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini index 39f5141ce8..aa4b0aa36a 100755 --- a/conf/locale/locale_pt-BR.ini +++ b/conf/locale/locale_pt-BR.ini @@ -1018,7 +1018,7 @@ comment_issue='comentou sobre a questão %s#%[2]s' merge_pull_request=`mesclou o pull request %s#%[2]s` transfer_repo=repositório transferido de %s para %s push_tag=Foi feito push na tag %[2]s para %[3]s -compare_2_commits=Ver comparação desses 2 commits +compare_commits=Ver comparação desses %d commits [tool] ago=atrás diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini index d94dcfca37..bf685f772b 100755 --- a/conf/locale/locale_ru-RU.ini +++ b/conf/locale/locale_ru-RU.ini @@ -1018,7 +1018,7 @@ comment_issue=`прокомментировал(а) вопрос %s#%[2]s` transfer_repo=перенес репозиторий %s в %s push_tag=запушил тэг %[2]s в %[3]s -compare_2_commits=Просмотреть сравнение двух коммитов +compare_commits=Просмотреть сравнение %d коммитов [tool] ago=назад diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 7f5d38a8ba..9b6e3dc2b1 100755 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -1018,7 +1018,7 @@ comment_issue=`评论了工单 %s#%[2]s` merge_pull_request=`合并了合并请求 %s#%[2]s` transfer_repo=将仓库 %s 转移至 %s push_tag=推送了标签 %[2]s 到 %[3]s -compare_2_commits=查看 2 次提交的内容对比 +compare_commits=查看 %d 次提交的内容对比 [tool] ago=之前 diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini index 5ce105ca46..4a9298e34f 100755 --- a/conf/locale/locale_zh-HK.ini +++ b/conf/locale/locale_zh-HK.ini @@ -1018,7 +1018,7 @@ comment_issue=`評論了問題 %s#%[2]s` merge_pull_request=`merged pull request %s#%[2]s` transfer_repo=將倉庫 %s 轉移至 %s push_tag=推送了標籤 %[2]s 到 %[3]s -compare_2_commits=查看 2 次提交的內容對比 +compare_commits=查看 %d 次提交的內容對比 [tool] ago=之前 -- cgit v1.2.3