OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'openhab:main' into core-updater

pull/2372/head
Andrew Fiddian-Green 2021-07-20 17:46:27 +01:00 committed by GitHub
parent 8f8f3a486d e5e62d15a3
commit c3830f4f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sv.properties Normal file
View File

@ -0,0 +1,4 @@
misc.config.lsp.port.label = Port
misc.config.lsp.port.description = Porten som språkservern lyssnar på.
service.misc.lsp.label = Språkserver (LSP)

4
bundles/org.openhab.core.model.script/resources/OH-INF/i18n/hli_sv.properties Normal file
View File

@ -0,0 +1,4 @@
voice.config.rulehli.item.label = Item för röstkommando
voice.config.rulehli.item.description = Sträng-Item att skicka röstkommandon till.
service.voice.rulehli.label = Rösttolkare för regler

57
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
View File

@ -109,7 +109,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
new StateOption("2", "average"), new StateOption("3", "good"), new StateOption("2", "average"), new StateOption("3", "good"),
new StateOption("4", "excellent"))) new StateOption("4", "excellent")))
.build()) .build())
.build(); .withTags(List.of("Measurement", "Level")).build();
/** /**
* Low battery default system wide {@link ChannelType}. Represents a low battery warning with possible values * Low battery default system wide {@link ChannelType}. Represents a low battery warning with possible values
@ -118,7 +118,8 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
public static final ChannelType SYSTEM_CHANNEL_LOW_BATTERY = ChannelTypeBuilder public static final ChannelType SYSTEM_CHANNEL_LOW_BATTERY = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_LOW_BATTERY, "Low Battery", CoreItemFactory.SWITCH) .state(SYSTEM_CHANNEL_TYPE_UID_LOW_BATTERY, "Low Battery", CoreItemFactory.SWITCH)
.withCategory("LowBattery") .withCategory("LowBattery")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build()).build(); .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build())
.withTags(List.of("LowBattery", "Energy")).build();
/** /**
* Battery level default system wide {@link ChannelType}. Represents the battery level as a percentage. * Battery level default system wide {@link ChannelType}. Represents the battery level as a percentage.
@ -129,7 +130,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO)
.withMaximum(new BigDecimal(100)).withStep(BigDecimal.ONE).withReadOnly(true).withPattern("%.0f %%") .withMaximum(new BigDecimal(100)).withStep(BigDecimal.ONE).withReadOnly(true).withPattern("%.0f %%")
.build()) .build())
.build(); .withTags(List.of("Measurement", "Energy")).build();
/** /**
* System wide trigger {@link ChannelType} without event options. * System wide trigger {@link ChannelType} without event options.
@ -173,7 +174,8 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
*/ */
public static final ChannelType SYSTEM_POWER = ChannelTypeBuilder public static final ChannelType SYSTEM_POWER = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_POWER, "Power", CoreItemFactory.SWITCH) .state(SYSTEM_CHANNEL_TYPE_UID_POWER, "Power", CoreItemFactory.SWITCH)
.withDescription("Device is operable when channel has state ON").withCategory("Switch").build(); .withDescription("Device is operable when channel has state ON").withCategory("Switch")
.withTags(List.of("Switch", "Power")).build();
/** /**
* Location: default system wide {@link ChannelType} which displays a location * Location: default system wide {@link ChannelType} which displays a location
@ -183,7 +185,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Location in lat./lon./height coordinates") .withDescription("Location in lat./lon./height coordinates")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true)
.withPattern("%2$s°N %3$s°E %1$sm").build()) .withPattern("%2$s°N %3$s°E %1$sm").build())
.build(); .withTag("Measurement").build();
/** /**
* Motion: default system wide {@link ChannelType} which indications whether motion was detected (state ON) * Motion: default system wide {@link ChannelType} which indications whether motion was detected (state ON)
@ -191,7 +193,8 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
public static final ChannelType SYSTEM_MOTION = ChannelTypeBuilder public static final ChannelType SYSTEM_MOTION = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_MOTION, "Motion", CoreItemFactory.SWITCH) .state(SYSTEM_CHANNEL_TYPE_UID_MOTION, "Motion", CoreItemFactory.SWITCH)
.withDescription("Motion detected by the device").withCategory("Motion") .withDescription("Motion detected by the device").withCategory("Motion")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build()).build(); .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build())
.withTags(List.of("Status", "Presence")).build();
/** /**
* Brightness: default system wide {@link ChannelType} which allows changing the brightness from 0-100% * Brightness: default system wide {@link ChannelType} which allows changing the brightness from 0-100%
@ -201,14 +204,15 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Controls the brightness and switches the light on and off").withCategory("Light") .withDescription("Controls the brightness and switches the light on and off").withCategory("Light")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO)
.withMaximum(new BigDecimal(100)).withPattern("%d %%").build()) .withMaximum(new BigDecimal(100)).withPattern("%d %%").build())
.build(); .withTags(List.of("Control", "Light")).build();
/** /**
* Color: default system wide {@link ChannelType} which allows changing the color * Color: default system wide {@link ChannelType} which allows changing the color
*/ */
public static final ChannelType SYSTEM_COLOR = ChannelTypeBuilder public static final ChannelType SYSTEM_COLOR = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_COLOR, "Color", CoreItemFactory.COLOR) .state(SYSTEM_CHANNEL_TYPE_UID_COLOR, "Color", CoreItemFactory.COLOR)
.withDescription("Controls the color of the light").withCategory("ColorLight").build(); .withDescription("Controls the color of the light").withCategory("ColorLight")
.withTags(List.of("Control", "Light")).build();
/** /**
* Color-temperature: default system wide {@link ChannelType} which allows changing the color temperature in percent * Color-temperature: default system wide {@link ChannelType} which allows changing the color temperature in percent
@ -216,9 +220,10 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
public static final ChannelType SYSTEM_COLOR_TEMPERATURE = ChannelTypeBuilder public static final ChannelType SYSTEM_COLOR_TEMPERATURE = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_COLOR_TEMPERATURE, "Color Temperature", CoreItemFactory.DIMMER) .state(SYSTEM_CHANNEL_TYPE_UID_COLOR_TEMPERATURE, "Color Temperature", CoreItemFactory.DIMMER)
.withDescription("Controls the color temperature of the light from 0 (cold) to 100 (warm)") .withDescription("Controls the color temperature of the light from 0 (cold) to 100 (warm)")
.withCategory("ColorLight").withStateDescriptionFragment(StateDescriptionFragmentBuilder.create() .withCategory("ColorLight")
.withMinimum(BigDecimal.ZERO).withMaximum(new BigDecimal(100)).withPattern("%.0f").build()) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO)
.build(); .withMaximum(new BigDecimal(100)).withPattern("%.0f").build())
.withTags(List.of("Control", "ColorTemperature")).build();
/** /**
* Color-temperature: default system wide {@link ChannelType} which allows changing the color temperature in Kelvin * Color-temperature: default system wide {@link ChannelType} which allows changing the color temperature in Kelvin
@ -226,9 +231,10 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
public static final ChannelType SYSTEM_COLOR_TEMPERATURE_ABS = ChannelTypeBuilder public static final ChannelType SYSTEM_COLOR_TEMPERATURE_ABS = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_COLOR_TEMPERATURE_ABS, "Color Temperature", CoreItemFactory.NUMBER) .state(SYSTEM_CHANNEL_TYPE_UID_COLOR_TEMPERATURE_ABS, "Color Temperature", CoreItemFactory.NUMBER)
.withDescription("Controls the color temperature of the light in Kelvin").withCategory("ColorLight") .withDescription("Controls the color temperature of the light in Kelvin").withCategory("ColorLight")
.isAdvanced(true).withStateDescriptionFragment(StateDescriptionFragmentBuilder.create() .isAdvanced(true)
.withMinimum(new BigDecimal(1000)).withMaximum(new BigDecimal(10000)).withPattern("%.0f K").build()) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(new BigDecimal(1000))
.build(); .withMaximum(new BigDecimal(10000)).withPattern("%.0f K").build())
.withTags(List.of("Control", "ColorTemperature")).build();
// media channels // media channels
@ -240,21 +246,22 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Change the sound volume of a device") .withDescription("Change the sound volume of a device")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO)
.withMaximum(new BigDecimal(100)).withPattern("%d %%").build()) .withMaximum(new BigDecimal(100)).withPattern("%d %%").build())
.withCategory("SoundVolume").build(); .withCategory("SoundVolume").withTags(List.of("Control", "SoundVolume")).build();
/** /**
* Mute: default system wide {@link ChannelType} which allows muting and un-muting audio * Mute: default system wide {@link ChannelType} which allows muting and un-muting audio
*/ */
public static final ChannelType SYSTEM_MUTE = ChannelTypeBuilder public static final ChannelType SYSTEM_MUTE = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_MUTE, "Mute", CoreItemFactory.SWITCH) .state(SYSTEM_CHANNEL_TYPE_UID_MUTE, "Mute", CoreItemFactory.SWITCH)
.withDescription("Mute audio of the device").withCategory("SoundVolume").build(); .withDescription("Mute audio of the device").withCategory("SoundVolume")
.withTags(List.of("Switch", "SoundVolume")).build();
/** /**
* Media-control: system wide {@link ChannelType} which controls a media player * Media-control: system wide {@link ChannelType} which controls a media player
*/ */
public static final ChannelType SYSTEM_MEDIA_CONTROL = ChannelTypeBuilder public static final ChannelType SYSTEM_MEDIA_CONTROL = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_MEDIA_CONTROL, "Media Control", CoreItemFactory.PLAYER) .state(SYSTEM_CHANNEL_TYPE_UID_MEDIA_CONTROL, "Media Control", CoreItemFactory.PLAYER)
.withCategory("MediaControl").build(); .withCategory("MediaControl").withTag("Control").build();
/** /**
* Media-title: default system wide {@link ChannelType} which displays the title of a (played) song * Media-title: default system wide {@link ChannelType} which displays the title of a (played) song
@ -262,7 +269,8 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
public static final ChannelType SYSTEM_MEDIA_TITLE = ChannelTypeBuilder public static final ChannelType SYSTEM_MEDIA_TITLE = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_MEDIA_TITLE, "Media Title", CoreItemFactory.STRING) .state(SYSTEM_CHANNEL_TYPE_UID_MEDIA_TITLE, "Media Title", CoreItemFactory.STRING)
.withDescription("Title of a (played) media file") .withDescription("Title of a (played) media file")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build()).build(); .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build())
.withTag("Status").build();
/** /**
* Media-artist: default system wide {@link ChannelType} which displays the artist of a (played) song * Media-artist: default system wide {@link ChannelType} which displays the artist of a (played) song
@ -270,7 +278,8 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
public static final ChannelType SYSTEM_MEDIA_ARTIST = ChannelTypeBuilder public static final ChannelType SYSTEM_MEDIA_ARTIST = ChannelTypeBuilder
.state(SYSTEM_CHANNEL_TYPE_UID_MEDIA_ARTIST, "Media Artist", CoreItemFactory.STRING) .state(SYSTEM_CHANNEL_TYPE_UID_MEDIA_ARTIST, "Media Artist", CoreItemFactory.STRING)
.withDescription("Artist of a (played) media file") .withDescription("Artist of a (played) media file")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build()).build(); .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withReadOnly(true).build())
.withTag("Status").build();
// weather channels // weather channels
@ -282,7 +291,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Current wind direction expressed as an angle").withCategory("Wind") .withDescription("Current wind direction expressed as an angle").withCategory("Wind")
.withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO) .withStateDescriptionFragment(StateDescriptionFragmentBuilder.create().withMinimum(BigDecimal.ZERO)
.withMaximum(new BigDecimal(360)).withReadOnly(true).withPattern("%.0f %unit%").build()) .withMaximum(new BigDecimal(360)).withReadOnly(true).withPattern("%.0f %unit%").build())
.build(); .withTags(List.of("Measurement", "Wind")).build();
/** /**
* Wind-speed: system wide {@link ChannelType} which shows the wind speed * Wind-speed: system wide {@link ChannelType} which shows the wind speed
@ -292,7 +301,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Current wind speed").withCategory("Wind") .withDescription("Current wind speed").withCategory("Wind")
.withStateDescriptionFragment( .withStateDescriptionFragment(
StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.1f %unit%").build()) StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.1f %unit%").build())
.build(); .withTags(List.of("Measurement", "Wind")).build();
/** /**
* Outdoor-temperature: system wide {@link ChannelType} which shows the outdoor temperature * Outdoor-temperature: system wide {@link ChannelType} which shows the outdoor temperature
@ -302,7 +311,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Current outdoor temperature").withCategory("Temperature") .withDescription("Current outdoor temperature").withCategory("Temperature")
.withStateDescriptionFragment( .withStateDescriptionFragment(
StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.1f %unit%").build()) StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.1f %unit%").build())
.build(); .withTags(List.of("Measurement", "Temperature")).build();
/** /**
* Atmospheric-humidity: system wide {@link ChannelType} which shows the atmospheric humidity * Atmospheric-humidity: system wide {@link ChannelType} which shows the atmospheric humidity
@ -312,7 +321,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Current atmospheric relative humidity").withCategory("Humidity") .withDescription("Current atmospheric relative humidity").withCategory("Humidity")
.withStateDescriptionFragment( .withStateDescriptionFragment(
StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.0f %%").build()) StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.0f %%").build())
.build(); .withTags(List.of("Measurement", "Humidity")).build();
/** /**
* Barometric-pressure: system wide {@link ChannelType} which shows the barometric pressure * Barometric-pressure: system wide {@link ChannelType} which shows the barometric pressure
@ -322,7 +331,7 @@ public class DefaultSystemChannelTypeProvider implements ChannelTypeProvider {
.withDescription("Current barometric pressure").withCategory("Pressure") .withDescription("Current barometric pressure").withCategory("Pressure")
.withStateDescriptionFragment( .withStateDescriptionFragment(
StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.3f %unit%").build()) StateDescriptionFragmentBuilder.create().withReadOnly(true).withPattern("%.3f %unit%").build())
.build(); .withTags(List.of("Measurement", "Pressure")).build();
private static final Collection<ChannelType> CHANNEL_TYPES = List.of(SYSTEM_CHANNEL_SIGNAL_STRENGTH, private static final Collection<ChannelType> CHANNEL_TYPES = List.of(SYSTEM_CHANNEL_SIGNAL_STRENGTH,
SYSTEM_CHANNEL_LOW_BATTERY, SYSTEM_CHANNEL_BATTERY_LEVEL, SYSTEM_TRIGGER, SYSTEM_RAWBUTTON, SYSTEM_BUTTON, SYSTEM_CHANNEL_LOW_BATTERY, SYSTEM_CHANNEL_BATTERY_LEVEL, SYSTEM_TRIGGER, SYSTEM_RAWBUTTON, SYSTEM_BUTTON,

7
bundles/org.openhab.core.ui/src/main/resources/OH-INF/i18n/sitemap_fi.properties Normal file
View File

@ -0,0 +1,7 @@
system.config.sitemap.groupMembersSorting.label = Ryhmän jäsenten lajittelu
system.config.sitemap.groupMembersSorting.description = Määrittää, miten ryhmän jäsenet lajitellaan UI\:ssa.
system.config.sitemap.groupMembersSorting.option.NONE = Ei lajittelua
system.config.sitemap.groupMembersSorting.option.LABEL = Järjestetty otsikon mukaan
system.config.sitemap.groupMembersSorting.option.NAME = Järjestetty nimen mukaan
service.system.sitemap.label = Sitemap

7
bundles/org.openhab.core.ui/src/main/resources/OH-INF/i18n/sitemap_nl.properties Normal file
View File

@ -0,0 +1,7 @@
system.config.sitemap.groupMembersSorting.label = Groepslid Sortering
system.config.sitemap.groupMembersSorting.description = Definieert hoe de leden van een groep worden gesorteerd in de UI.
system.config.sitemap.groupMembersSorting.option.NONE = Geen sortering
system.config.sitemap.groupMembersSorting.option.LABEL = Sorteren op label
system.config.sitemap.groupMembersSorting.option.NAME = Sorteren op naam
service.system.sitemap.label = Sitemap