Replace … with (#2973)

I think it is clearer if we don't use the HTML entity.

Co-authored-by: Karsten Hassel <hassel@gmx.de>
This commit is contained in:
Kristjan ESPERANTO 2022-12-10 21:50:56 +01:00 committed by GitHub
parent a2624442cc
commit 3124b0a9c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 49 additions and 48 deletions

View File

@ -38,7 +38,8 @@ Special thanks to: @rejas, @sdetweil, @MagMar94
- Reworked how weatherproviders handle units (#2849) - Reworked how weatherproviders handle units (#2849)
- Use unix() method for parsing times, fix suntimes on the way (#2950) - Use unix() method for parsing times, fix suntimes on the way (#2950)
- Refactor conversion functions into utils class (#2958) - Refactor conversion functions into utils class (#2958)
- The `cors`-method in `server.js` now supports sending and receiving HTTP headers. - The `cors`-method in `server.js` now supports sending and recieving HTTP headers.
- Replace `&hellip;` by `…`.
- Cleanup compliments module - Cleanup compliments module
- Updated dependencies: electron to v22 (#2903), fix playwright to v1.27.1 (#2969) - Updated dependencies: electron to v22 (#2903), fix playwright to v1.27.1 (#2969)

View File

@ -814,7 +814,7 @@ Module.register("calendar", {
line++; line++;
if (line > maxTitleLines - 1) { if (line > maxTitleLines - 1) {
if (i < words.length) { if (i < words.length) {
currentLine += "&hellip;"; currentLine += "";
} }
break; break;
} }
@ -831,7 +831,7 @@ Module.register("calendar", {
return (temp + currentLine).trim(); return (temp + currentLine).trim();
} else { } else {
if (maxLength && typeof maxLength === "number" && string.length > maxLength) { if (maxLength && typeof maxLength === "number" && string.length > maxLength) {
return string.trim().slice(0, maxLength) + "&hellip;"; return string.trim().slice(0, maxLength) + "";
} else { } else {
return string.trim(); return string.trim();
} }

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Loading &hellip;", "LOADING": "Loading ",
"TODAY": "Today", "TODAY": "Today",
"TOMORROW": "Tomorrow", "TOMORROW": "Tomorrow",

View File

@ -87,8 +87,8 @@ describe("Functions into modules/default/calendar/calendar.js", () => {
describe("shorten", () => { describe("shorten", () => {
const strings = { const strings = {
" String with whitespace at the beginning that needs trimming": { length: 16, return: "String with whit&hellip;" }, " String with whitespace at the beginning that needs trimming": { length: 16, return: "String with whit" },
"long string that needs shortening": { length: 16, return: "long string that&hellip;" }, "long string that needs shortening": { length: 16, return: "long string that" },
"short string": { length: 16, return: "short string" }, "short string": { length: 16, return: "short string" },
"long string with no maxLength defined": { return: "long string with no maxLength defined" } "long string with no maxLength defined": { return: "long string with no maxLength defined" }
}; };
@ -121,7 +121,7 @@ describe("Functions into modules/default/calendar/calendar.js", () => {
it("should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", () => { it("should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", () => {
expect(Module.definitions.calendar.shorten("This is a wrapEvent and maxTitleLines test. Should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", undefined, true, 2)).toBe( expect(Module.definitions.calendar.shorten("This is a wrapEvent and maxTitleLines test. Should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", undefined, true, 2)).toBe(
"This is a wrapEvent and <br>maxTitleLines test. Should wrap and &hellip;" "This is a wrapEvent and <br>maxTitleLines test. Should wrap and "
); );
}); });
}); });

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Besig om te laai &hellip;", "LOADING": "Besig om te laai ",
"TODAY": "Vandag", "TODAY": "Vandag",
"TOMORROW": "Môre", "TOMORROW": "Môre",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Зареждане на &hellip;", "LOADING": "Зареждане на ",
"TODAY": "Днес", "TODAY": "Днес",
"TOMORROW": "Утре", "TOMORROW": "Утре",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Carregant &hellip;", "LOADING": "Carregant ",
"TODAY": "Avui", "TODAY": "Avui",
"TOMORROW": "Demà", "TOMORROW": "Demà",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Načítání &hellip;", "LOADING": "Načítání ",
"TODAY": "Dnes", "TODAY": "Dnes",
"TOMORROW": "Zítra", "TOMORROW": "Zítra",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Тиенет &hellip;", "LOADING": "Тиенет ",
"TODAY": "Паян", "TODAY": "Паян",
"TOMORROW": "Ыран", "TOMORROW": "Ыран",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Llwytho &hellip;", "LOADING": "Llwytho ",
"TODAY": "Heddiw", "TODAY": "Heddiw",
"TOMORROW": "Yfory", "TOMORROW": "Yfory",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Indlæser &hellip;", "LOADING": "Indlæser ",
"TODAY": "I dag", "TODAY": "I dag",
"TOMORROW": "I morgen", "TOMORROW": "I morgen",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Φόρτωση &hellip;", "LOADING": "Φόρτωση ",
"TODAY": "Σήμερα", "TODAY": "Σήμερα",
"TOMORROW": "Αύριο", "TOMORROW": "Αύριο",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Loading &hellip;", "LOADING": "Loading ",
"TODAY": "Today", "TODAY": "Today",
"TOMORROW": "Tomorrow", "TOMORROW": "Tomorrow",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Cargando &hellip;", "LOADING": "Cargando ",
"TODAY": "Hoy", "TODAY": "Hoy",
"TOMORROW": "Mañana", "TOMORROW": "Mañana",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Laen &hellip;", "LOADING": "Laen ",
"TODAY": "Täna", "TODAY": "Täna",
"TOMORROW": "Homme", "TOMORROW": "Homme",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Lataa &hellip;", "LOADING": "Lataa ",
"TODAY": "Tänään", "TODAY": "Tänään",
"TOMORROW": "Huomenna", "TOMORROW": "Huomenna",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Chargement &hellip;", "LOADING": "Chargement ",
"TODAY": "Aujourd'hui", "TODAY": "Aujourd'hui",
"TOMORROW": "Demain", "TOMORROW": "Demain",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Bezich mei laden &hellip;", "LOADING": "Bezich mei laden ",
"TODAY": "Hjoed", "TODAY": "Hjoed",
"TOMORROW": "Moarn", "TOMORROW": "Moarn",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Cargando &hellip;", "LOADING": "Cargando ",
"TODAY": "Hoxe", "TODAY": "Hoxe",
"TOMORROW": "Mañá", "TOMORROW": "Mañá",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "લોડ થઈ રહ્યું છે &hellip;", "LOADING": "લોડ થઈ રહ્યું છે ",
"TODAY": "આજે", "TODAY": "આજે",
"TOMORROW": "આવતી કાલે", "TOMORROW": "આવતી કાલે",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "लोड हो रहा है &hellip;", "LOADING": "लोड हो रहा है ",
"TODAY": "आज", "TODAY": "आज",
"TOMORROW": "आने वाला कल", "TOMORROW": "आने वाला कल",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Učitavanje &hellip;", "LOADING": "Učitavanje ",
"TODAY": "Danas", "TODAY": "Danas",
"TOMORROW": "Sutra", "TOMORROW": "Sutra",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Betöltés &hellip;", "LOADING": "Betöltés ",
"TODAY": "Ma", "TODAY": "Ma",
"TOMORROW": "Holnap", "TOMORROW": "Holnap",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Memuat &hellip;", "LOADING": "Memuat ",
"TODAY": "Hari ini", "TODAY": "Hari ini",
"TOMORROW": "Besok", "TOMORROW": "Besok",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Hleð upp &hellip;", "LOADING": "Hleð upp ",
"TODAY": "Í dag", "TODAY": "Í dag",
"TOMORROW": "Á morgun", "TOMORROW": "Á morgun",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Caricamento in corso &hellip;", "LOADING": "Caricamento in corso ",
"TODAY": "Oggi", "TODAY": "Oggi",
"TOMORROW": "Domani", "TOMORROW": "Domani",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "ローディング &hellip;", "LOADING": "ローディング ",
"TODAY": "今日", "TODAY": "今日",
"TOMORROW": "明日", "TOMORROW": "明日",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "로드 중 &hellip;", "LOADING": "로드 중 ",
"TODAY": "오늘", "TODAY": "오늘",
"TOMORROW": "내일", "TOMORROW": "내일",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Kraunasi &hellip;", "LOADING": "Kraunasi ",
"TODAY": "Šiandien", "TODAY": "Šiandien",
"TOMORROW": "Rytoj", "TOMORROW": "Rytoj",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Tunggu Sebentar &hellip;", "LOADING": "Tunggu Sebentar ",
"TODAY": "Hari ini", "TODAY": "Hari ini",
"TOMORROW": "Esok", "TOMORROW": "Esok",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Laster &hellip;", "LOADING": "Laster ",
"TODAY": "I dag", "TODAY": "I dag",
"TOMORROW": "I morgen", "TOMORROW": "I morgen",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Bezig met laden &hellip;", "LOADING": "Bezig met laden ",
"TODAY": "Vandaag", "TODAY": "Vandaag",
"TOMORROW": "Morgen", "TOMORROW": "Morgen",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Lastar &hellip;", "LOADING": "Lastar ",
"TODAY": "I dag", "TODAY": "I dag",
"TOMORROW": "I morgon", "TOMORROW": "I morgon",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Ładowanie &hellip;", "LOADING": "Ładowanie ",
"TODAY": "Dziś", "TODAY": "Dziś",
"TOMORROW": "Jutro", "TOMORROW": "Jutro",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Carregando &hellip;", "LOADING": "Carregando ",
"TODAY": "Hoje", "TODAY": "Hoje",
"TOMORROW": "Amanhã", "TOMORROW": "Amanhã",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "A carregar &hellip;", "LOADING": "A carregar ",
"TODAY": "Hoje", "TODAY": "Hoje",
"TOMORROW": "Amanhã", "TOMORROW": "Amanhã",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Se încarcă &hellip;", "LOADING": "Se încarcă ",
"TODAY": "Astăzi", "TODAY": "Astăzi",
"TOMORROW": "Mâine", "TOMORROW": "Mâine",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Загрузка &hellip;", "LOADING": "Загрузка ",
"TODAY": "Сегодня", "TODAY": "Сегодня",
"TOMORROW": "Завтра", "TOMORROW": "Завтра",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Načítanie &hellip;", "LOADING": "Načítanie ",
"TODAY": "Dnes", "TODAY": "Dnes",
"TOMORROW": "Zajtra", "TOMORROW": "Zajtra",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Laddar &hellip;", "LOADING": "Laddar ",
"TODAY": "I dag", "TODAY": "I dag",
"TOMORROW": "I morgon", "TOMORROW": "I morgon",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "loS &hellip;", "LOADING": "loS ",
"TODAY": "DaHjaj", "TODAY": "DaHjaj",
"TOMORROW": "wa'leS", "TOMORROW": "wa'leS",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Yükleniyor &hellip;", "LOADING": "Yükleniyor ",
"TODAY": "Bugün", "TODAY": "Bugün",
"TOMORROW": "Yarın", "TOMORROW": "Yarın",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "Завантаження &hellip;", "LOADING": "Завантаження ",
"TODAY": "Сьогодні", "TODAY": "Сьогодні",
"TOMORROW": "Завтра", "TOMORROW": "Завтра",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "正在加载 &hellip;", "LOADING": "正在加载 ",
"TODAY": "今天", "TODAY": "今天",
"TOMORROW": "明天", "TOMORROW": "明天",

View File

@ -1,5 +1,5 @@
{ {
"LOADING": "正在載入 &hellip;", "LOADING": "正在載入 ",
"TODAY": "今天", "TODAY": "今天",
"TOMORROW": "明天", "TOMORROW": "明天",