Replace … by …

MagicMirrorOrg · Nov 26, 2022 · af50f23 · af50f23
1 parent bd0b3c0
commit af50f23
Show file tree

Hide file tree

Showing 45 changed files with 48 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ Special thanks to: @rejas, @sdetweil, @MagMar94
   - 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 recieving HTTP headers.
+- Replace `&hellip;` by `…`.
 
 ### Fixed
 

diff --git 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 += "&hellip;";
+							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) + "&hellip;";
+				return string.trim().slice(0, maxLength) + "…";
 			} else {
 				return string.trim();
 			}

diff --git a/tests/mocks/translation_test.json b/tests/mocks/translation_test.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Loading &hellip;",
+	"LOADING": "Loading …",
 
 	"TODAY": "Today",
 	"TOMORROW": "Tomorrow",

diff --git 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&hellip;" },
-			"long string that needs shortening": { length: 16, return: "long string that&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…" },
 			"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 <br>maxTitleLines test. Should wrap and &hellip;"
+				"This is a wrapEvent and <br>maxTitleLines test. Should wrap and …"
 			);
 		});
 	});

diff --git a/translations/af.json b/translations/af.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Besig om te laai &hellip;",
+	"LOADING": "Besig om te laai …",
 
 	"TODAY": "Vandag",
 	"TOMORROW": "Môre",

diff --git a/translations/bg.json b/translations/bg.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Зареждане на &hellip;",
+	"LOADING": "Зареждане на …",
 
 	"TODAY": "Днес",
 	"TOMORROW": "Утре",

diff --git a/translations/ca.json b/translations/ca.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Carregant &hellip;",
+	"LOADING": "Carregant …",
 
 	"TODAY": "Avui",
 	"TOMORROW": "Demà",

diff --git a/translations/cs.json b/translations/cs.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Načítání &hellip;",
+	"LOADING": "Načítání …",
 
 	"TODAY": "Dnes",
 	"TOMORROW": "Zítra",

diff --git a/translations/cv.json b/translations/cv.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Тиенет &hellip;",
+	"LOADING": "Тиенет …",
 
 	"TODAY": "Паян",
 	"TOMORROW": "Ыран",

diff --git a/translations/cy.json b/translations/cy.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Llwytho &hellip;",
+	"LOADING": "Llwytho …",
 
 	"TODAY": "Heddiw",
 	"TOMORROW": "Yfory",

diff --git a/translations/da.json b/translations/da.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Indlæser &hellip;",
+	"LOADING": "Indlæser …",
 
 	"TODAY": "I dag",
 	"TOMORROW": "I morgen",

diff --git a/translations/el.json b/translations/el.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Φόρτωση &hellip;",
+	"LOADING": "Φόρτωση …",
 
 	"TODAY": "Σήμερα",
 	"TOMORROW": "Αύριο",

diff --git a/translations/en.json b/translations/en.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Loading &hellip;",
+	"LOADING": "Loading …",
 
 	"TODAY": "Today",
 	"TOMORROW": "Tomorrow",

diff --git a/translations/es.json b/translations/es.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Cargando &hellip;",
+	"LOADING": "Cargando …",
 
 	"TODAY": "Hoy",
 	"TOMORROW": "Mañana",

diff --git a/translations/et.json b/translations/et.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Laen &hellip;",
+	"LOADING": "Laen …",
 
 	"TODAY": "Täna",
 	"TOMORROW": "Homme",

diff --git a/translations/fi.json b/translations/fi.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Lataa &hellip;",
+	"LOADING": "Lataa …",
 
 	"TODAY": "Tänään",
 	"TOMORROW": "Huomenna",

diff --git a/translations/fr.json b/translations/fr.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Chargement &hellip;",
+	"LOADING": "Chargement …",
 
 	"TODAY": "Aujourd'hui",
 	"TOMORROW": "Demain",

diff --git a/translations/fy.json b/translations/fy.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Bezich mei laden &hellip;",
+	"LOADING": "Bezich mei laden …",
 
 	"TODAY": "Hjoed",
 	"TOMORROW": "Moarn",

diff --git a/translations/gl.json b/translations/gl.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Cargando &hellip;",
+	"LOADING": "Cargando …",
 
 	"TODAY": "Hoxe",
 	"TOMORROW": "Mañá",

diff --git a/translations/gu.json b/translations/gu.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "લોડ થઈ રહ્યું છે &hellip;",
+	"LOADING": "લોડ થઈ રહ્યું છે …",
 
 	"TODAY": "આજે",
 	"TOMORROW": "આવતી કાલે",

diff --git a/translations/hi.json b/translations/hi.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "लोड हो रहा है &hellip;",
+	"LOADING": "लोड हो रहा है …",
 
 	"TODAY": "आज",
 	"TOMORROW": "आने वाला कल",

diff --git a/translations/hr.json b/translations/hr.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Učitavanje &hellip;",
+	"LOADING": "Učitavanje …",
 
 	"TODAY": "Danas",
 	"TOMORROW": "Sutra",

diff --git a/translations/hu.json b/translations/hu.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Betöltés &hellip;",
+	"LOADING": "Betöltés …",
 
 	"TODAY": "Ma",
 	"TOMORROW": "Holnap",

diff --git a/translations/id.json b/translations/id.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Memuat &hellip;",
+	"LOADING": "Memuat …",
 
 	"TODAY": "Hari ini",
 	"TOMORROW": "Besok",

diff --git a/translations/is.json b/translations/is.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Hleð upp &hellip;",
+	"LOADING": "Hleð upp …",
 
 	"TODAY": "Í dag",
 	"TOMORROW": "Á morgun",

diff --git a/translations/it.json b/translations/it.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Caricamento in corso &hellip;",
+	"LOADING": "Caricamento in corso …",
 
 	"TODAY": "Oggi",
 	"TOMORROW": "Domani",

diff --git a/translations/ja.json b/translations/ja.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "ローディング &hellip;",
+	"LOADING": "ローディング …",
 
 	"TODAY": "今日",
 	"TOMORROW": "明日",

diff --git a/translations/ko.json b/translations/ko.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "로드 중 &hellip;",
+	"LOADING": "로드 중 …",
 
 	"TODAY": "오늘",
 	"TOMORROW": "내일",

diff --git a/translations/lt.json b/translations/lt.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Kraunasi &hellip;",
+	"LOADING": "Kraunasi …",
 
 	"TODAY": "Šiandien",
 	"TOMORROW": "Rytoj",

diff --git a/translations/ms-my.json b/translations/ms-my.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Tunggu Sebentar &hellip;",
+	"LOADING": "Tunggu Sebentar …",
 
 	"TODAY": "Hari ini",
 	"TOMORROW": "Esok",

diff --git a/translations/nb.json b/translations/nb.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Laster &hellip;",
+	"LOADING": "Laster …",
 
 	"TODAY": "I dag",
 	"TOMORROW": "I morgen",

diff --git a/translations/nl.json b/translations/nl.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Bezig met laden &hellip;",
+	"LOADING": "Bezig met laden …",
 
 	"TODAY": "Vandaag",
 	"TOMORROW": "Morgen",

diff --git a/translations/nn.json b/translations/nn.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Lastar &hellip;",
+	"LOADING": "Lastar …",
 
 	"TODAY": "I dag",
 	"TOMORROW": "I morgon",

diff --git a/translations/pl.json b/translations/pl.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Ładowanie &hellip;",
+	"LOADING": "Ładowanie …",
 
 	"TODAY": "Dziś",
 	"TOMORROW": "Jutro",

diff --git a/translations/pt-br.json b/translations/pt-br.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Carregando &hellip;",
+	"LOADING": "Carregando …",
 
 	"TODAY": "Hoje",
 	"TOMORROW": "Amanhã",

diff --git a/translations/pt.json b/translations/pt.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "A carregar &hellip;",
+	"LOADING": "A carregar …",
 
 	"TODAY": "Hoje",
 	"TOMORROW": "Amanhã",

diff --git a/translations/ro.json b/translations/ro.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Se încarcă &hellip;",
+	"LOADING": "Se încarcă …",
 
 	"TODAY": "Astăzi",
 	"TOMORROW": "Mâine",

diff --git a/translations/ru.json b/translations/ru.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Загрузка &hellip;",
+	"LOADING": "Загрузка …",
 
 	"TODAY": "Сегодня",
 	"TOMORROW": "Завтра",

diff --git a/translations/sk.json b/translations/sk.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Načítanie &hellip;",
+	"LOADING": "Načítanie …",
 
 	"TODAY": "Dnes",
 	"TOMORROW": "Zajtra",

diff --git a/translations/sv.json b/translations/sv.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Laddar &hellip;",
+	"LOADING": "Laddar …",
 
 	"TODAY": "I dag",
 	"TOMORROW": "I morgon",

diff --git a/translations/tlh.json b/translations/tlh.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "loS &hellip;",
+	"LOADING": "loS …",
 
 	"TODAY": "DaHjaj",
 	"TOMORROW": "wa'leS",

diff --git a/translations/tr.json b/translations/tr.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Yükleniyor &hellip;",
+	"LOADING": "Yükleniyor …",
 
 	"TODAY": "Bugün",
 	"TOMORROW": "Yarın",

diff --git a/translations/uk.json b/translations/uk.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "Завантаження &hellip;",
+	"LOADING": "Завантаження …",
 
 	"TODAY": "Сьогодні",
 	"TOMORROW": "Завтра",

diff --git a/translations/zh-cn.json b/translations/zh-cn.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "正在加载 &hellip;",
+	"LOADING": "正在加载 …",
 
 	"TODAY": "今天",
 	"TOMORROW": "明天",

diff --git a/translations/zh-tw.json b/translations/zh-tw.json
@@ -1,5 +1,5 @@
 {
-	"LOADING": "正在載入 &hellip;",
+	"LOADING": "正在載入 …",
 
 	"TODAY": "今天",
 	"TOMORROW": "明天",