weather@mockturtl version 2.6.7 Settings schema fix (#3264)

* Change 3.8 settings-schema because pot generation couldn't handle "units" as a key for sections * Add changelog and increment version
linuxmint · Oct 15, 2020 · ba1bd34 · ba1bd34
1 parent 3ef2be6
commit ba1bd34
Show file tree

Hide file tree

Showing 4 changed files with 446 additions and 424 deletions.
diff --git a/weather@mockturtl/CHANGELOG.md b/weather@mockturtl/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.6.7
+
+* Fixes [#3257](https://github.com/linuxmint/cinnamon-spices-applets/issues/3257)
+
 ## 2.6.6
 
 * Fixes [#3238](https://github.com/linuxmint/cinnamon-spices-applets/issues/3238)

diff --git a/weather@mockturtl/files/weather@mockturtl/3.8/settings-schema.json b/weather@mockturtl/files/weather@mockturtl/3.8/settings-schema.json
@@ -23,11 +23,11 @@
 				"presentation"
             ]
         },
-        "units-section":{
+        "units-page":{
             "type":"page",
             "title":"Units, Icons and Keys",
             "sections":[
-				"units",
+				"units-section",
 				"icons",
 				"keybindings"
             ]
@@ -42,37 +42,6 @@
 				"submit-issue"
 			]
 		},
-		"submit-issue" : {
-			"type":"section",
-			"title":"Report an issue",
-			"keys":[
-				"issue-reporting-explanation",
-				"submitIssue",
-				"maintainer"
-			]
-		},
-		"provider-info" : {
-			"type":"section",
-			"title":"How to choose a weather provider",
-			"keys":[
-				"provider-explanation"
-			]
-		},
-		"location-info": {
-			"type":"section",
-			"title":"Allowed location formats",
-			"keys":[
-				"loc-info"
-			]
-		},
-		"more-info": {
-			"type":"section",
-			"title": "View additional information",
-			"keys":[
-				"more-info-label",
-				"getLocation"
-			]	
-		},
 		"provider-options" : {
 			"type":"section",
 			"title":"Weather Provider Options",
@@ -88,21 +57,12 @@
 				"forecastHours"
 			]
 		},
-		"units" : {
-			"type":"section",
-			"title":"Units",
-			"keys":[
-				"temperatureUnit",
-				"windSpeedUnit",
-				"pressureUnit",
-				"distanceUnit"
-			]
-		},
-		"keybindings" : {
+		"weather-conditions" : {
 			"type":"section",
-			"title":"Keybindings",
+			"title":"Weather conditions",
 			"keys":[
-				"keybinding"
+				"translateCondition",
+				"shortConditions"
 			]
 		},
 		"panel-options" : {
@@ -128,12 +88,14 @@
 				"locationLabelOverride"
 			]
 		},
-		"weather-conditions" : {
+		"units-section" : {
 			"type":"section",
-			"title":"Weather conditions",
+			"title":"Units",
 			"keys":[
-				"translateCondition",
-				"shortConditions"
+				"temperatureUnit",
+				"windSpeedUnit",
+				"pressureUnit",
+				"distanceUnit"
 			]
 		},
 		"icons" : {
@@ -144,6 +106,44 @@
 				"useCustomMenuIcons",
 				"useCustomAppletIcons"
 			]
+		},
+		"keybindings" : {
+			"type":"section",
+			"title":"Keybindings",
+			"keys":[
+				"keybinding"
+			]
+		},
+		"provider-info" : {
+			"type":"section",
+			"title":"How to choose a weather provider",
+			"keys":[
+				"provider-explanation"
+			]
+		},
+		"location-info": {
+			"type":"section",
+			"title":"Allowed location formats",
+			"keys":[
+				"loc-info"
+			]
+		},
+		"more-info": {
+			"type":"section",
+			"title": "View additional information",
+			"keys":[
+				"more-info-label",
+				"getLocation"
+			]
+		},
+		"submit-issue" : {
+			"type":"section",
+			"title":"Report an issue",
+			"keys":[
+				"issue-reporting-explanation",
+				"submitIssue",
+				"maintainer"
+			]
 		}
 	},
 	"keybinding": {

diff --git a/weather@mockturtl/files/weather@mockturtl/metadata.json b/weather@mockturtl/files/weather@mockturtl/metadata.json
@@ -3,7 +3,7 @@
   "name": "Weather",
   "description": "View your local weather forecast",
   "max-instances": 3,
-  "version": "2.6.6",
+  "version": "2.6.7",
   "multiversion": true,
   "cinnamon-version": ["2.2", "2.4", "2.6", "2.8", "3.0", "3.2", "3.4", "3.6", "3.8", "4.0", "4.2", "4.4", "4.6", "4.8"]
 }