Skip to content

Commit b50802e

Browse files
committed
Merge branch 'main' into refactor-remove-class-shortcuts
2 parents 86b3d1d + 6af7618 commit b50802e

27 files changed

Lines changed: 97 additions & 84 deletions

app/components/Package/DeprecatedTree.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function getDepthStyle(depth: DependencyDepth) {
8888
name: 'package',
8989
params: { package: [...pkg.name.split('/'), 'v', pkg.version] },
9090
}"
91-
class="font-mono text-sm font-medium hover:underline truncate"
91+
class="font-mono text-sm font-medium hover:underline truncate py-4"
9292
:class="getDepthStyle(pkg.depth).text"
9393
>
9494
{{ pkg.name }}@{{ pkg.version }}

app/components/Package/ListToolbar.vue

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,18 @@ function getSortKeyLabelKey(key: SortKey): string {
115115
>
116116
<template v-if="showingFiltered">
117117
{{
118-
$t('filters.count.showing_filtered', {
119-
filtered: filteredCount.toLocaleString(),
120-
count: totalCount.toLocaleString(),
121-
})
118+
$t(
119+
'filters.count.showing_filtered',
120+
{
121+
filtered: $n(filteredCount),
122+
count: $n(totalCount),
123+
},
124+
totalCount,
125+
)
122126
}}
123127
</template>
124128
<template v-else>
125-
{{ $t('filters.count.showing_all', { count: totalCount.toLocaleString() }) }}
129+
{{ $t('filters.count.showing_all', { count: $n(totalCount) }, totalCount) }}
126130
</template>
127131
</div>
128132

@@ -132,10 +136,14 @@ function getSortKeyLabelKey(key: SortKey): string {
132136
class="text-sm font-mono text-fg-muted"
133137
>
134138
{{
135-
$t('filters.count.showing_paginated', {
136-
pageSize: pageSize === 'all' ? filteredCount : pageSize,
137-
count: filteredCount.toLocaleString(),
138-
})
139+
$t(
140+
'filters.count.showing_paginated',
141+
{
142+
pageSize: pageSize === 'all' ? $n(filteredCount) : pageSize,
143+
count: $n(filteredCount),
144+
},
145+
filteredCount,
146+
)
139147
}}
140148
</div>
141149

app/components/PaginationControls.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ function handlePageSizeChange(event: Event) {
181181
$t('filters.pagination.showing', {
182182
start: startItem,
183183
end: endItem,
184-
total: totalItems.toLocaleString(),
184+
total: $n(totalItems),
185185
})
186186
}}
187187
</span>

app/pages/[...package].vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ function handleClick(event: MouseEvent) {
979979
<h2 id="readme-heading" class="group text-xs text-fg-subtle uppercase tracking-wider mb-4">
980980
<a
981981
href="#readme"
982-
class="inline-flex items-center gap-1.5 text-fg-subtle hover:text-fg-muted transition-colors duration-200 no-underline"
982+
class="inline-flex py-4 px-2 items-center gap-1.5 text-fg-subtle hover:text-fg-muted transition-colors duration-200 no-underline"
983983
>
984984
{{ $t('package.readme.title') }}
985985
<span

app/pages/about.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const { data: contributors, status: contributorsStatus } = useFetch<GitHubContri
5353

5454
<section class="prose prose-invert max-w-none space-y-8">
5555
<div>
56-
<h2 class="text-xs text-fg-subtle uppercase tracking-wider mb-4">
56+
<h2 class="text-lg text-fg-subtle uppercase tracking-wider mb-4">
5757
{{ $t('about.what_we_are.title') }}
5858
</h2>
5959
<p class="text-fg-muted leading-relaxed mb-4">
@@ -82,7 +82,7 @@ const { data: contributors, status: contributorsStatus } = useFetch<GitHubContri
8282
</div>
8383

8484
<div>
85-
<h2 class="text-xs text-fg-subtle uppercase tracking-wider mb-4">
85+
<h2 class="text-lg text-fg-subtle uppercase tracking-wider mb-4">
8686
{{ $t('about.what_we_are_not.title') }}
8787
</h2>
8888
<ul class="space-y-3 text-fg-muted list-none p-0">
@@ -167,8 +167,8 @@ const { data: contributors, status: contributorsStatus } = useFetch<GitHubContri
167167
</div>
168168

169169
<div>
170-
<h2 class="text-xs text-fg-subtle uppercase tracking-wider mb-4">
171-
{{ $t('about.contributors.title') }}
170+
<h2 class="text-lg text-fg-subtle uppercase tracking-wider mb-4">
171+
{{ contributors?.length ?? 0 }} {{ $t('about.contributors.title') }}
172172
</h2>
173173
<p class="text-fg-muted leading-relaxed mb-6">
174174
{{ $t('about.contributors.description') }}
@@ -205,7 +205,7 @@ const { data: contributors, status: contributorsStatus } = useFetch<GitHubContri
205205

206206
<!-- Get Involved CTAs -->
207207
<div>
208-
<h2 class="text-xs text-fg-subtle uppercase tracking-wider mb-6">
208+
<h2 class="text-lg text-fg-subtle uppercase tracking-wider mb-6">
209209
{{ $t('about.get_involved.title') }}
210210
</h2>
211211

app/pages/search.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,15 @@ defineOgImageComponent('Default', {
680680
class="text-fg-muted text-sm mt-4 font-mono"
681681
>
682682
{{
683-
$t('filters.count.showing_paginated', {
684-
pageSize: preferredPageSize === 'all' ? visibleResults.total : preferredPageSize,
685-
count: visibleResults.total.toLocaleString(),
686-
})
683+
$t(
684+
'filters.count.showing_paginated',
685+
{
686+
pageSize:
687+
preferredPageSize === 'all' ? $n(visibleResults.total) : preferredPageSize,
688+
count: $n(visibleResults.total),
689+
},
690+
visibleResults.total,
691+
)
687692
}}
688693
</p>
689694
</div>

i18n/locales/ar.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,9 +642,9 @@
642642
"nav_label": "التصفح"
643643
},
644644
"count": {
645-
"showing_filtered": "{filtered} من {total} حزمة",
646-
"showing_all": "{total} حزمة | حزمة واحدة | حزمتان | {total} حزم | {total} حزمة | {total} حزمة",
647-
"showing_paginated": "{pageSize} من {total} حزمة"
645+
"showing_filtered": "{filtered} من {count} حزمة",
646+
"showing_all": "{count} حزمة | حزمة واحدة | حزمتان | {count} حزم | {count} حزمة | {count} حزمة",
647+
"showing_paginated": "{pageSize} من {count} حزمة"
648648
},
649649
"table": {
650650
"security_warning": "تحذير أمني",

i18n/locales/az.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@
661661
"nav_label": "Səhifələmə"
662662
},
663663
"count": {
664-
"showing_filtered": "{total} paketdən {filtered}",
665-
"showing_all": "{total} paket",
666-
"showing_paginated": "{total} paketdən {pageSize}"
664+
"showing_filtered": "{count} paketdən {filtered}",
665+
"showing_all": "{count} paket",
666+
"showing_paginated": "{count} paketdən {pageSize}"
667667
},
668668
"table": {
669669
"security_warning": "Təhlükəsizlik xəbərdarlığı",

i18n/locales/es.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,9 @@
668668
"nav_label": "Paginación"
669669
},
670670
"count": {
671-
"showing_filtered": "{filtered} de {total} paquetes",
672-
"showing_all": "{total} paquetes",
673-
"showing_paginated": "{pageSize} de {total} paquetes"
671+
"showing_filtered": "{filtered} de {count} paquetes",
672+
"showing_all": "{count} paquetes",
673+
"showing_paginated": "{pageSize} de {count} paquetes"
674674
},
675675
"table": {
676676
"security_warning": "Advertencia de seguridad",

i18n/locales/fr-FR.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,9 @@
671671
"nav_label": "Pagination"
672672
},
673673
"count": {
674-
"showing_filtered": "{filtered} sur {total} paquets",
675-
"showing_all": "{total} paquets",
676-
"showing_paginated": "{pageSize} sur {total} paquets"
674+
"showing_filtered": "{filtered} sur {count} paquets",
675+
"showing_all": "{count} paquets",
676+
"showing_paginated": "{pageSize} sur {count} paquets"
677677
},
678678
"table": {
679679
"security_warning": "Avertissement de sécurité",

0 commit comments

Comments
 (0)