diff --git a/CHANGELOG.md b/CHANGELOG.md index 748deaae..83096e32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,8 @@ Special thanks to: @rejas, @sdetweil, @MagMar94 - Reworked how weatherproviders handle units (#2849) - Use unix() method for parsing times, fix suntimes on the way (#2950) - 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 `…` by `…`. - Cleanup compliments module - Updated dependencies: electron to v22 (#2903), fix playwright to v1.27.1 (#2969) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 3694a216..cecf80ea 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -814,7 +814,7 @@ Module.register("calendar", { line++; if (line > maxTitleLines - 1) { if (i < words.length) { - currentLine += "…"; + currentLine += "…"; } break; } @@ -831,7 +831,7 @@ Module.register("calendar", { return (temp + currentLine).trim(); } else { if (maxLength && typeof maxLength === "number" && string.length > maxLength) { - return string.trim().slice(0, maxLength) + "…"; + return string.trim().slice(0, maxLength) + "…"; } else { return string.trim(); } diff --git a/tests/mocks/translation_test.json b/tests/mocks/translation_test.json index 8a24a16f..dd7b02fb 100644 --- a/tests/mocks/translation_test.json +++ b/tests/mocks/translation_test.json @@ -1,5 +1,5 @@ { - "LOADING": "Loading …", + "LOADING": "Loading …", "TODAY": "Today", "TOMORROW": "Tomorrow", diff --git a/tests/unit/functions/calendar_spec.js b/tests/unit/functions/calendar_spec.js index db712fe0..bcd5eb5c 100644 --- a/tests/unit/functions/calendar_spec.js +++ b/tests/unit/functions/calendar_spec.js @@ -87,8 +87,8 @@ describe("Functions into modules/default/calendar/calendar.js", () => { describe("shorten", () => { const strings = { - " 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…" }, + " 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…" }, "short string": { length: 16, return: "short string" }, "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", () => { 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
maxTitleLines test. Should wrap and …" + "This is a wrapEvent and
maxTitleLines test. Should wrap and …" ); }); }); diff --git a/translations/af.json b/translations/af.json index c0845649..b392eff2 100644 --- a/translations/af.json +++ b/translations/af.json @@ -1,5 +1,5 @@ { - "LOADING": "Besig om te laai …", + "LOADING": "Besig om te laai …", "TODAY": "Vandag", "TOMORROW": "Môre", diff --git a/translations/bg.json b/translations/bg.json index 145b2685..e1248aae 100644 --- a/translations/bg.json +++ b/translations/bg.json @@ -1,5 +1,5 @@ { - "LOADING": "Зареждане на …", + "LOADING": "Зареждане на …", "TODAY": "Днес", "TOMORROW": "Утре", diff --git a/translations/ca.json b/translations/ca.json index e145b3ea..9b225b88 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -1,5 +1,5 @@ { - "LOADING": "Carregant …", + "LOADING": "Carregant …", "TODAY": "Avui", "TOMORROW": "Demà", diff --git a/translations/cs.json b/translations/cs.json index ffe9e149..3c4b1f5f 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -1,5 +1,5 @@ { - "LOADING": "Načítání …", + "LOADING": "Načítání …", "TODAY": "Dnes", "TOMORROW": "Zítra", diff --git a/translations/cv.json b/translations/cv.json index bed87f85..d92cdd83 100644 --- a/translations/cv.json +++ b/translations/cv.json @@ -1,5 +1,5 @@ { - "LOADING": "Тиенет …", + "LOADING": "Тиенет …", "TODAY": "Паян", "TOMORROW": "Ыран", diff --git a/translations/cy.json b/translations/cy.json index d5dd2522..44d8dc07 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -1,5 +1,5 @@ { - "LOADING": "Llwytho …", + "LOADING": "Llwytho …", "TODAY": "Heddiw", "TOMORROW": "Yfory", diff --git a/translations/da.json b/translations/da.json index cb264ecb..6f52154a 100644 --- a/translations/da.json +++ b/translations/da.json @@ -1,5 +1,5 @@ { - "LOADING": "Indlæser …", + "LOADING": "Indlæser …", "TODAY": "I dag", "TOMORROW": "I morgen", diff --git a/translations/el.json b/translations/el.json index be045323..e90fd2e6 100644 --- a/translations/el.json +++ b/translations/el.json @@ -1,5 +1,5 @@ { - "LOADING": "Φόρτωση …", + "LOADING": "Φόρτωση …", "TODAY": "Σήμερα", "TOMORROW": "Αύριο", diff --git a/translations/en.json b/translations/en.json index 60217b96..4bb50182 100644 --- a/translations/en.json +++ b/translations/en.json @@ -1,5 +1,5 @@ { - "LOADING": "Loading …", + "LOADING": "Loading …", "TODAY": "Today", "TOMORROW": "Tomorrow", diff --git a/translations/es.json b/translations/es.json index f98371fe..5c982468 100644 --- a/translations/es.json +++ b/translations/es.json @@ -1,5 +1,5 @@ { - "LOADING": "Cargando …", + "LOADING": "Cargando …", "TODAY": "Hoy", "TOMORROW": "Mañana", diff --git a/translations/et.json b/translations/et.json index bddd56ae..167a57e6 100644 --- a/translations/et.json +++ b/translations/et.json @@ -1,5 +1,5 @@ { - "LOADING": "Laen …", + "LOADING": "Laen …", "TODAY": "Täna", "TOMORROW": "Homme", diff --git a/translations/fi.json b/translations/fi.json index 97524fd5..31e04312 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -1,5 +1,5 @@ { - "LOADING": "Lataa …", + "LOADING": "Lataa …", "TODAY": "Tänään", "TOMORROW": "Huomenna", diff --git a/translations/fr.json b/translations/fr.json index 97cccc59..181bc572 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1,5 +1,5 @@ { - "LOADING": "Chargement …", + "LOADING": "Chargement …", "TODAY": "Aujourd'hui", "TOMORROW": "Demain", diff --git a/translations/fy.json b/translations/fy.json index f1735382..19f75d09 100644 --- a/translations/fy.json +++ b/translations/fy.json @@ -1,5 +1,5 @@ { - "LOADING": "Bezich mei laden …", + "LOADING": "Bezich mei laden …", "TODAY": "Hjoed", "TOMORROW": "Moarn", diff --git a/translations/gl.json b/translations/gl.json index fc64ddbf..d0ef36bd 100644 --- a/translations/gl.json +++ b/translations/gl.json @@ -1,5 +1,5 @@ { - "LOADING": "Cargando …", + "LOADING": "Cargando …", "TODAY": "Hoxe", "TOMORROW": "Mañá", diff --git a/translations/gu.json b/translations/gu.json index 2271a065..c9bf7e24 100644 --- a/translations/gu.json +++ b/translations/gu.json @@ -1,5 +1,5 @@ { - "LOADING": "લોડ થઈ રહ્યું છે …", + "LOADING": "લોડ થઈ રહ્યું છે …", "TODAY": "આજે", "TOMORROW": "આવતી કાલે", diff --git a/translations/hi.json b/translations/hi.json index 78522ce2..8124709e 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -1,5 +1,5 @@ { - "LOADING": "लोड हो रहा है …", + "LOADING": "लोड हो रहा है …", "TODAY": "आज", "TOMORROW": "आने वाला कल", diff --git a/translations/hr.json b/translations/hr.json index 0e171668..8f1373b1 100644 --- a/translations/hr.json +++ b/translations/hr.json @@ -1,5 +1,5 @@ { - "LOADING": "Učitavanje …", + "LOADING": "Učitavanje …", "TODAY": "Danas", "TOMORROW": "Sutra", diff --git a/translations/hu.json b/translations/hu.json index 2cfd76f3..7a8b3d7f 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -1,5 +1,5 @@ { - "LOADING": "Betöltés …", + "LOADING": "Betöltés …", "TODAY": "Ma", "TOMORROW": "Holnap", diff --git a/translations/id.json b/translations/id.json index 7a1a8d70..4210c9d1 100644 --- a/translations/id.json +++ b/translations/id.json @@ -1,5 +1,5 @@ { - "LOADING": "Memuat …", + "LOADING": "Memuat …", "TODAY": "Hari ini", "TOMORROW": "Besok", diff --git a/translations/is.json b/translations/is.json index 01a3406d..0ffaf045 100644 --- a/translations/is.json +++ b/translations/is.json @@ -1,5 +1,5 @@ { - "LOADING": "Hleð upp …", + "LOADING": "Hleð upp …", "TODAY": "Í dag", "TOMORROW": "Á morgun", diff --git a/translations/it.json b/translations/it.json index 294fdfef..aac8a971 100644 --- a/translations/it.json +++ b/translations/it.json @@ -1,5 +1,5 @@ { - "LOADING": "Caricamento in corso …", + "LOADING": "Caricamento in corso …", "TODAY": "Oggi", "TOMORROW": "Domani", diff --git a/translations/ja.json b/translations/ja.json index ff15687b..fec6770e 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -1,5 +1,5 @@ { - "LOADING": "ローディング …", + "LOADING": "ローディング …", "TODAY": "今日", "TOMORROW": "明日", diff --git a/translations/ko.json b/translations/ko.json index f5b88985..5361137a 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -1,5 +1,5 @@ { - "LOADING": "로드 중 …", + "LOADING": "로드 중 …", "TODAY": "오늘", "TOMORROW": "내일", diff --git a/translations/lt.json b/translations/lt.json index c5e6f31f..95cbef93 100644 --- a/translations/lt.json +++ b/translations/lt.json @@ -1,5 +1,5 @@ { - "LOADING": "Kraunasi …", + "LOADING": "Kraunasi …", "TODAY": "Šiandien", "TOMORROW": "Rytoj", diff --git a/translations/ms-my.json b/translations/ms-my.json index 22e7e09d..c1ffc046 100644 --- a/translations/ms-my.json +++ b/translations/ms-my.json @@ -1,5 +1,5 @@ { - "LOADING": "Tunggu Sebentar …", + "LOADING": "Tunggu Sebentar …", "TODAY": "Hari ini", "TOMORROW": "Esok", diff --git a/translations/nb.json b/translations/nb.json index 00ad2a26..cbf0f188 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -1,5 +1,5 @@ { - "LOADING": "Laster …", + "LOADING": "Laster …", "TODAY": "I dag", "TOMORROW": "I morgen", diff --git a/translations/nl.json b/translations/nl.json index f56081be..3ee70785 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -1,5 +1,5 @@ { - "LOADING": "Bezig met laden …", + "LOADING": "Bezig met laden …", "TODAY": "Vandaag", "TOMORROW": "Morgen", diff --git a/translations/nn.json b/translations/nn.json index 8b5a38e9..2af11044 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -1,5 +1,5 @@ { - "LOADING": "Lastar …", + "LOADING": "Lastar …", "TODAY": "I dag", "TOMORROW": "I morgon", diff --git a/translations/pl.json b/translations/pl.json index 2271938f..61e24b8f 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -1,5 +1,5 @@ { - "LOADING": "Ładowanie …", + "LOADING": "Ładowanie …", "TODAY": "Dziś", "TOMORROW": "Jutro", diff --git a/translations/pt-br.json b/translations/pt-br.json index 09de7887..65f6a58b 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -1,5 +1,5 @@ { - "LOADING": "Carregando …", + "LOADING": "Carregando …", "TODAY": "Hoje", "TOMORROW": "Amanhã", diff --git a/translations/pt.json b/translations/pt.json index e7fc0f8d..8887dcbe 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -1,5 +1,5 @@ { - "LOADING": "A carregar …", + "LOADING": "A carregar …", "TODAY": "Hoje", "TOMORROW": "Amanhã", diff --git a/translations/ro.json b/translations/ro.json index 7b91c943..e6557899 100644 --- a/translations/ro.json +++ b/translations/ro.json @@ -1,5 +1,5 @@ { - "LOADING": "Se încarcă …", + "LOADING": "Se încarcă …", "TODAY": "Astăzi", "TOMORROW": "Mâine", diff --git a/translations/ru.json b/translations/ru.json index e2cce1ac..716e622b 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -1,5 +1,5 @@ { - "LOADING": "Загрузка …", + "LOADING": "Загрузка …", "TODAY": "Сегодня", "TOMORROW": "Завтра", diff --git a/translations/sk.json b/translations/sk.json index c4b98117..4a77ec06 100644 --- a/translations/sk.json +++ b/translations/sk.json @@ -1,5 +1,5 @@ { - "LOADING": "Načítanie …", + "LOADING": "Načítanie …", "TODAY": "Dnes", "TOMORROW": "Zajtra", diff --git a/translations/sv.json b/translations/sv.json index 79b138c6..9203bcd5 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -1,5 +1,5 @@ { - "LOADING": "Laddar …", + "LOADING": "Laddar …", "TODAY": "I dag", "TOMORROW": "I morgon", diff --git a/translations/tlh.json b/translations/tlh.json index 1f071202..e722e0cb 100644 --- a/translations/tlh.json +++ b/translations/tlh.json @@ -1,5 +1,5 @@ { - "LOADING": "loS …", + "LOADING": "loS …", "TODAY": "DaHjaj", "TOMORROW": "wa'leS", diff --git a/translations/tr.json b/translations/tr.json index 28d6dcc9..5f8ca41b 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -1,5 +1,5 @@ { - "LOADING": "Yükleniyor …", + "LOADING": "Yükleniyor …", "TODAY": "Bugün", "TOMORROW": "Yarın", diff --git a/translations/uk.json b/translations/uk.json index 37585b00..e5050b3d 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -1,5 +1,5 @@ { - "LOADING": "Завантаження …", + "LOADING": "Завантаження …", "TODAY": "Сьогодні", "TOMORROW": "Завтра", diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 0d41cf70..1abcb041 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -1,5 +1,5 @@ { - "LOADING": "正在加载 …", + "LOADING": "正在加载 …", "TODAY": "今天", "TOMORROW": "明天", diff --git a/translations/zh-tw.json b/translations/zh-tw.json index d6c803bb..83edc148 100644 --- a/translations/zh-tw.json +++ b/translations/zh-tw.json @@ -1,5 +1,5 @@ { - "LOADING": "正在載入 …", + "LOADING": "正在載入 …", "TODAY": "今天", "TOMORROW": "明天",