Second pass at refactoring, including reworking the dialog classes, r…

…emoving a bunch of condition specific dialog files, code review changes and other minor cleanups.
MycroftAI · May 12, 2021 · 5d38589 · 5d38589
1 parent 10ea965
commit 5d38589
Show file tree

Hide file tree

Showing 590 changed files with 527 additions and 2,066 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/locale/ca-es/ClearAlternatives.voc b/locale/ca-es/ClearAlternatives.voc
diff --git a/locale/ca-es/CloudsAlternatives.voc b/locale/ca-es/CloudsAlternatives.voc
diff --git a/locale/ca-es/RainAlternatives.voc b/locale/ca-es/RainAlternatives.voc
diff --git a/locale/ca-es/SnowAlternatives.voc b/locale/ca-es/SnowAlternatives.voc
diff --git a/locale/ca-es/ThunderstormAlternatives.voc b/locale/ca-es/ThunderstormAlternatives.voc
diff --git a/locale/ca-es/and.dialog b/locale/ca-es/and.dialog
@@ -0,0 +1 @@
+, i
diff --git a/locale/ca-es/clear.future.dialog b/locale/ca-es/clear.future.dialog
diff --git a/locale/ca-es/condition.category.value b/locale/ca-es/condition.category.value
diff --git a/locale/ca-es/current.clear.alternative.local.dialog b/locale/ca-es/current.clear.alternative.local.dialog
diff --git a/locale/ca-es/current.clear.alternative.location.dialog b/locale/ca-es/current.clear.alternative.location.dialog
diff --git a/locale/ca-es/current.clear.not.expected.local.dialog b/locale/ca-es/current.clear.not.expected.local.dialog
diff --git a/locale/ca-es/current.clouds.alternative.local.dialog b/locale/ca-es/current.clouds.alternative.local.dialog
diff --git a/locale/ca-es/current.clouds.alternative.location.dialog b/locale/ca-es/current.clouds.alternative.location.dialog
diff --git a/locale/ca-es/current.clouds.not.expected.local.dialog b/locale/ca-es/current.clouds.not.expected.local.dialog
diff --git a/locale/ca-es/current.clouds.not.expected.location.dialog b/locale/ca-es/current.clouds.not.expected.location.dialog
diff --git a/locale/ca-es/current.fog.alternative.local.dialog b/locale/ca-es/current.fog.alternative.local.dialog
diff --git a/locale/ca-es/current.fog.alternative.location.dialog b/locale/ca-es/current.fog.alternative.location.dialog
diff --git a/locale/ca-es/current.fog.not.expected.local.dialog b/locale/ca-es/current.fog.not.expected.local.dialog
diff --git a/locale/ca-es/current.fog.not.expected.location.dialog b/locale/ca-es/current.fog.not.expected.location.dialog
diff --git a/locale/ca-es/current.rain.alternative.local.dialog b/locale/ca-es/current.rain.alternative.local.dialog
diff --git a/locale/ca-es/current.rain.alternative.location.dialog b/locale/ca-es/current.rain.alternative.location.dialog
diff --git a/locale/ca-es/current.rain.not.expected.local.dialog b/locale/ca-es/current.rain.not.expected.local.dialog
diff --git a/locale/ca-es/current.rain.not.expected.location.dialog b/locale/ca-es/current.rain.not.expected.location.dialog
diff --git a/locale/ca-es/current.snow.alternative.local.dialog b/locale/ca-es/current.snow.alternative.local.dialog
diff --git a/locale/ca-es/current.snow.alternative.location.dialog b/locale/ca-es/current.snow.alternative.location.dialog
diff --git a/locale/ca-es/current.snow.not.expected.local.dialog b/locale/ca-es/current.snow.not.expected.local.dialog
diff --git a/locale/ca-es/current.snow.not.expected.location.dialog b/locale/ca-es/current.snow.not.expected.location.dialog
diff --git a/locale/ca-es/current.thunderstorm.alternative.local.dialog b/locale/ca-es/current.thunderstorm.alternative.local.dialog
diff --git a/locale/ca-es/current.thunderstorm.not.expected.local.dialog b/locale/ca-es/current.thunderstorm.not.expected.local.dialog
diff --git a/locale/ca-es/current.thunderstorm.not.expected.location.dialog b/locale/ca-es/current.thunderstorm.not.expected.location.dialog
diff --git a/locale/ca-es/current.thundestorm.alternative.location.dialog b/locale/ca-es/current.thundestorm.alternative.location.dialog
diff --git a/locale/ca-es/daily.clear.alternative.local.dialog b/locale/ca-es/daily.clear.alternative.local.dialog
diff --git a/locale/ca-es/daily.clear.alternative.location.dialog b/locale/ca-es/daily.clear.alternative.location.dialog
diff --git a/locale/ca-es/daily.clear.not.expected.local.dialog b/locale/ca-es/daily.clear.not.expected.local.dialog
diff --git a/locale/ca-es/daily.clear.not.expected.location.dialog b/locale/ca-es/daily.clear.not.expected.location.dialog
diff --git a/locale/ca-es/daily.clouds.alternative.local.dialog b/locale/ca-es/daily.clouds.alternative.local.dialog
diff --git a/locale/ca-es/daily.clouds.alternative.location.dialog b/locale/ca-es/daily.clouds.alternative.location.dialog
diff --git a/locale/ca-es/daily.clouds.not.expected.local.dialog b/locale/ca-es/daily.clouds.not.expected.local.dialog
diff --git a/locale/ca-es/daily.clouds.not.expected.location.dialog b/locale/ca-es/daily.clouds.not.expected.location.dialog
diff --git a/locale/ca-es/daily.fog.alternative.local.dialog b/locale/ca-es/daily.fog.alternative.local.dialog
diff --git a/locale/ca-es/daily.fog.alternative.location.dialog b/locale/ca-es/daily.fog.alternative.location.dialog
diff --git a/locale/ca-es/daily.fog.not.expected.local.dialog b/locale/ca-es/daily.fog.not.expected.local.dialog
diff --git a/locale/ca-es/daily.fog.not.expected.location.dialog b/locale/ca-es/daily.fog.not.expected.location.dialog
diff --git a/locale/ca-es/daily.rain.alternative.local.dialog b/locale/ca-es/daily.rain.alternative.local.dialog
diff --git a/locale/ca-es/daily.rain.alternative.location.dialog b/locale/ca-es/daily.rain.alternative.location.dialog
diff --git a/locale/ca-es/daily.rain.not.expected.local.dialog b/locale/ca-es/daily.rain.not.expected.local.dialog
diff --git a/locale/ca-es/daily.rain.not.expected.location.dialog b/locale/ca-es/daily.rain.not.expected.location.dialog
diff --git a/locale/ca-es/daily.snow.alternative.location.dialog b/locale/ca-es/daily.snow.alternative.location.dialog
diff --git a/locale/ca-es/daily.snow.not.expected.local.dialog b/locale/ca-es/daily.snow.not.expected.local.dialog
diff --git a/locale/ca-es/daily.snow.not.expected.location.dialog b/locale/ca-es/daily.snow.not.expected.location.dialog
diff --git a/locale/ca-es/daily.thunderstorm.alternative.local.dialog b/locale/ca-es/daily.thunderstorm.alternative.local.dialog
diff --git a/locale/ca-es/daily.thunderstorm.alternative.location.dialog b/locale/ca-es/daily.thunderstorm.alternative.location.dialog
diff --git a/locale/ca-es/daily.thunderstorm.not.expected.local.dialog b/locale/ca-es/daily.thunderstorm.not.expected.local.dialog
diff --git a/locale/ca-es/daily.thunderstorm.not.expected.location.dialog b/locale/ca-es/daily.thunderstorm.not.expected.location.dialog
diff --git a/locale/ca-es/do not know.dialog b/locale/ca-es/do not know.dialog
diff --git a/locale/ca-es/light.dialog b/locale/ca-es/light.dialog
diff --git a/locale/ca-es/on.date.dialog b/locale/ca-es/on.date.dialog
diff --git a/locale/ca-es/on.dialog b/locale/ca-es/on.dialog
diff --git a/locale/ca-es/storm.dialog → locale/ca-es/thunderstorm.dialog b/locale/ca-es/storm.dialog → locale/ca-es/thunderstorm.dialog
diff --git a/locale/ca-es/weekly.condition.on.day.dialog b/locale/ca-es/weekly.condition.on.day.dialog
diff --git a/locale/ca-es/weekly.conditions.mostly.one.dialog b/locale/ca-es/weekly.conditions.mostly.one.dialog
diff --git a/locale/ca-es/weekly.conditions.seq.extra.dialog b/locale/ca-es/weekly.conditions.seq.extra.dialog
diff --git a/locale/ca-es/weekly.conditions.seq.period.dialog b/locale/ca-es/weekly.conditions.seq.period.dialog
diff --git a/locale/ca-es/weekly.conditions.seq.start.dialog b/locale/ca-es/weekly.conditions.seq.start.dialog
diff --git a/locale/ca-es/weekly.conditions.some.days.dialog b/locale/ca-es/weekly.conditions.some.days.dialog
diff --git a/locale/ca-es/weekly.temp.range.dialog → locale/ca-es/weekly.temperature.dialog b/locale/ca-es/weekly.temp.range.dialog → locale/ca-es/weekly.temperature.dialog
diff --git a/locale/ca-es/what.is.multi.day.forecast.intent b/locale/ca-es/what.is.multi.day.forecast.intent
diff --git a/locale/ca-es/whats.weather.like.intent b/locale/ca-es/whats.weather.like.intent
diff --git a/locale/da-dk/ClearAlternatives.voc b/locale/da-dk/ClearAlternatives.voc
diff --git a/locale/da-dk/CloudsAlternatives.voc b/locale/da-dk/CloudsAlternatives.voc
diff --git a/locale/da-dk/FogAlternatives.voc b/locale/da-dk/FogAlternatives.voc
diff --git a/locale/da-dk/RainAlternatives.voc b/locale/da-dk/RainAlternatives.voc
diff --git a/locale/da-dk/SnowAlternatives.voc b/locale/da-dk/SnowAlternatives.voc
diff --git a/locale/da-dk/and.dialog b/locale/da-dk/and.dialog
@@ -0,0 +1,2 @@
+# , and
+, og
diff --git a/locale/da-dk/clear.future.dialog b/locale/da-dk/clear.future.dialog
diff --git a/locale/da-dk/condition.category.value b/locale/da-dk/condition.category.value
diff --git a/locale/da-dk/current.clear.alternative.local.dialog b/locale/da-dk/current.clear.alternative.local.dialog
diff --git a/locale/da-dk/current.clear.alternative.location.dialog b/locale/da-dk/current.clear.alternative.location.dialog
diff --git a/locale/da-dk/current.clear.not.expected.location.dialog b/locale/da-dk/current.clear.not.expected.location.dialog
diff --git a/locale/da-dk/current.clouds.alternative.local.dialog b/locale/da-dk/current.clouds.alternative.local.dialog
diff --git a/locale/da-dk/current.clouds.alternative.location.dialog b/locale/da-dk/current.clouds.alternative.location.dialog
diff --git a/locale/da-dk/current.clouds.not.expected.local.dialog b/locale/da-dk/current.clouds.not.expected.local.dialog
diff --git a/locale/da-dk/current.clouds.not.expected.location.dialog b/locale/da-dk/current.clouds.not.expected.location.dialog
diff --git a/locale/da-dk/current.fog.alternative.local.dialog b/locale/da-dk/current.fog.alternative.local.dialog
diff --git a/locale/da-dk/current.fog.alternative.location.dialog b/locale/da-dk/current.fog.alternative.location.dialog