Skip to content

Commit

Permalink
Merge pull request #809 from Saibamen/pagination_no_text
Browse files Browse the repository at this point in the history
Don't display "count" text for pagination
  • Loading branch information
louislam authored Oct 29, 2021
2 parents c400595 + 18a99c2 commit 5311bef
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 33 deletions.
1 change: 0 additions & 1 deletion src/languages/bg-BG.js
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,5 @@ export default {
clearDataOlderThan: "Ще се съхранява за {0} дни.",
records: "записа",
"One record": "Един запис",
"Showing {from} to {to} of {count} records": "Показване на {from} до {to} от {count} записа",
steamApiKeyDescription: "За да мониторирате Steam Gameserver се нуждаете от Steam Web-API ключ. Може да регистрирате Вашия API ключ тук: ",
};
1 change: 0 additions & 1 deletion src/languages/de-DE.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ export default {
PasswordsDoNotMatch: "Passwörter stimmen nicht überein.",
records: "Einträge",
"One record": "Ein Eintrag",
"Showing {from} to {to} of {count} records": "Zeige {from} zu {to} von {count} Einträge",
steamApiKeyDescription: "Um einen Steam Game Server zu überwachen, wird ein Steam Web-API-Schlüssel benötigt. Dieser kann hier registriert werden: ",
"Current User": "Aktueller Benutzer",
};
1 change: 0 additions & 1 deletion src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ export default {
PasswordsDoNotMatch: "Passwords do not match.",
records: "records",
"One record": "One record",
"Showing {from} to {to} of {count} records": "Showing {from} to {to} of {count} records",
steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ",
"Current User": "Current User",
};
1 change: 0 additions & 1 deletion src/languages/es-ES.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,5 @@ export default {
clearDataOlderThan: "Mantener los datos del historial del monitor durante {0} días.",
records: "registros",
"One record": "Un registro",
"Showing {from} to {to} of {count} records": "Mostrando desde {from} a {to} de {count} registros",
steamApiKeyDescription: "Para monitorear un servidor de juegos de Steam, necesita una clave Steam Web-API. Puede registrar su clave API aquí: ",
};
3 changes: 0 additions & 3 deletions src/languages/fa.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ export default {
"Uptime Kuma": "آپتایم کوما",
records: "مورد",
"One record": "یک مورد",
"Showing {from} to {to} of {count} records": "نمایش از {from} تا {to} از {count} مورد",
First: "اولین",
Last: "آخرین",
Info: "اطلاعات",
"Powered by": "نیرو گرفته از",
telegram: "Telegram",
Expand Down
1 change: 0 additions & 1 deletion src/languages/pl.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,5 @@ export default {
PasswordsDoNotMatch: "Hasła nie pasują.",
records: "rekordy",
"One record": "Jeden rekord",
"Showing {from} to {to} of {count} records": "Wyświetlanie {from} do {to} z {count} rekordów",
steamApiKeyDescription: "Do monitorowania serwera gier Steam potrzebny jest klucz Steam Web-API. Możesz zarejestrować swój klucz API tutaj: ",
};
1 change: 0 additions & 1 deletion src/languages/ru-RU.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,5 @@ export default {
PasswordsDoNotMatch: "Пароли не совпадают.",
records: "записей",
"One record": "Одна запись",
"Showing {from} to {to} of {count} records": "Показывается от {from} до {to} из {count} записей",
steamApiKeyDescription: "Для мониторинга игрового сервера Steam вам необходим Web-API ключ Steam. Зарегистрировать его можно здесь: ",
};
25 changes: 10 additions & 15 deletions src/pages/DashboardHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,12 @@ export default {
perPage: 25,
heartBeatList: [],
paginationConfig: {
texts:{
count:`${this.$t("Showing {from} to {to} of {count} records")}|{count} ${this.$t("records")}|${this.$t("One record")}`,
first:this.$t("First"),
last:this.$t("Last"),
nextPage:'>',
nextChunk:'>>',
prevPage:'<',
prevChunk:'<<'
}
}
}
texts: {
count: "",
},
chunksNavigation: "scroll",
},
};
},
computed: {
stats() {
Expand All @@ -106,7 +101,7 @@ export default {
for (let monitorID in this.$root.monitorList) {
let beat = this.$root.lastHeartbeatList[monitorID];
let monitor = this.$root.monitorList[monitorID]
let monitor = this.$root.monitorList[monitorID];
if (monitor && ! monitor.active) {
result.pause++;
Expand All @@ -132,15 +127,15 @@ export default {
let result = [];
for (let monitorID in this.$root.importantHeartbeatList) {
let list = this.$root.importantHeartbeatList[monitorID]
let list = this.$root.importantHeartbeatList[monitorID];
result = result.concat(list);
}
for (let beat of result) {
let monitor = this.$root.monitorList[beat.monitorID];
if (monitor) {
beat.name = monitor.name
beat.name = monitor.name;
}
}
Expand All @@ -167,7 +162,7 @@ export default {
return this.heartBeatList.slice(startIndex, endIndex);
},
},
}
};
</script>

<style lang="scss" scoped>
Expand Down
13 changes: 4 additions & 9 deletions src/pages/Details.vue
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,10 @@ export default {
showPingChartBox: true,
paginationConfig: {
texts: {
count: `${this.$t("Showing {from} to {to} of {count} records")}|{count} ${this.$t("records")}|${this.$t("One record")}`,
first: this.$t("First"),
last: this.$t("Last"),
nextPage: ">",
nextChunk: ">>",
prevPage: "<",
prevChunk: "<<"
}
}
count: "",
},
chunksNavigation: "scroll",
},
};
},
computed: {
Expand Down

0 comments on commit 5311bef

Please sign in to comment.