Skip to content

Commit 0f5c262

Browse files
jschoiRRjschoiRR
authored
Merge pull request #564 from jschoiRR/mold-diplo-2024-main
[Mold UI] 테이블 페이징시 항목 수 표시 관련 한글화 반영
2 parents 1e74d96 + fd98581 commit 0f5c262

File tree

12 files changed

+42
-16
lines changed

12 files changed

+42
-16
lines changed

‎ui/public/locales/ko_KR.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@
12821282
"label.issystem": "\uc2dc\uc2a4\ud15c",
12831283
"label.isuserdefined": "\uc0ac\uc6a9\uc790 \uc815\uc758",
12841284
"label.isvolatile": "\ud718\ubc1c\uc131 \uc5ec\ubd80",
1285-
"label.items": "\ud56d\ubaa9",
1285+
"label.items": "\uac1c \ud56d\ubaa9",
12861286
"label.items.selected": "\uc120\ud0dd\ud55c \ud56d\ubaa9",
12871287
"label.japanese.keyboard": "\uc77c\ubcf8\uc5b4 \ud0a4\ubcf4\ub4dc",
12881288
"label.javadistribution": "Java Runtime \ubc30\ud3ec",
@@ -1639,7 +1639,7 @@
16391639
"label.add.key.value": "\ud0a4 \uac12 \uc30d \ucd94\uac00",
16401640
"label.action.update.object.storage": "Object \uc800\uc7a5\uc18c \uc5c5\ub370\uc774\ud2b8",
16411641
"label.action.delete.object.storage": "Object \uc800\uc7a5\uc18c \uc0ad\uc81c",
1642-
"label.of": "of",
1642+
"label.of": "\uc911",
16431643
"label.of.month": "\uc6d4",
16441644
"label.offerha": "HA \uc81c\uacf5",
16451645
"label.offeringid": "\uc624\ud504\ub9c1 ID",
@@ -2114,7 +2114,7 @@
21142114
"label.sharedrouterip": "\uc11c\ube44\uc2a4\uc6a9 \ub124\ud2b8\uc6cc\ud06c\uc758 \ub77c\uc6b0\ud130\uc5d0 \ub300\ud55c IPv4 \uc8fc\uc18c",
21152115
"label.sharedrouteripv6": "\uc11c\ube44\uc2a4\uc6a9 \ub124\ud2b8\uc6cc\ud06c\uc758 \ub77c\uc6b0\ud130\uc5d0 \ub300\ud55c IPv6 \uc8fc\uc18c",
21162116
"label.sharewith": "\uacf5\uc720",
2117-
"label.showing": "\ubcf4\uae30",
2117+
"label.showing": "\ud45c\uc2dc",
21182118
"label.show.usage.records": "\uc0ac\uc6a9 \uae30\ub85d \ubcf4\uae30",
21192119
"label.shrinkok": "\ubcfc\ub968 \ucd95\uc18c \ud5c8\uc6a9",
21202120
"label.shutdown": "\uc167 \ub2e4\uc6b4",

‎ui/src/components/view/AnnotationsTab.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@
7777
:current="page"
7878
:pageSize="pageSize"
7979
:total="itemCount"
80-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
80+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
81+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.showing')}` :
82+
`${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
8183
:pageSizeOptions="['10']"
8284
@change="changePage"
8385
showQuickJumper>

‎ui/src/components/view/EventsTab.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
:current="page"
3535
:pageSize="pageSize"
3636
:total="totalCount"
37-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
37+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
38+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.showing')}` :
39+
`${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
3840
:pageSizeOptions="pageSizeOptions"
3941
@change="changePage"
4042
@showSizeChange="changePage"

‎ui/src/components/view/WebhookDeliveriesTab.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@
9898
:current="page"
9999
:pageSize="pageSize"
100100
:total="totalCount"
101-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
101+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
102+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.showing')}` :
103+
`${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
102104
:pageSizeOptions="pageSizeOptions"
103105
@change="changePage"
104106
@showSizeChange="changePage"

‎ui/src/views/AutogenView.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,9 @@
664664
:current="page"
665665
:pageSize="pageSize"
666666
:total="itemCount"
667-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
667+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
668+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.showing')}` :
669+
`${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
668670
:pageSizeOptions="pageSizeOptions"
669671
@change="changePage"
670672
@showSizeChange="changePageSize"

‎ui/src/views/compute/InstanceSchedules.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
:current="page"
4646
:pageSize="pageSize"
4747
:total="totalCount"
48-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
48+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
49+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.showing')}` :
50+
`${$t('label.showing')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
4951
:pageSizeOptions="pageSizeOptions"
5052
@change="changePage"
5153
@showSizeChange="changePage"

‎ui/src/views/event/EventDownload.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,9 @@
412412
:current="page"
413413
:pageSize="pageSize"
414414
:total="itemCount"
415-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
415+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
416+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.showing')}` :
417+
`${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
416418
:pageSizeOptions="pageSizeOptions"
417419
@change="changePage"
418420
@showSizeChange="changePageSize"

‎ui/src/views/infra/UsageRecords.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,9 @@
249249
:current="page"
250250
:pageSize="pageSize"
251251
:total="totalUsageRecords"
252-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
252+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
253+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.showing')}` :
254+
`${$t('label.showing')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
253255
:pageSizeOptions="['20', '50', '100']"
254256
@change="handleTableChange"
255257
:showSizeChanger="true"

‎ui/src/views/network/tungsten/TungstenNetworkTable.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@
7676
:current="page"
7777
:pageSize="pageSize"
7878
:total="itemCount"
79-
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
79+
:showTotal="total => this.$localStorage.get('LOCALE') == 'ko_KR' ?
80+
`${$t('label.total')} ${total} ${$t('label.items')} ${$t('label.of')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.showing')}` :
81+
`${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
8082
:pageSizeOptions="pageSizeOptions"
8183
@change="changePage"
8284
@showSizeChange="changePageSize"

‎ui/src/views/setting/ConfigurationTable.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
:current="page"
4444
:pageSize="pagesize"
4545
:total="count"
46-
:showTotal="count => `${$t('label.showing')} ${Math.min(count, 1+((page-1)*pagesize))}-${Math.min(page*pagesize, count)} ${$t('label.of')} ${count} ${$t('label.items')}`"
46+
:showTotal="count => this.$localStorage.get('LOCALE') == 'ko_KR' ?
47+
`${$t('label.total')} ${count} ${$t('label.items')} ${$t('label.of')} ${Math.min(count, 1+((page-1)*pagesize))}-${Math.min(page*pagesize, count)} ${$t('label.showing')}` :
48+
`${$t('label.showing')} ${Math.min(count, 1+((page-1)*pagesize))}-${Math.min(page*pagesize, count)} ${$t('label.of')} ${count} ${$t('label.items')}`"
4749
:pageSizeOptions="pageSizeOptions"
4850
@change="changePage"
4951
@showSizeChange="changePage"

0 commit comments

Comments
 (0)