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

[Backport][LanguageCodes] Add "Swiss german" and "Portuguese (Brazil)" #17662

Merged
merged 1 commit into from
Apr 19, 2020
Merged

[Backport][LanguageCodes] Add "Swiss german" and "Portuguese (Brazil)" #17662

merged 1 commit into from
Apr 19, 2020

Conversation

howie-f
Copy link
Contributor

@howie-f howie-f commented Apr 11, 2020

Backport of #17626 and #17689 to Leia

adds the "swiss german" and also "portuguese (brazil)" language code
to the language code expander

  • Improvement (non-breaking change which improves existing functionality)

Checklist:

@howie-f howie-f changed the title [LanguageCodes] Add "Swiss german" for audio streams (ISO-639-2) [Backport][LanguageCodes] Add "Swiss german" for audio streams (ISO-639-2) Apr 11, 2020
@AlwinEsch AlwinEsch added Type: Backport Type: Improvement non-breaking change which improves existing functionality v18 Leia labels Apr 12, 2020
@AlwinEsch AlwinEsch added this to the Leia 18.7 milestone Apr 12, 2020
@howie-f
Copy link
Contributor Author

howie-f commented Apr 12, 2020

hm, getting in trouble due to .clang-format is differing from master- to leia-branch.
@AlwinEsch would it be worth to backport this file to leia-branch? not for this pull request, as now it is adjusted, but in general?

@AlwinEsch
Copy link
Member

Yes there was a update related to this on Matrix.

@Rechi how we handle the differences about both, take the currently used clang code on master to make easier for backports or change then to Leia's style, where then can be a bit heavy?

I prever to use the one from master also on Leia.

@AlwinEsch AlwinEsch added Type: Fix non-breaking change which fixes an issue and removed Type: Improvement non-breaking change which improves existing functionality labels Apr 12, 2020
@AlwinEsch
Copy link
Member

Can you remove the style cleanups, has not thought so far, sorry. There on Leia are only fixes added.

I'm see your last commit as a half fix, as that the "Swiss german" then wrongly not is used and OK to bring.

If you see them as fix too, it can be in, only then the label must be changed to fix.

@howie-f
Copy link
Contributor Author

howie-f commented Apr 12, 2020

@AlwinEsch ok, now applied only the fix itself which is apparently a 1-liner. it would now result in jenkins-clang-complains about the array-format, but i'm fine if it stays this way

@howie-f
Copy link
Contributor Author

howie-f commented Apr 12, 2020

...as you can see the huge diff 😀 both versions do technically the same (language addition)

@AlwinEsch
Copy link
Member

For me OK, as the selection is fixed and can say now "ei Grüezi mitenand" 😀

@howie-f
Copy link
Contributor Author

howie-f commented Apr 12, 2020

we should keep the cosmetic changes especially for the arrays, because future contributors would run into oddities when they're touched later (like already happened on master). agree somehow hard to review, but therefore the split by commit.

@howie-f howie-f requested a review from AlwinEsch April 13, 2020 12:09
@phunkyfish
Copy link
Contributor

@howie-f lets only include the single commit which is the fix. Any refactoring needs to be omitted as the Leia branch is fixes only.

@howie-f
Copy link
Contributor Author

howie-f commented Apr 18, 2020

@phunkyfish oh, ok, read your comment too late, will remove the cosmetics then

Copy link
Contributor

@phunkyfish phunkyfish left a comment

Choose a reason for hiding this comment

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

Looks good.

@howie-f howie-f changed the title [Backport][LanguageCodes] Add "Swiss german" for audio streams (ISO-639-2) [Backport][LanguageCodes] Add "Swiss german" and "Portuguese (Brazil)" Apr 19, 2020
@phunkyfish
Copy link
Contributor

jenkins build this please

@phunkyfish
Copy link
Contributor

Thanks @howie-f !

@phunkyfish phunkyfish merged commit 39e70a5 into xbmc:Leia Apr 19, 2020
@howie-f howie-f deleted the v18-extend-639-2-codelist branch April 19, 2020 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue Type: Partial backport v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants