Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[teleinfo] Update translation files #12156

Merged
merged 2 commits into from
Jan 31, 2022

Conversation

olivierkeke
Copy link
Contributor

Signed-off-by: Olivier Marceau [email protected]

It seems that descriptions for channels added in the PR #11375 don't appear on crowdin, so this PR updates translation files.
This applies changes made by mvn org.openhab.core.tools:i18n-maven-plugin:3.2.0:generate-default-translations -pl :org.openhab.binding.teleinfo command.

Signed-off-by: Olivier Marceau <[email protected]>
Comment on lines 286 to 288
channel-type.teleinfo.currentType.label = Teleinfo Current Type
channel-type.teleinfo.currentType.label = Teleinfo Current Type
channel-type.teleinfo.currentType.label = Teleinfo Current Type
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you have several duplicated entries in the "channel types" section.
You have 7 channel types appearing 3 times.
Please check what would be really expected.
Would it be a bug in the i18n tool ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the duplicated lines.
I think the i18n tool generates these entries because identical channel types are defined in several xml files.

Copy link
Contributor

@lolodomo lolodomo Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should not have a channel type defined several times. That is certainly the root cause and what should be fixed. The common solution is to put channel types in a file named channels.xml.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I probably should do some clean up in the xml config files.

I wanted to have a separate xml file for each channel-group-type and it seems that channel-group-type cannot use a channel-type from another file so I end up duplicating channel-type in each xml file.

What you suggest is to aggregate every channel-group-type and channel-type in the same xml file? Isn't there a way to keep separate files?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not aware of this limit.
I have not played with groups of channels very often.
I could be wrong but I think I already saw channels groups and channel types defined in separate files. Let me search an example.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can have a look at the NibeUplink Binding: channel-group-type and channel-type are defined in different XML files.
Apparently there is no constraint to have both in the same XML file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! The problem should have been located between chair and keyboard, as usual. I've submitted a new PR: #12204.

Signed-off-by: Olivier Marceau <[email protected]>
Copy link
Contributor

@lolodomo lolodomo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lolodomo lolodomo merged commit 87975fe into openhab:main Jan 31, 2022
@lolodomo lolodomo added this to the 3.3 milestone Jan 31, 2022
NickWaterton pushed a commit to NickWaterton/openhab-addons that referenced this pull request Apr 27, 2022
* Apply maven i18n plugin

Signed-off-by: Olivier Marceau <[email protected]>
Signed-off-by: Nick Waterton <[email protected]>
nemerdaud pushed a commit to nemerdaud/openhab-addons that referenced this pull request Jun 29, 2022
* Apply maven i18n plugin

Signed-off-by: Olivier Marceau <[email protected]>
andan67 pushed a commit to andan67/openhab-addons that referenced this pull request Nov 6, 2022
* Apply maven i18n plugin

Signed-off-by: Olivier Marceau <[email protected]>
andrasU pushed a commit to andrasU/openhab-addons that referenced this pull request Nov 12, 2022
* Apply maven i18n plugin

Signed-off-by: Olivier Marceau <[email protected]>
Signed-off-by: Andras Uhrin <[email protected]>
psmedley pushed a commit to psmedley/openhab-addons that referenced this pull request Feb 23, 2023
* Apply maven i18n plugin

Signed-off-by: Olivier Marceau <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants