Skip to content

Commit 9510b70

Browse files
sadiqkhojasadiqkhoja
committed
remove irrelevant messages from loading message component
1 parent 878f5b8 commit 9510b70

3 files changed

Lines changed: 3 additions & 98 deletions

File tree

‎apps/central/src/components/odata-loading-message.vue‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ const message = computed(() => {
5454
if (props.top == null || props.totalCount <= props.top)
5555
return tn(`${props.type}.all`, props.totalCount);
5656
57-
return tn(`${props.type}.first`, props.totalCount, {
58-
top: props.top
59-
});
57+
return t(`${props.type}.withoutCount`);
6058
});
6159
</script>
6260

@@ -80,54 +78,18 @@ const message = computed(() => {
8078
// This text is shown when the number of Submissions loading is unknown.
8179
"withoutCount": "Loading Submissions…",
8280
"all": "Loading {count} Submission… | Loading {count} Submissions…",
83-
// {top} is a number that is either 250 or 1000. {count} may be any number
84-
// that is at least 250. The string will be pluralized based on {count}.
85-
"first": "Loading the first {top} of {count} Submission… | Loading the first {top} of {count} Submissions…",
86-
// {top} is a number that is either 250 or 1000. {count} may be any number
87-
// that is at least 250. The string will be pluralized based on {count}.
88-
"middle": "Loading {top} more of {count} remaining Submission… | Loading {top} more of {count} remaining Submissions…",
89-
"last": {
90-
"multiple": "Loading the last {count} Submission… | Loading the last {count} Submissions…",
91-
"one": "Loading the last Submission…"
92-
},
9381
"filtered": {
9482
// This text is shown when the number of Submissions loading is unknown.
95-
"withoutCount": "Loading matching Submissions…",
96-
// {top} is a number that is either 250 or 1000. {count} may be any
97-
// number that is at least 250. The string will be pluralized based on
98-
// {count}.
99-
"middle": "Loading {top} more of {count} remaining matching Submission… | Loading {top} more of {count} remaining matching Submissions…",
100-
"last": {
101-
"multiple": "Loading the last {count} matching Submission… | Loading the last {count} matching Submissions…",
102-
"one": "Loading the last matching Submission…"
103-
}
83+
"withoutCount": "Loading matching Submissions…"
10484
}
10585
},
10686
"entity": {
10787
// This text is shown when the number of Entities loading is unknown.
10888
"withoutCount": "Loading Entities…",
10989
"all": "Loading {count} Entity… | Loading {count} Entities…",
110-
// {top} is a number that is either 250 or 1000. {count} may be any number
111-
// that is at least 250. The string will be pluralized based on {count}.
112-
"first": "Loading the first {top} of {count} Entity… | Loading the first {top} of {count} Entities…",
113-
// {top} is a number that is either 250 or 1000. {count} may be any number
114-
// that is at least 250. The string will be pluralized based on {count}.
115-
"middle": "Loading {top} more of {count} remaining Entity… | Loading {top} more of {count} remaining Entities…",
116-
"last": {
117-
"multiple": "Loading the last {count} Entity… | Loading the last {count} Entities…",
118-
"one": "Loading the last Entity…"
119-
},
12090
"filtered": {
12191
// This text is shown when the number of Entities loading is unknown.
122-
"withoutCount": "Loading matching Entities…",
123-
// {top} is a number that is either 250 or 1000. {count} may be any
124-
// number that is at least 250. The string will be pluralized based on
125-
// {count}.
126-
"middle": "Loading {top} more of {count} remaining matching Entity… | Loading {top} more of {count} remaining matching Entities…",
127-
"last": {
128-
"multiple": "Loading the last {count} matching Entity… | Loading the last {count} matching Entities…",
129-
"one": "Loading the last matching Entity…"
130-
}
92+
"withoutCount": "Loading matching Entities…"
13193
}
13294
}
13395
}

‎apps/central/test/components/odata-loading-message.spec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ describe('OdataLoadingMessage', () => {
88
['', { state: false }],
99
['Loading Submissions…', { state: true }],
1010
['Loading 10 Submissions…', { state: true, top: 250, totalCount: 10 }],
11-
['Loading the first 10 of 100 Submissions…', { state: true, top: 10, totalCount: 100 }],
1211
// totalCount is 0.
1312
['Loading Submissions…', { state: true, top: 250, totalCount: 0 }],
1413
// No `top`

‎apps/central/transifex/strings_en.json‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4122,38 +4122,10 @@
41224122
"all": {
41234123
"string": "{count, plural, one {Loading {count} Entity…} other {Loading {count} Entities…}}"
41244124
},
4125-
"first": {
4126-
"string": "{count, plural, one {Loading the first {top} of {count} Entity…} other {Loading the first {top} of {count} Entities…}}",
4127-
"developer_comment": "{top} is a number that is either 250 or 1000. {count} may be any number that is at least 250. The string will be pluralized based on {count}."
4128-
},
4129-
"middle": {
4130-
"string": "{count, plural, one {Loading {top} more of {count} remaining Entity…} other {Loading {top} more of {count} remaining Entities…}}",
4131-
"developer_comment": "{top} is a number that is either 250 or 1000. {count} may be any number that is at least 250. The string will be pluralized based on {count}."
4132-
},
4133-
"last": {
4134-
"multiple": {
4135-
"string": "{count, plural, one {Loading the last {count} Entity…} other {Loading the last {count} Entities…}}"
4136-
},
4137-
"one": {
4138-
"string": "Loading the last Entity…"
4139-
}
4140-
},
41414125
"filtered": {
41424126
"withoutCount": {
41434127
"string": "Loading matching Entities…",
41444128
"developer_comment": "This text is shown when the number of Entities loading is unknown."
4145-
},
4146-
"middle": {
4147-
"string": "{count, plural, one {Loading {top} more of {count} remaining matching Entity…} other {Loading {top} more of {count} remaining matching Entities…}}",
4148-
"developer_comment": "{top} is a number that is either 250 or 1000. {count} may be any number that is at least 250. The string will be pluralized based on {count}."
4149-
},
4150-
"last": {
4151-
"multiple": {
4152-
"string": "{count, plural, one {Loading the last {count} matching Entity…} other {Loading the last {count} matching Entities…}}"
4153-
},
4154-
"one": {
4155-
"string": "Loading the last matching Entity…"
4156-
}
41574129
}
41584130
}
41594131
}
@@ -5296,38 +5268,10 @@
52965268
"all": {
52975269
"string": "{count, plural, one {Loading {count} Submission…} other {Loading {count} Submissions…}}"
52985270
},
5299-
"first": {
5300-
"string": "{count, plural, one {Loading the first {top} of {count} Submission…} other {Loading the first {top} of {count} Submissions…}}",
5301-
"developer_comment": "{top} is a number that is either 250 or 1000. {count} may be any number that is at least 250. The string will be pluralized based on {count}."
5302-
},
5303-
"middle": {
5304-
"string": "{count, plural, one {Loading {top} more of {count} remaining Submission…} other {Loading {top} more of {count} remaining Submissions…}}",
5305-
"developer_comment": "{top} is a number that is either 250 or 1000. {count} may be any number that is at least 250. The string will be pluralized based on {count}."
5306-
},
5307-
"last": {
5308-
"multiple": {
5309-
"string": "{count, plural, one {Loading the last {count} Submission…} other {Loading the last {count} Submissions…}}"
5310-
},
5311-
"one": {
5312-
"string": "Loading the last Submission…"
5313-
}
5314-
},
53155271
"filtered": {
53165272
"withoutCount": {
53175273
"string": "Loading matching Submissions…",
53185274
"developer_comment": "This text is shown when the number of Submissions loading is unknown."
5319-
},
5320-
"middle": {
5321-
"string": "{count, plural, one {Loading {top} more of {count} remaining matching Submission…} other {Loading {top} more of {count} remaining matching Submissions…}}",
5322-
"developer_comment": "{top} is a number that is either 250 or 1000. {count} may be any number that is at least 250. The string will be pluralized based on {count}."
5323-
},
5324-
"last": {
5325-
"multiple": {
5326-
"string": "{count, plural, one {Loading the last {count} matching Submission…} other {Loading the last {count} matching Submissions…}}"
5327-
},
5328-
"one": {
5329-
"string": "Loading the last matching Submission…"
5330-
}
53315275
}
53325276
}
53335277
}

0 commit comments

Comments
 (0)