weather@mockturtl: Add line break to Override options (linuxmint#6103)

claudiux · Jun 20, 2024 · 7555851 · 7555851
1 parent acc0a26
commit 7555851
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/weather@mockturtl/README.md b/weather@mockturtl/README.md
@@ -184,6 +184,7 @@ The setting allows you to make the applet display basically anything in the form
 | `{country}`       | Country name shown in the popup                           |
 | `{search_entry}`  | Search entry text in manual location (or location store)  |
 | `{last_updated}`  | Formatted last updated time                               |
+| `{br}`            | Line Break		                                            |
 
 ## Run script when the weather data changes
 

diff --git a/weather@mockturtl/files/weather@mockturtl/3.8/weather-applet.js b/weather@mockturtl/files/weather@mockturtl/3.8/weather-applet.js
@@ -9360,7 +9360,8 @@ function InjectValues(text, weather, config, inCommand = false) {
             .replace(/{{city}}/g, Literal(city))
             .replace(/{{country}}/g, Literal(country))
             .replace(/{{search_entry}}/g, Literal(searchEntry))
-            .replace(/{{last_updated}}/g, Literal(lastUpdatedTime));
+            .replace(/{{last_updated}}/g, Literal(lastUpdatedTime))
+            .replace(/{{br}}/g, Literal("\n"));
     }
     return text.replace(/{t}/g, temp)
         .replace(/{u}/g, tempUnit)
@@ -9377,7 +9378,8 @@ function InjectValues(text, weather, config, inCommand = false) {
         .replace(/{city}/g, city)
         .replace(/{country}/g, country)
         .replace(/{search_entry}/g, searchEntry)
-        .replace(/{last_updated}/g, lastUpdatedTime);
+        .replace(/{last_updated}/g, lastUpdatedTime)
+        .replace(/{br}/g, "\n");
 }
 function CapitalizeFirstLetter(description) {
     if ((description == undefined || description == null)) {

diff --git a/weather@mockturtl/src/3_8/utils.ts b/weather@mockturtl/src/3_8/utils.ts
@@ -96,7 +96,8 @@ export function InjectValues(text: string, weather: WeatherData, config: Config,
 					.replace(/{{city}}/g, Literal(city))
 					.replace(/{{country}}/g, Literal(country))
 					.replace(/{{search_entry}}/g, Literal(searchEntry))
-					.replace(/{{last_updated}}/g, Literal(lastUpdatedTime));
+					.replace(/{{last_updated}}/g, Literal(lastUpdatedTime))
+					.replace(/{{br}}/g, Literal("\n"));
 	}
 
 	return  text.replace(/{t}/g, temp)
@@ -114,7 +115,8 @@ export function InjectValues(text: string, weather: WeatherData, config: Config,
 				.replace(/{city}/g, city)
 				.replace(/{country}/g, country)
 				.replace(/{search_entry}/g, searchEntry)
-				.replace(/{last_updated}/g, lastUpdatedTime);
+				.replace(/{last_updated}/g, lastUpdatedTime)
+				.replace(/{br}/g, "\n");
 }
 
 export function CapitalizeFirstLetter(description: string): string {